diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-05 22:09:04 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-11 10:00:18 +0100 |
| commit | e158d699e0b044dbe4849f756c2dca92d05747e8 (patch) | |
| tree | 3987cf4fbc34e3afd70a9d77f429b969720c630f /qmake | |
| parent | 9f5a7cb5fa5630db484891c50fc3409871bc3d8a (diff) | |
| download | qtbase-e158d699e0b044dbe4849f756c2dca92d05747e8.tar.gz | |
Remove all qmake-related data from q[make]config.cpp
Now that we're not actually using qmakeconfig.cpp anymore, we can remove
it together with all qmake-related information that was written into
qconfig.cpp.
This also moves the qtConfEntries array back to qlibraryinfo.cpp.
Change-Id: I5e57d8c55613332cc3e57b11df4398d46aed259b
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | qmake/qmakelibraryinfo.cpp | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index fff80b6b19..c068a8db2d 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -65,15 +65,12 @@ qt_internal_add_tool(${target_name} generators/unix generators/win32 library - "${CMAKE_CURRENT_BINARY_DIR}/library" # for qmakeconfig.cpp PRECOMPILED_HEADER "qmake_pch.h" LIBRARIES Qt::CorePrivate ) -qt_generate_qconfig_cpp(../src/corelib/global/qconfig.cpp.in library/qmakeconfig.cpp) - #### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>: # _OPTION = "host_build" diff --git a/qmake/qmakelibraryinfo.cpp b/qmake/qmakelibraryinfo.cpp index 4edff1142a..4398e911f1 100644 --- a/qmake/qmakelibraryinfo.cpp +++ b/qmake/qmakelibraryinfo.cpp @@ -47,8 +47,6 @@ #include <qscopedpointer.h> #include <qstringlist.h> -#include <qmakeconfig.cpp> - #include <utility> QT_BEGIN_NAMESPACE |