diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-15 17:00:39 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-16 12:44:49 +0200 |
| commit | 377a9f64b0aa2d4ed4609e91aac731651bd47d65 (patch) | |
| tree | 8df2b4912f21cc3e1a5181f64350901af5018b4f /src/designer | |
| parent | cf5822120b205b33fdf347da1c57ed5f0fc78067 (diff) | |
| download | qttools-377a9f64b0aa2d4ed4609e91aac731651bd47d65.tar.gz | |
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>
Diffstat (limited to 'src/designer')
| -rw-r--r-- | src/designer/src/designer/assistantclient.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/designer/qdesigner.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/qdesigner_utils.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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; |