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

Regenerate qmake and bootstrap projects

Browse Source 
Change-Id: I6649a58752309a346bc03271f17fe80d0b727be3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
This commit is contained in:
Alexandru Croitor 2019-10-07 15:51:19 +02:00
parent bdb8a5f664
commit cb90784eb1
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qmake/.prev_CMakeLists.txt
View File

@ -91,6 +91,7 @@ add_qt_executable(qmake
qstringmatcher.h-NOTFOUND qstringmatcher.h-NOTFOUND
qvsnprintf.cpp-NOTFOUND qvsnprintf.cpp-NOTFOUND
DEFINES DEFINES
(QT_VERSION_STR=\"\")
PROEVALUATOR_FULL PROEVALUATOR_FULL
QT_BOOTSTRAPPED QT_BOOTSTRAPPED
QT_BUILD_QMAKE QT_BUILD_QMAKE
@ -98,24 +99,24 @@ add_qt_executable(qmake
QT_VERSION_MAJOR= QT_VERSION_MAJOR=
QT_VERSION_MINOR= QT_VERSION_MINOR=
QT_VERSION_PATCH= QT_VERSION_PATCH=
join(QT_VERSION_STR=\"\")
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
(..)/include
(..)/include/QtCore (..)/include/QtCore
(..)/include/QtCore//QtCore
(..)/src/corelib/global
. .
generators generators
generators/mac generators/mac
generators/unix generators/unix
generators/win32 generators/win32
join(..)/include
join(..)/include/QtCore join(..)/include/QtCore
join(..)/include/QtCore//QtCore
join(..)/src/corelib/global
library library
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
PRECOMPILED_HEADER
"qmake_pch.h"
) )
#### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>: #### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>:
# PRECOMPILED_HEADER = "qmake_pch.h"
# _OPTION = "host_build" # _OPTION = "host_build"
## Scopes: ## Scopes:

8
src/tools/bootstrap/.prev_CMakeLists.txt
View File

@ -97,10 +97,10 @@ add_qt_module(Bootstrap
QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII QT_NO_CAST_TO_ASCII
QT_NO_FOREACH QT_NO_FOREACH
QT_VERSION_MAJOR=$$QT_MAJOR_VERSION QT_VERSION_MAJOR=
QT_VERSION_MINOR=$$QT_MINOR_VERSION QT_VERSION_MINOR=
QT_VERSION_PATCH=$$QT_PATCH_VERSION QT_VERSION_PATCH=
QT_VERSION_STR=$$shell_quote\"$$QT_VERSION\" QT_VERSION_STR=\"\"
) )
#### Keys ignored in scope 1:.:.:bootstrap.pro:<TRUE>: #### Keys ignored in scope 1:.:.:bootstrap.pro:<TRUE>: