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/main.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/main.cpp')
| -rw-r--r-- | qmake/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index b00d110827..d435ecaed8 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -32,6 +32,7 @@ #include "option.h" #include "cachekeys.h" #include "metamakefile.h" +#include <qcoreapplication.h> #include <qnamespace.h> #include <qdebug.h> #include <qregularexpression.h> @@ -598,5 +599,7 @@ QT_END_NAMESPACE int main(int argc, char **argv) { + // Set name of the qmake application in QCoreApplication instance + QT_PREPEND_NAMESPACE(QCoreApplication) app(argc, argv); return QT_PREPEND_NAMESPACE(runQMake)(argc, argv); } |