daniel/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android synced 2025-07-01 00:20:46 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8829 from Docteh/qt6_0002

Browse Source 
CMake: rework for Qt6 support
This commit is contained in:
liamwhite
2022-11-27 17:56:22 -05:00
committed by GitHub
parent a2fde04da9 a75542ad2d
commit 6b64557ad6
11 changed files with 218 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/yuzu/main.cpp
View File

@ -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