Merge branch 'wip/qt6' into wip/cmake

Change-Id: I50ac36b8803c296998149e98cc61e38687cdd14b

1 files changed, 19 insertions, 18 deletions

diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt
index 085a4e7264..dfbafc4ef0 100644
--- a/qmake/.prev_CMakeLists.txt
+++ b/qmake/.prev_CMakeLists.txt
@@ -44,22 +44,12 @@ add_qt_executable(qmake
         ../src/corelib/tools/qarraydataops.h
         ../src/corelib/tools/qarraydatapointer.h
         ../src/corelib/tools/qbitarray.cpp ../src/corelib/tools/qbitarray.h
-        ../src/corelib/tools/qbytearray.cpp ../src/corelib/tools/qbytearray.h
-        ../src/corelib/tools/qbytearraymatcher.cpp ../src/corelib/tools/qbytearraymatcher.h
-        ../src/corelib/tools/qchar.h
         ../src/corelib/tools/qcryptographichash.cpp ../src/corelib/tools/qcryptographichash.h
         ../src/corelib/tools/qhash.cpp ../src/corelib/tools/qhash.h
         ../src/corelib/tools/qlist.cpp ../src/corelib/tools/qlist.h
-        ../src/corelib/tools/qlocale.cpp ../src/corelib/tools/qlocale.h
-        ../src/corelib/tools/qlocale_tools.cpp ../src/corelib/tools/qlocale_tools_p.h
         ../src/corelib/tools/qmap.cpp ../src/corelib/tools/qmap.h
-        ../src/corelib/tools/qregexp.cpp ../src/corelib/tools/qregexp.h
-        ../src/corelib/tools/qstring.cpp ../src/corelib/tools/qstring.h
-        ../src/corelib/tools/qstringlist.cpp ../src/corelib/tools/qstringlist.h
-        ../src/corelib/tools/qstringmatcher.h
         ../src/corelib/tools/qvector.h
         ../src/corelib/tools/qversionnumber.cpp ../src/corelib/tools/qversionnumber.h
-        ../src/corelib/tools/qvsnprintf.cpp
         cachekeys.h
         generators/mac/pbuilder_pbx.cpp generators/mac/pbuilder_pbx.h
         generators/makefile.cpp generators/makefile.h
@@ -89,9 +79,18 @@ add_qt_executable(qmake
         option.cpp option.h
         project.cpp project.h
         property.cpp property.h
+        qbytearray.cpp-NOTFOUND qbytearray.h-NOTFOUND
+        qbytearraymatcher.cpp-NOTFOUND qbytearraymatcher.h-NOTFOUND
+        qchar.h-NOTFOUND
         qdatetime.cpp-NOTFOUND qdatetime.h-NOTFOUND qdatetime_p.h-NOTFOUND
+        qlocale.cpp-NOTFOUND qlocale.h-NOTFOUND
+        qlocale_tools.cpp-NOTFOUND qlocale_tools_p.h-NOTFOUND
+        qregexp.cpp-NOTFOUND qregexp.h-NOTFOUND
+        qstring.cpp-NOTFOUND qstring.h-NOTFOUND
+        qstringlist.cpp-NOTFOUND qstringlist.h-NOTFOUND
+        qstringmatcher.h-NOTFOUND
+        qvsnprintf.cpp-NOTFOUND
     DEFINES
-        =\"\"
         PROEVALUATOR_FULL
         QT_BOOTSTRAPPED
         QT_BUILD_QMAKE
@@ -99,21 +98,23 @@ 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
 )
 
 #### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>:
-# CONFIG = "cmdline" "-qt"
 # PRECOMPILED_HEADER = "qmake_pch.h"
 # _OPTION = "host_build"
 
@@ -128,7 +129,7 @@ extend_target(qmake CONDITION WIN32
         ../src/corelib/io/qfsfileengine_win.cpp
         ../src/corelib/io/qsettings_win.cpp
         ../src/corelib/plugin/qsystemlibrary.cpp
-        ../src/corelib/tools/qlocale_win.cpp
+        qlocale_win.cpp-NOTFOUND
         registry.cpp-NOTFOUND
     DEFINES
         UNICODE
@@ -148,7 +149,7 @@ extend_target(qmake CONDITION UNIX
         ../src/corelib/io/qfilesystemiterator_unix.cpp
         ../src/corelib/io/qfsfileengine_unix.cpp
         ../src/corelib/kernel/qcore_unix.cpp
-        ../src/corelib/tools/qlocale_unix.cpp
+        qlocale_unix.cpp-NOTFOUND
 )
 
 extend_target(qmake CONDITION APPLE_OSX