diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-16 10:34:53 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-16 12:44:59 +0200 |
| commit | a15840a8dfcd0baf0965422f9cb3eca14cc99cf9 (patch) | |
| tree | f75abb5e8afbefb373d300808e5244f080132ceb /tools | |
| parent | 0b92a93e8e165520b12cb8ca1d0a8812ed6e046b (diff) | |
Fix additional warnings from usage of deprecated APIs
Replace QLibaryInfo::location with QLibraryInfo::path, and remove usage of
Qt::AA_EnableHighDpiScaling, which doesn't have any effect anymore.
Change-Id: I347e8a83e0f4c2b4405f2512e569ad3234f05a98
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlimportscanner/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qmllint/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qmlscene/main.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp index 27ebdae0f3..e0c98154d7 100644 --- a/tools/qmlimportscanner/main.cpp +++ b/tools/qmlimportscanner/main.cpp @@ -77,7 +77,7 @@ void printUsage(const QString &appNameIn) { const std::wstring appName = appNameIn.toStdWString(); #ifndef QT_BOOTSTRAPPED - const QString qmlPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + const QString qmlPath = QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath); #else const QString qmlPath = QStringLiteral("/home/user/dev/qt-install/qml"); #endif diff --git a/tools/qmllint/main.cpp b/tools/qmllint/main.cpp index 8ee1d77c31..f0ea68662e 100644 --- a/tools/qmllint/main.cpp +++ b/tools/qmllint/main.cpp @@ -155,7 +155,7 @@ int main(int argv, char *argc[]) QStringList qmltypeDirs = parser.isSet(qmltypesDirsOption) ? parser.values(qmltypesDirsOption) # ifndef QT_BOOTSTRAPPED - : QStringList { QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath) }; + : QStringList { QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath) }; # else : QStringList {}; # endif diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index c0807ed751..de00522d48 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -539,10 +539,10 @@ int main(int argc, char ** argv) #if QT_CONFIG(translation) QLocale locale; QTranslator qtTranslator; - if (qtTranslator.load(locale, QLatin1String("qt"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) + if (qtTranslator.load(locale, QLatin1String("qt"), QLatin1String("_"), QLibraryInfo::path(QLibraryInfo::TranslationsPath))) QCoreApplication::installTranslator(&qtTranslator); QTranslator translator; - if (translator.load(locale, QLatin1String("qmlscene"), QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) + if (translator.load(locale, QLatin1String("qmlscene"), QLatin1String("_"), QLibraryInfo::path(QLibraryInfo::TranslationsPath))) QCoreApplication::installTranslator(&translator); QTranslator qmlTranslator; |