Fix warnings from using deprecated QLibraryInfo API

As of 557623cc4f22295e5e89462dfdff20d78b3b9cdc in qtbase,
QLibraryInfo::location is QLibraryInfo::path.

Change-Id: I6e4788011fd8f64f5a433b00cb327c2afcf68527
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

15 files changed, 17 insertions, 17 deletions

diff --git a/src/assistant/assistant/main.cpp b/src/assistant/assistant/main.cpp
index f6a3bcf46..b89828ec3 100644
--- a/src/assistant/assistant/main.cpp
+++ b/src/assistant/assistant/main.cpp
@@ -248,7 +248,7 @@ void setupTranslations()
 {
     TRACE_OBJ
     const QString &resourceDir
-        = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+        = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
     setupTranslation(QLatin1String("assistant"), resourceDir);
     setupTranslation(QLatin1String("qt"), resourceDir);
     setupTranslation(QLatin1String("qt_help"), resourceDir);
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 3436e352e..161b49079 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -418,7 +418,7 @@ static const char *docs[] = {
 static QStringList newQtDocumentation()
 {
     QStringList result;
-    const QDir docDirectory(QLibraryInfo::location(QLibraryInfo::DocumentationPath));
+    const QDir docDirectory(QLibraryInfo::path(QLibraryInfo::DocumentationPath));
     const QFileInfoList entries = docDirectory.entryInfoList(QStringList(QStringLiteral("*.qch")),
                                                              QDir::Files, QDir::Name);
     if (!entries.isEmpty()) {
diff --git a/src/assistant/assistant/qtdocinstaller.cpp b/src/assistant/assistant/qtdocinstaller.cpp
index b25aa2b72..1a758577c 100644
--- a/src/assistant/assistant/qtdocinstaller.cpp
+++ b/src/assistant/assistant/qtdocinstaller.cpp
@@ -63,7 +63,7 @@ void QtDocInstaller::installDocs()
 void QtDocInstaller::run()
 {
     TRACE_OBJ
-    m_qchDir.setPath(QLibraryInfo::location(QLibraryInfo::DocumentationPath));
+    m_qchDir.setPath(QLibraryInfo::path(QLibraryInfo::DocumentationPath));
     m_qchFiles = m_qchDir.entryList(QStringList() << QLatin1String("*.qch"));
 
     bool changes = false;
diff --git a/src/assistant/qhelpgenerator/main.cpp b/src/assistant/qhelpgenerator/main.cpp
index 41959fea1..3ec20da6f 100644
--- a/src/assistant/qhelpgenerator/main.cpp
+++ b/src/assistant/qhelpgenerator/main.cpp
@@ -265,7 +265,7 @@ int main(int argc, char *argv[])
     QTranslator qtTranslator;
     QTranslator qt_helpTranslator;
     QString sysLocale = QLocale::system().name();
-    QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+    QString resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
     if (translator.load(QLatin1String("assistant_") + sysLocale, resourceDir)
         && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir)
         && qt_helpTranslator.load(QLatin1String("qt_help_") + sysLocale, resourceDir)) {
diff --git a/src/designer/src/designer/assistantclient.cpp b/src/designer/src/designer/assistantclient.cpp
index fb8bb5dde..45fee4393 100644
--- a/src/designer/src/designer/assistantclient.cpp
+++ b/src/designer/src/designer/assistantclient.cpp
@@ -96,7 +96,7 @@ bool AssistantClient::isRunning() const
 
 QString AssistantClient::binary()
 {
-    QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+    QString app = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QDir::separator();
 #if !defined(Q_OS_MACOS)
     app += QStringLiteral("assistant");
 #else
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp
index ea3780af1..bbd1451f0 100644
--- a/src/designer/src/designer/qdesigner.cpp
+++ b/src/designer/src/designer/qdesigner.cpp
@@ -160,7 +160,7 @@ static void showHelp(QCommandLineParser &parser, const QString &errorMessage = Q
 struct Options
 {
     QStringList files;
-    QString resourceDir{QLibraryInfo::location(QLibraryInfo::TranslationsPath)};
+    QString resourceDir{QLibraryInfo::path(QLibraryInfo::TranslationsPath)};
     bool server{false};
     quint16 clientPort{0};
     bool enableInternalDynamicProperties{false};
diff --git a/src/designer/src/lib/shared/qdesigner_utils.cpp b/src/designer/src/lib/shared/qdesigner_utils.cpp
index a16266cae..8ac1c4836 100644
--- a/src/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/src/designer/src/lib/shared/qdesigner_utils.cpp
@@ -719,7 +719,7 @@ namespace qdesigner_internal
     {
         QProcess uic;
         QStringList arguments;
-        QString binary = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/uic");
+        QString binary = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QStringLiteral("/uic");
         switch (language) {
         case UicLanguage::Cpp:
             break;
diff --git a/src/linguist/lconvert/main.cpp b/src/linguist/lconvert/main.cpp
index 8996f4247..816453bb4 100644
--- a/src/linguist/lconvert/main.cpp
+++ b/src/linguist/lconvert/main.cpp
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
     QTranslator translator;
     QTranslator qtTranslator;
     QString sysLocale = QLocale::system().name();
-    QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+    QString resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
     if (translator.load(QLatin1String("linguist_") + sysLocale, resourceDir)
         && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir)) {
         app.installTranslator(&translator);
diff --git a/src/linguist/linguist/main.cpp b/src/linguist/linguist/main.cpp
index df920880e..311344385 100644
--- a/src/linguist/linguist/main.cpp
+++ b/src/linguist/linguist/main.cpp
@@ -98,7 +98,7 @@ int main(int argc, char **argv)
 #endif // Q_OS_MAC
 
     QStringList files;
-    QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+    QString resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
     QStringList args = app.arguments();
 
     for (int i = 1; i < args.count(); ++i) {
diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp
index b31c27440..9fc83e482 100644
--- a/src/linguist/linguist/mainwindow.cpp
+++ b/src/linguist/linguist/mainwindow.cpp
@@ -1336,7 +1336,7 @@ void MainWindow::manual()
         m_assistantProcess = new QProcess();
 
     if (m_assistantProcess->state() != QProcess::Running) {
-        QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+        QString app = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QDir::separator();
 #if !defined(Q_OS_MAC)
         app += QLatin1String("assistant");
 #else
diff --git a/src/linguist/lrelease-pro/main.cpp b/src/linguist/lrelease-pro/main.cpp
index 9f4ca259f..bd20eea59 100644
--- a/src/linguist/lrelease-pro/main.cpp
+++ b/src/linguist/lrelease-pro/main.cpp
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
     QTranslator translator;
     QTranslator qtTranslator;
     QString sysLocale = QLocale::system().name();
-    QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+    QString resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
     if (translator.load(QLatin1String("linguist_") + sysLocale, resourceDir)
         && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir)) {
         app.installTranslator(&translator);
diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp
index b63c21dc6..202a6de7f 100644
--- a/src/linguist/lrelease/main.cpp
+++ b/src/linguist/lrelease/main.cpp
@@ -206,7 +206,7 @@ int main(int argc, char **argv)
     QTranslator translator;
     QTranslator qtTranslator;
     QString sysLocale = QLocale::system().name();
-    QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+    QString resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
     if (translator.load(QLatin1String("linguist_") + sysLocale, resourceDir)
         && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir)) {
         app.installTranslator(&translator);
diff --git a/src/linguist/lupdate-pro/main.cpp b/src/linguist/lupdate-pro/main.cpp
index ab5b7ebf8..1910467f4 100644
--- a/src/linguist/lupdate-pro/main.cpp
+++ b/src/linguist/lupdate-pro/main.cpp
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
     QTranslator translator;
     QTranslator qtTranslator;
     QString sysLocale = QLocale::system().name();
-    QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+    QString resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
     if (translator.load(QLatin1String("linguist_") + sysLocale, resourceDir)
         && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir)) {
         app.installTranslator(&translator);
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp
index 331838910..ca7793073 100644
--- a/src/qtdiag/qtdiag.cpp
+++ b/src/qtdiag/qtdiag.cpp
@@ -445,7 +445,7 @@ static void dumpStandardLocation(QTextStream &str, QStandardPaths::StandardLocat
     str << '\n';
 
 #define DUMP_LIBRARYPATH(str, loc) \
-    str << "  " << #loc << ": " << QDir::toNativeSeparators(QLibraryInfo::location(QLibraryInfo::loc)) << '\n';
+    str << "  " << #loc << ": " << QDir::toNativeSeparators(QLibraryInfo::path(QLibraryInfo::loc)) << '\n';
 
 // Helper to format a type via QDebug to be used for QFlags/Q_ENUM.
 template <class T>
diff --git a/src/qtpaths/qtpaths.cpp b/src/qtpaths/qtpaths.cpp
index 340a2ac43..e03f27cd0 100644
--- a/src/qtpaths/qtpaths.cpp
+++ b/src/qtpaths/qtpaths.cpp
@@ -226,17 +226,17 @@ int main(int argc, char **argv)
     }
 
     if (parser.isSet(installprefix)) {
-        QString path = QLibraryInfo::location(QLibraryInfo::PrefixPath);
+        QString path = QLibraryInfo::path(QLibraryInfo::PrefixPath);
         results << path;
     }
 
     if (parser.isSet(bindir)) {
-        QString path = QLibraryInfo::location(QLibraryInfo::BinariesPath);
+        QString path = QLibraryInfo::path(QLibraryInfo::BinariesPath);
         results << path;
     }
 
     if (parser.isSet(plugindir)) {
-        QString path = QLibraryInfo::location(QLibraryInfo::PluginsPath);
+        QString path = QLibraryInfo::path(QLibraryInfo::PluginsPath);
         results << path;
     }