diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-07 15:51:19 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-07 22:45:53 +0000 |
| commit | cb90784eb1d1cb264f78cc9b3be2ad80704ea8d4 (patch) | |
| tree | 92a800075ae47999aaba0ec2410762558f3a5bcb /qmake | |
| parent | bdb8a5f6640b81a2461b34c1d6bd4b7b9281544f (diff) | |
Regenerate qmake and bootstrap projects
Change-Id: I6649a58752309a346bc03271f17fe80d0b727be3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index dfbafc4ef0..3c42a861ea 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -91,6 +91,7 @@ add_qt_executable(qmake qstringmatcher.h-NOTFOUND qvsnprintf.cpp-NOTFOUND DEFINES + (QT_VERSION_STR=\"\") PROEVALUATOR_FULL QT_BOOTSTRAPPED QT_BUILD_QMAKE @@ -98,24 +99,24 @@ add_qt_executable(qmake QT_VERSION_MAJOR= QT_VERSION_MINOR= QT_VERSION_PATCH= - join(QT_VERSION_STR=\"\") INCLUDE_DIRECTORIES + (..)/include + (..)/include/QtCore (..)/include/QtCore + (..)/include/QtCore//QtCore + (..)/src/corelib/global . generators generators/mac generators/unix generators/win32 - join(..)/include - join(..)/include/QtCore join(..)/include/QtCore - join(..)/include/QtCore//QtCore - join(..)/src/corelib/global library PUBLIC_LIBRARIES Qt::Gui + PRECOMPILED_HEADER + "qmake_pch.h" ) #### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>: -# PRECOMPILED_HEADER = "qmake_pch.h" # _OPTION = "host_build" ## Scopes: |