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/assistant | |
| 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/assistant')
| -rw-r--r-- | src/assistant/assistant/main.cpp | 2 | ||||
| -rw-r--r-- | src/assistant/assistant/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/assistant/assistant/qtdocinstaller.cpp | 2 | ||||
| -rw-r--r-- | src/assistant/qhelpgenerator/main.cpp | 2 |
4 files changed, 4 insertions, 4 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)) { |