summaryrefslogtreecommitdiffstats
path: root/src/assistant
diff options
context:
space:
mode:
Diffstat (limited to 'src/assistant')
-rw-r--r--src/assistant/assistant/main.cpp2
-rw-r--r--src/assistant/assistant/mainwindow.cpp2
-rw-r--r--src/assistant/assistant/qtdocinstaller.cpp2
-rw-r--r--src/assistant/qhelpgenerator/main.cpp2
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)) {