diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-05-28 17:39:45 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-05-29 20:45:09 +0200 |
| commit | d4ff606941704ef2dd7520a0c81c982a5a0b0f73 (patch) | |
| tree | 03251daade6cb7d5dc8266ec77a47c8d6828f126 /qmake | |
| parent | 45fb75a17a5dae0d7f4bdf870f42b1947af0425a (diff) | |
Mark qmake as Qt tool in qmake/qmake.pro
...and re-regenerate qmake/CMakeLists.txt.
This removes one special case and is necessary for a subsequent patch
that changes how pro2cmake converts Qt tools.
Change-Id: Ie87b7841f3c29de3f2c8907e82975b6272f096cc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | qmake/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | qmake/qmake.pro | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 1a409ed77a..63b34a0970 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from qmake.pro. ##################################################################### -## qmake Binary: +## qmake Tool: ##################################################################### -qt_add_executable(qmake +qt_add_tool(qmake SOURCES ../src/3rdparty/pcre2/src/config.h ../src/3rdparty/pcre2/src/pcre2.h diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 6141632aef..253040d402 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from qmake.pro. ##################################################################### -## qmake Binary: +## qmake Tool: ##################################################################### -qt_add_tool(qmake # special case +qt_add_tool(qmake NO_QT # special case TOOLS_TARGET Core # special case # GUI # special case: remove this diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 81b464688e..10f118724c 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -261,3 +261,5 @@ unix { mingw: LIBS += -luuid clang: QMAKE_CXXFLAGS += -fms-compatibility-version=19.00.23506 -Wno-microsoft-enum-value } + +load(qt_tool) |