From a15840a8dfcd0baf0965422f9cb3eca14cc99cf9 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 16 Sep 2020 10:34:53 +0200 Subject: Fix additional warnings from usage of deprecated APIs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø --- src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp | 2 +- src/qml/qml/qqmlimport.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp index 62c73cd9aa..c9317edb44 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp @@ -245,7 +245,7 @@ void QQmlPreviewHandler::language(const QUrl &context, const QLocale &locale) m_qtTranslator.reset(new QTranslator(this)); if (m_qtTranslator->load(locale, QLatin1String("qt"), QLatin1String("_"), - QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { + QLibraryInfo::path(QLibraryInfo::TranslationsPath))) { QCoreApplication::installTranslator(m_qtTranslator.get()); } diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 14320f71f6..840715c847 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1933,7 +1933,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) filePluginPath << QLatin1String("."); // Search order is applicationDirPath(), qrc:/qt-project.org/imports, $QML2_IMPORT_PATH, QLibraryInfo::Qml2ImportsPath - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + QString installImportsPath = QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath); addImportPath(installImportsPath); // env import paths -- cgit v1.2.3