diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-15 14:25:34 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-17 11:57:11 +0100 |
| commit | 6fb569af9512f63d503720ed7f62e9c70b16f969 (patch) | |
| tree | 7a49c1fa32c064aeaefaa9ebec2c695c2fa275ad /qmake/option.cpp | |
| parent | a423c0d21174fc88a02277d9cd909b0d6e11018b (diff) | |
Unify QLibraryInfo settings
Exporting QLibraryInfo internals allows to reuse settings in
qmake/qtpath without having to keep its own instance.
Also there is no need to check setting groups in QLibraryInfo
except the 'Paths' group, since this logic belongs to qmake/qtpaths
only.
Change-Id: If762defba025ad7f7489f8a86ef5768a8628bd2f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 1f9d60d7a8..9917447f91 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -33,10 +33,12 @@ #include <qregularexpression.h> #include <qhash.h> #include <qdebug.h> -#include <qmakelibraryinfo.h> #include <stdlib.h> #include <stdarg.h> +#include <qmakelibraryinfo.h> +#include <private/qlibraryinfo_p.h> + QT_BEGIN_NAMESPACE using namespace QMakeInternal; @@ -203,7 +205,7 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state) default: QMakeGlobals::ArgumentReturn cmdRet = globals->addCommandLineArguments(state, args, &x); if (cmdRet == QMakeGlobals::ArgumentsOk) { - QMakeLibraryInfo::qtconfManualPath = globals->qtconf; + QLibraryInfoPrivate::qtconfManualPath = globals->qtconf; break; } if (cmdRet == QMakeGlobals::ArgumentMalformed) { @@ -340,7 +342,6 @@ Option::init(int argc, char **argv) #endif ; } - QMakeLibraryInfo::binaryAbsLocation = globals->qmake_abslocation; } else { Option::qmake_mode = Option::QMAKE_GENERATE_MAKEFILE; } |