diff options
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 0d5746bb09a..09d790c9c23 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -33,7 +33,7 @@ #include <qregularexpression.h> #include <qhash.h> #include <qdebug.h> -#include <qlibraryinfo.h> +#include <qmakelibraryinfo.h> #include <stdlib.h> #include <stdarg.h> @@ -218,7 +218,9 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state) "QMake version %s\n" "Using Qt version %s in %s\n", QMAKE_VERSION_STR, QT_VERSION_STR, - QLibraryInfo::path(QLibraryInfo::LibrariesPath).toLatin1().constData()); + QMakeLibraryInfo::path(QLibraryInfo::LibrariesPath) + .toLatin1() + .constData()); #ifdef QMAKE_OPENSOURCE_VERSION fprintf(stdout, "QMake is Open Source software from The Qt Company Ltd and/or its subsidiary(-ies).\n"); #endif @@ -353,9 +355,9 @@ Option::init(int argc, char **argv) } if (Q_UNLIKELY(globals->qmake_abslocation.isNull())) { // This is rather unlikely to ever happen on a modern system ... - globals->qmake_abslocation = QLibraryInfo::rawLocation( - QLibraryInfo::HostBinariesPath, - QLibraryInfo::EffectivePaths) + globals->qmake_abslocation = + QMakeLibraryInfo::rawLocation(QMakeLibraryInfo::HostBinariesPath, + QMakeLibraryInfo::EffectivePaths) #ifdef Q_OS_WIN + "/qmake.exe"; #else |