diff options
| -rw-r--r-- | examples/quick/shared/shared.h | 1 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 2 | ||||
| -rw-r--r-- | tools/qmlimportscanner/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qmllint/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qmlscene/main.cpp | 4 |
6 files changed, 6 insertions, 7 deletions
diff --git a/examples/quick/shared/shared.h b/examples/quick/shared/shared.h index 18e7ff056b..a6a468ddcb 100644 --- a/examples/quick/shared/shared.h +++ b/examples/quick/shared/shared.h @@ -54,7 +54,6 @@ #include <QQuickView> //Not using QQmlApplicationEngine because many examples don't have a Window{} #define DECLARATIVE_EXAMPLE_MAIN(NAME) int main(int argc, char* argv[]) \ {\ - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);\ QGuiApplication app(argc,argv);\ app.setOrganizationName("QtProject");\ app.setOrganizationDomain("qt-project.org");\ 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 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; |