diff --git a/app/backend/nvhttp.cpp b/app/backend/nvhttp.cpp index d3ea30e3..db6d7c56 100644 --- a/app/backend/nvhttp.cpp +++ b/app/backend/nvhttp.cpp @@ -233,17 +233,17 @@ NvHTTP::getDisplayModeList(QString serverInfo) while (!xmlReader.atEnd()) { while (xmlReader.readNextStartElement()) { - QStringRef name = xmlReader.name(); - if (name == "DisplayMode") { + auto name = xmlReader.name(); + if (name == QString("DisplayMode")) { modes.append(NvDisplayMode()); } - else if (name == "Width") { + else if (name == QString("Width")) { modes.last().width = xmlReader.readElementText().toInt(); } - else if (name == "Height") { + else if (name == QString("Height")) { modes.last().height = xmlReader.readElementText().toInt(); } - else if (name == "RefreshRate") { + else if (name == QString("RefreshRate")) { modes.last().refreshRate = xmlReader.readElementText().toInt(); } } @@ -266,8 +266,8 @@ NvHTTP::getAppList() QVector apps; while (!xmlReader.atEnd()) { while (xmlReader.readNextStartElement()) { - QStringRef name = xmlReader.name(); - if (name == "App") { + auto name = xmlReader.name(); + if (name == QString("App")) { // We must have a valid app before advancing to the next one if (!apps.isEmpty() && !apps.last().isInitialized()) { qWarning() << "Invalid applist XML"; @@ -276,16 +276,16 @@ NvHTTP::getAppList() } apps.append(NvApp()); } - else if (name == "AppTitle") { + else if (name == QString("AppTitle")) { apps.last().name = xmlReader.readElementText(); } - else if (name == "ID") { + else if (name == QString("ID")) { apps.last().id = xmlReader.readElementText().toInt(); } - else if (name == "IsHdrSupported") { + else if (name == QString("IsHdrSupported")) { apps.last().hdrSupported = xmlReader.readElementText() == "1"; } - else if (name == "IsAppCollectorGame") { + else if (name == QString("IsAppCollectorGame")) { apps.last().isAppCollectorGame = xmlReader.readElementText() == "1"; } } @@ -301,7 +301,7 @@ NvHTTP::verifyResponseStatus(QString xml) while (xmlReader.readNextStartElement()) { - if (xmlReader.name() == "root") + if (xmlReader.name() == QString("root")) { // Status code can be 0xFFFFFFFF in some rare cases on GFE 3.20.3, and // QString::toInt() will fail in that case, so use QString::toUInt() diff --git a/app/main.cpp b/app/main.cpp index 69f02094..4e769aa9 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -305,8 +305,10 @@ int main(int argc, char *argv[]) // NB: We can't use QGuiApplication::platformName() here because it is only // set once the QGuiApplication is created, which is too late to enable High DPI :( if (WMUtils::isRunningWindowManager()) { - // Enable High DPI support +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + // Enable High DPI support on Qt 5.x. It is always enabled on Qt 6.0 QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#endif #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) // Enable fractional High DPI scaling on Qt 5.14 and later