diff options
Diffstat (limited to 'src/sdk/sdkapp.h')
| -rw-r--r-- | src/sdk/sdkapp.h | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h index ba542691e..eef0110ec 100644 --- a/src/sdk/sdkapp.h +++ b/src/sdk/sdkapp.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2022 The Qt Company Ltd. +** Copyright (C) 2024 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -60,6 +60,10 @@ #include <QMetaEnum> #include <QTranslator> +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#include <QNetworkInformation> +#endif + template<class T> class SDKApp : public T { @@ -71,6 +75,9 @@ public: , m_core(nullptr) { m_parser.parse(QCoreApplication::arguments()); +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) + QNetworkInformation::loadDefaultBackend(); +#endif } virtual ~SDKApp() @@ -202,7 +209,7 @@ public: if (translations.isEmpty()) { for (const QString &language : QLocale().uiLanguages()) { const QLocale locale(language); - QScopedPointer<QTranslator> qtTranslator(new QTranslator(QCoreApplication::instance())); + std::unique_ptr<QTranslator> qtTranslator(new QTranslator(QCoreApplication::instance())); bool qtLoaded = qtTranslator->load(locale, QLatin1String("qt"), QLatin1String("_"), newDirectory); if (!qtLoaded) @@ -211,14 +218,14 @@ public: if (qtLoaded || locale.language() == QLocale::English) { if (qtLoaded) - QCoreApplication::instance()->installTranslator(qtTranslator.take()); + QCoreApplication::instance()->installTranslator(qtTranslator.release()); - QScopedPointer<QTranslator> ifwTranslator(new QTranslator(QCoreApplication::instance())); + std::unique_ptr <QTranslator> ifwTranslator(new QTranslator(QCoreApplication::instance())); bool ifwLoaded = ifwTranslator->load(locale, QLatin1String("ifw"), QLatin1String("_"), newDirectory); if (!ifwLoaded) ifwLoaded = ifwTranslator->load(locale, QLatin1String("ifw"), QLatin1String("_"), directory); if (ifwLoaded) { - QCoreApplication::instance()->installTranslator(ifwTranslator.take()); + QCoreApplication::instance()->installTranslator(ifwTranslator.release()); } else { qCWarning(QInstaller::lcDeveloperBuild) << "Could not load IFW translation for language" << QLocale::languageToString(locale.language()); @@ -235,9 +242,9 @@ public: } } else { foreach (const QString &translation, translations) { - QScopedPointer<QTranslator> translator(new QTranslator(QCoreApplication::instance())); + std::unique_ptr<QTranslator> translator(new QTranslator(QCoreApplication::instance())); if (translator->load(translation, QLatin1String(":/translations"))) - QCoreApplication::instance()->installTranslator(translator.take()); + QCoreApplication::instance()->installTranslator(translator.release()); } QLocale currentLocale(translations.at(0).section(QLatin1Char('_'), 1)); lang = currentLocale; @@ -421,7 +428,7 @@ public: } m_core->setValue(QInstaller::scUILanguage, lang.name()); - emit m_core->defaultTranslationsLoadedForLanguage(lang.language()); + emit m_core->defaultTranslationsLoadedForLanguage(lang); ProductKeyCheck::instance()->addPackagesFromXml(QLatin1String(":/metadata/Updates.xml")); return true; @@ -549,7 +556,7 @@ public: foreach (const QString &argument, positionalArguments) { if (argument.contains(QLatin1Char('='))) { const QString name = argument.section(QLatin1Char('='), 0, 0); - const QString value = argument.section(QLatin1Char('='), 1, 1); + const QString value = argument.section(QLatin1Char('='), 1); params.insert(name, value); } } |