diff options
| author | Kyle Kienapfel <Docteh@users.noreply.github.com> | 2022-08-31 03:10:34 -0700 |
|---|---|---|
| committer | Kyle Kienapfel <Docteh@users.noreply.github.com> | 2022-11-17 19:14:14 -0800 |
| commit | ad3ee5c52bd26cfb123d0bc47c18d4a4d2fbb64d (patch) | |
| tree | 9144ac6918014541f2620343ac8d104c38ac599b /src/yuzu/main.cpp | |
| parent | 405d685101e60e3b9f156250f2d462f7e7217a10 (diff) | |
Qt6: Disable IR Sensor when compiling with Qt6
Gating the IR Sensor code behind a macro like so
`#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA`
The YUZU_USE_QT_MULTIMEDIA flag is implemented in later commit
Also the locale fix in src/yuzu/main.cpp is now gated against Qt6,
as it causes compilation error
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 7ee2302cc9..26c593fce2 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -4194,10 +4194,12 @@ int main(int argc, char* argv[]) { // so we can see if we get \u3008 instead // TL;DR all other number formats are consecutive in unicode code points // This bug is fixed in Qt6, specifically 6.0.0-alpha1 +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) const QLocale locale = QLocale::system(); if (QStringLiteral("\u3008") == locale.toString(1)) { QLocale::setDefault(QLocale::system().name()); } +#endif // Qt changes the locale and causes issues in float conversion using std::to_string() when // generating shaders |