1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark qmake as Qt tool in qmake/qmake.pro

Browse Source 
...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>
This commit is contained in:
Joerg Bornemann 2020-05-28 17:39:45 +02:00
parent 45fb75a17a
commit d4ff606941
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/.prev_CMakeLists.txt
View File

@ -1,10 +1,10 @@
# Generated from qmake.pro. # Generated from qmake.pro.
##################################################################### #####################################################################
## qmake Binary: ## qmake Tool:
##################################################################### #####################################################################
qt_add_executable(qmake qt_add_tool(qmake
SOURCES SOURCES
../src/3rdparty/pcre2/src/config.h ../src/3rdparty/pcre2/src/config.h
../src/3rdparty/pcre2/src/pcre2.h ../src/3rdparty/pcre2/src/pcre2.h

4
qmake/CMakeLists.txt
View File

@ -1,10 +1,10 @@
# Generated from qmake.pro. # Generated from qmake.pro.
##################################################################### #####################################################################
## qmake Binary: ## qmake Tool:
##################################################################### #####################################################################
qt_add_tool(qmake # special case qt_add_tool(qmake
NO_QT # special case NO_QT # special case
TOOLS_TARGET Core # special case TOOLS_TARGET Core # special case
# GUI # special case: remove this # GUI # special case: remove this

2
qmake/qmake.pro
View File

@ -261,3 +261,5 @@ unix {
mingw: LIBS += -luuid mingw: LIBS += -luuid
clang: QMAKE_CXXFLAGS += -fms-compatibility-version=19.00.23506 -Wno-microsoft-enum-value clang: QMAKE_CXXFLAGS += -fms-compatibility-version=19.00.23506 -Wno-microsoft-enum-value
} }
load(qt_tool)