Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

This changes many different CMake places to mention Qt6 instead of
Qt5.

Note that some old qt5 cmake config files in corelib are probably not
needed anymore, but I still renamed and kept them for now.

Change-Id: Ie69e81540386a5af153f76c0242e18d48211bec4

6 files changed, 8 insertions, 6 deletions

diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt
index 8a1aabc96f..085a4e7264 100644
--- a/qmake/.prev_CMakeLists.txt
+++ b/qmake/.prev_CMakeLists.txt
@@ -48,7 +48,6 @@ add_qt_executable(qmake
         ../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/qdatetime.cpp ../src/corelib/tools/qdatetime.h ../src/corelib/tools/qdatetime_p.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
@@ -90,6 +89,7 @@ add_qt_executable(qmake
         option.cpp option.h
         project.cpp project.h
         property.cpp property.h
+        qdatetime.cpp-NOTFOUND qdatetime.h-NOTFOUND qdatetime_p.h-NOTFOUND
     DEFINES
         =\"\"
         PROEVALUATOR_FULL
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
index 6f8763524f..7146776d67 100644
--- a/qmake/CMakeLists.txt
+++ b/qmake/CMakeLists.txt
@@ -63,7 +63,7 @@ add_qt_tool(qmake # special case
         ../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/qdatetime.cpp ../src/corelib/tools/qdatetime.h ../src/corelib/tools/qdatetime_p.h
+        ../src/corelib/time/qdatetime.cpp ../src/corelib/time/qdatetime.h ../src/corelib/time/qdatetime_p.h # special case
         ../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
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 9898346dbe..069cb0f12d 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -105,12 +105,12 @@ DEPEND_SRC = \
 	   $(SOURCE_PATH)/src/corelib/serialization/qtextstream.cpp \
 	   $(SOURCE_PATH)/src/corelib/serialization/qxmlstream.cpp \
 	   $(SOURCE_PATH)/src/corelib/serialization/qxmlutils.cpp \
+	   $(SOURCE_PATH)/src/corelib/time/qdatetime.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp\
 	   $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \
-	   $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qhash.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qlist.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp \
@@ -425,7 +425,7 @@ quuid.o: $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp
 qfileinfo.o: $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
-qdatetime.o: $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp
+qdatetime.o: $(SOURCE_PATH)/src/corelib/time/qdatetime.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
 qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 5fa49d2f7f..d300e49215 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -196,6 +196,9 @@ qmake_pch.obj:
 {$(SOURCE_PATH)\src\corelib\serialization}.cpp{}.obj::
 	$(CXX) $(CXXFLAGS) $<
 
+{$(SOURCE_PATH)\src\corelib\time}.cpp{}.obj::
+	$(CXX) $(CXXFLAGS) $<
+
 {$(SOURCE_PATH)\src\corelib\tools}.cpp{}.obj::
 	$(CXX) $(CXXFLAGS) $<
 
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 59a4008a3b..28cf02344d 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -1465,7 +1465,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
           << "\t\t\t" << writeSettings("name", "Qt Test") << ";\n"
           << "\t\t};\n";
 
-        QLatin1Literal testTargetID("TestTargetID");
+        QLatin1String testTargetID("TestTargetID");
         project->values(ProKey("QMAKE_PBX_TARGET_ATTRIBUTES_" + testTargetKey + "_" + testTargetID)).append(keyFor(pbx_dir + "QMAKE_PBX_TARGET"));
         project->values(ProKey("QMAKE_PBX_TARGET_ATTRIBUTES_" + testTargetKey)).append(ProKey(testTargetID));
     }
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 411bb37437..6ef5c0c3dc 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -199,7 +199,6 @@ MakefileGenerator::initOutPaths()
             ProStringList &inputs = project->values((*it2).toKey());
             for (ProStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
                 QString finp = fileFixify((*input).toQString(), FileFixifyFromOutdir);
-                *input = ProString(finp);
                 QString path = replaceExtraCompilerVariables(tmp_out, finp, QString(), NoShell);
                 path = Option::normalizePath(path);
                 int slash = path.lastIndexOf('/');