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

Qt6: Disable IR Sensor when compiling with Qt6

Browse Source 
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
This commit is contained in:
Kyle Kienapfel
2022-08-31 03:10:34 -07:00
parent 405d685101
commit ad3ee5c52b
6 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/yuzu/main.cpp
View File

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