summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2021-03-25 14:13:08 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-03-25 20:22:45 +0000
commit6fc7b6681031ea02cbad188123ab30f85ef00409 (patch)
tree9392475ee70cbb7573b31577f97aa4068721cb46
parent3392a522102b7fde4b9f94b2f841379ff141c452 (diff)
downloadqtdoc-6fc7b6681031ea02cbad188123ab30f85ef00409.tar.gz
Don't recommend deprecated QLibraryInfo::location
Point readers at QLibraryInfo::path instead. Change-Id: I671c76bc58934b2de7ad84b10716ed36a3664aa8 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 2c08f6d6671c2f08adb19121dadff9ae60490f2f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--doc/src/deployment/deployment-plugins.qdoc2
-rw-r--r--doc/src/internationalization/i18n.qdoc2
-rw-r--r--doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/deployment/deployment-plugins.qdoc b/doc/src/deployment/deployment-plugins.qdoc
index 69d8f1ba..0e898a16 100644
--- a/doc/src/deployment/deployment-plugins.qdoc
+++ b/doc/src/deployment/deployment-plugins.qdoc
@@ -46,7 +46,7 @@
To find out where your application's executable is located, see
QCoreApplication::applicationDirPath().
- Qt also looks in the directory specified by QLibraryInfo::location(QLibraryInfo::PluginsPath),
+ Qt also looks in the directory specified by QLibraryInfo::path(QLibraryInfo::PluginsPath),
which typically is located in \c QTDIR/plugins; \c QTDIR is the directory where Qt is installed.
If you want Qt to look in additional places you can add as many paths as you need with calls to
QCoreApplication::addLibraryPath(). If you want to set your own path(s), you can use
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 5f313357..9226ec5a 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -196,7 +196,7 @@
\section1 Locating Qt Translations
- You can also use QLibraryInfo::location() to locate the translations for the
+ You can also use QLibraryInfo::path() to locate the translations for the
Qt modules used. You can request the path to the translations at run-time by
passing QLibraryInfo::TranslationsPath to this function.
diff --git a/doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp b/doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp
index 96a86e02..d19c4b66 100644
--- a/doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp
+++ b/doc/src/snippets/code/tools_assistant_compat_lib_qassistantclient.cpp
@@ -50,7 +50,7 @@
//! [0]
QProcess *process = new QProcess(this);
- QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath)
+ QString app = QLibraryInfo::path(QLibraryInfo::BinariesPath)
+ QLatin1String("/assistant");
process->start(app, QStringList() << QLatin1String("-enableRemoteControl"));