From cb90784eb1d1cb264f78cc9b3be2ad80704ea8d4 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 7 Oct 2019 15:51:19 +0200
Subject: [PATCH] Regenerate qmake and bootstrap projects

Change-Id: I6649a58752309a346bc03271f17fe80d0b727be3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
---
 qmake/.prev_CMakeLists.txt               | 13 +++++++------
 src/tools/bootstrap/.prev_CMakeLists.txt |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt
index dfbafc4ef0c..3c42a861ea9 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:
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index 64493410ac7..df60d98988e 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -97,10 +97,10 @@ add_qt_module(Bootstrap
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
         QT_NO_FOREACH
-        QT_VERSION_MAJOR=$$QT_MAJOR_VERSION
-        QT_VERSION_MINOR=$$QT_MINOR_VERSION
-        QT_VERSION_PATCH=$$QT_PATCH_VERSION
-        QT_VERSION_STR=$$shell_quote\"$$QT_VERSION\"
+        QT_VERSION_MAJOR=
+        QT_VERSION_MINOR=
+        QT_VERSION_PATCH=
+        QT_VERSION_STR=\"\"
 )
 
 #### Keys ignored in scope 1:.:.:bootstrap.pro:<TRUE>: