diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-11-27 17:56:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 17:56:22 -0500 |
| commit | 6b64557ad62141d1ac5d42e88ba7a3ed0cc9884d (patch) | |
| tree | 614d45e1b6bdeffc988163fbe727c6a524c200c0 /src/yuzu/main.cpp | |
| parent | a2fde04da9630a5bf4948a0d2798d969956eb389 (diff) | |
| parent | a75542ad2dd028f9aa3adfb00e92817ada12ccd8 (diff) | |
Merge pull request #8829 from Docteh/qt6_0002
CMake: rework for Qt6 support
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 4081af391..2aae746f0 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -237,6 +237,7 @@ static void LogRuntimes() { LOG_INFO(Frontend, "Unable to inspect {}", runtime_dll_name); } #endif + LOG_INFO(Frontend, "Qt Compile: {} Runtime: {}", QT_VERSION_STR, qVersion()); } static QString PrettyProductName() { @@ -4217,10 +4218,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 |