Separate out the time, zone, date code from corelib/tools/

We'll be adding calendar code here as well, and tools/ was getting
rather crowded, so it looks like time to move out a reasonably
coherent sub-bundle of it all.

Change-Id: I7e8030f38c31aa307f519dd918a43fc44baa6aa1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 
 

50 files changed, 59 insertions, 45 deletions

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/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 6babbac8f5..521f840292 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -36,6 +36,7 @@ qtConfig(animation): include(animation/animation.pri)
 include(global/global.pri)
 include(thread/thread.pri)
 include(tools/tools.pri)
+include(time/time.pri)
 include(io/io.pri)
 include(itemmodels/itemmodels.pri)
 include(plugin/plugin.pri)
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/time/qdatetime.cpp
index 9220d210f1..9220d210f1 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/time/qdatetime.cpp
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/time/qdatetime.h
index 3e3b953b52..3e3b953b52 100644
--- a/src/corelib/tools/qdatetime.h
+++ b/src/corelib/time/qdatetime.h
diff --git a/src/corelib/tools/qdatetime_p.h b/src/corelib/time/qdatetime_p.h
index 6018f8f7b0..6018f8f7b0 100644
--- a/src/corelib/tools/qdatetime_p.h
+++ b/src/corelib/time/qdatetime_p.h
diff --git a/src/corelib/tools/qdatetimeparser.cpp b/src/corelib/time/qdatetimeparser.cpp
index 728b066db1..728b066db1 100644
--- a/src/corelib/tools/qdatetimeparser.cpp
+++ b/src/corelib/time/qdatetimeparser.cpp
diff --git a/src/corelib/tools/qdatetimeparser_p.h b/src/corelib/time/qdatetimeparser_p.h
index d9e39f0795..d9e39f0795 100644
--- a/src/corelib/tools/qdatetimeparser_p.h
+++ b/src/corelib/time/qdatetimeparser_p.h
diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/time/qtimezone.cpp
index ef323de14a..ef323de14a 100644
--- a/src/corelib/tools/qtimezone.cpp
+++ b/src/corelib/time/qtimezone.cpp
diff --git a/src/corelib/tools/qtimezone.h b/src/corelib/time/qtimezone.h
index 62ecee49bb..62ecee49bb 100644
--- a/src/corelib/tools/qtimezone.h
+++ b/src/corelib/time/qtimezone.h
diff --git a/src/corelib/tools/qtimezoneprivate.cpp b/src/corelib/time/qtimezoneprivate.cpp
index 569b343187..569b343187 100644
--- a/src/corelib/tools/qtimezoneprivate.cpp
+++ b/src/corelib/time/qtimezoneprivate.cpp
diff --git a/src/corelib/tools/qtimezoneprivate_android.cpp b/src/corelib/time/qtimezoneprivate_android.cpp
index be4f374fdd..be4f374fdd 100644
--- a/src/corelib/tools/qtimezoneprivate_android.cpp
+++ b/src/corelib/time/qtimezoneprivate_android.cpp
diff --git a/src/corelib/tools/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h
index 40d6c972c2..40d6c972c2 100644
--- a/src/corelib/tools/qtimezoneprivate_data_p.h
+++ b/src/corelib/time/qtimezoneprivate_data_p.h
diff --git a/src/corelib/tools/qtimezoneprivate_icu.cpp b/src/corelib/time/qtimezoneprivate_icu.cpp
index 5570ce7571..5570ce7571 100644
--- a/src/corelib/tools/qtimezoneprivate_icu.cpp
+++ b/src/corelib/time/qtimezoneprivate_icu.cpp
diff --git a/src/corelib/tools/qtimezoneprivate_mac.mm b/src/corelib/time/qtimezoneprivate_mac.mm
index d3c4fbe5da..d3c4fbe5da 100644
--- a/src/corelib/tools/qtimezoneprivate_mac.mm
+++ b/src/corelib/time/qtimezoneprivate_mac.mm
diff --git a/src/corelib/tools/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h
index b5e9286f6a..5f6491ef81 100644
--- a/src/corelib/tools/qtimezoneprivate_p.h
+++ b/src/corelib/time/qtimezoneprivate_p.h
@@ -53,7 +53,7 @@
 //
 
 #include "qtimezone.h"
-#include "qlocale_p.h"
+#include "private/qlocale_p.h"
 #include "qvector.h"
 
 #if QT_CONFIG(icu)
diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
index f5440799ab..2c845b1bce 100644
--- a/src/corelib/tools/qtimezoneprivate_tz.cpp
+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
@@ -40,6 +40,7 @@
 #include "qtimezone.h"
 #include "qtimezoneprivate_p.h"
 #include "qdatetime_p.h" // ### Qt 5.14: remove once YearRange is on QDateTime
+#include "private/qlocale_tools_p.h"
 
 #include <QtCore/QFile>
 #include <QtCore/QHash>
@@ -48,8 +49,6 @@
 
 #include <qdebug.h>
 
-#include "qlocale_tools_p.h"
-
 #include <algorithm>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/corelib/tools/qtimezoneprivate_win.cpp b/src/corelib/time/qtimezoneprivate_win.cpp
index 1bf2366748..1bf2366748 100644
--- a/src/corelib/tools/qtimezoneprivate_win.cpp
+++ b/src/corelib/time/qtimezoneprivate_win.cpp
diff --git a/src/corelib/time/time.pri b/src/corelib/time/time.pri
new file mode 100644
index 0000000000..bacb7e875d
--- /dev/null
+++ b/src/corelib/time/time.pri
@@ -0,0 +1,34 @@
+# Qt time / date / zone / calendar module
+
+HEADERS += \
+        time/qdatetime.h \
+        time/qdatetime_p.h
+
+SOURCES += time/qdatetime.cpp
+
+qtConfig(timezone) {
+    HEADERS += \
+        time/qtimezone.h \
+        time/qtimezoneprivate_p.h \
+        time/qtimezoneprivate_data_p.h
+    SOURCES += \
+        time/qtimezone.cpp \
+        time/qtimezoneprivate.cpp
+    !nacl:darwin: {
+        SOURCES += time/qtimezoneprivate_mac.mm
+    } else: android:!android-embedded: {
+        SOURCES += time/qtimezoneprivate_android.cpp
+    } else: unix: {
+        SOURCES += time/qtimezoneprivate_tz.cpp
+        qtConfig(icu): SOURCES += time/qtimezoneprivate_icu.cpp
+    } else: qtConfig(icu): {
+        SOURCES += time/qtimezoneprivate_icu.cpp
+    } else: win32: {
+        SOURCES += time/qtimezoneprivate_win.cpp
+    }
+}
+
+qtConfig(datetimeparser) {
+    HEADERS += time/qdatetimeparser_p.h
+    SOURCES += time/qdatetimeparser.cpp
+}
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index f6eaa53c3a..c8740e55f3 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -55,7 +55,7 @@
 #include "qlocale_p.h"
 #include "qlocale_tools_p.h"
 #if QT_CONFIG(datetimeparser)
-#include "qdatetimeparser_p.h"
+#include "private/qdatetimeparser_p.h"
 #endif
 #include "qnamespace.h"
 #include "qdatetime.h"
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 5dcb6c9ee0..52eddd5d6b 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -20,8 +20,6 @@ HEADERS +=  \
         tools/qcontainerfwd.h \
         tools/qcontainertools_impl.h \
         tools/qcryptographichash.h \
-        tools/qdatetime.h \
-        tools/qdatetime_p.h \
         tools/qdoublescanprint_p.h \
         tools/qeasingcurve.h \
         tools/qfreelist_p.h \
@@ -86,7 +84,6 @@ SOURCES += \
         tools/qbytearraymatcher.cpp \
         tools/qcollator.cpp \
         tools/qcryptographichash.cpp \
-        tools/qdatetime.cpp \
         tools/qeasingcurve.cpp \
         tools/qfreelist.cpp \
         tools/qhash.cpp \
@@ -154,33 +151,6 @@ qtConfig(icu) {
     SOURCES += tools/qcollator_posix.cpp
 }
 
-qtConfig(timezone) {
-    HEADERS += \
-        tools/qtimezone.h \
-        tools/qtimezoneprivate_p.h \
-        tools/qtimezoneprivate_data_p.h
-    SOURCES += \
-        tools/qtimezone.cpp \
-        tools/qtimezoneprivate.cpp
-    !nacl:darwin: {
-        SOURCES += tools/qtimezoneprivate_mac.mm
-    } else: android:!android-embedded: {
-        SOURCES += tools/qtimezoneprivate_android.cpp
-    } else: unix: {
-        SOURCES += tools/qtimezoneprivate_tz.cpp
-        qtConfig(icu): SOURCES += tools/qtimezoneprivate_icu.cpp
-    } else: qtConfig(icu): {
-        SOURCES += tools/qtimezoneprivate_icu.cpp
-    } else: win32: {
-        SOURCES += tools/qtimezoneprivate_win.cpp
-    }
-}
-
-qtConfig(datetimeparser) {
-    HEADERS += tools/qdatetimeparser_p.h
-    SOURCES += tools/qdatetimeparser.cpp
-}
-
 qtConfig(regularexpression) {
     QMAKE_USE_PRIVATE += pcre2
 
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 3aeca6e7af..40c0702f0a 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -72,6 +72,7 @@ SOURCES += \
            ../../corelib/serialization/qtextstream.cpp \
            ../../corelib/serialization/qxmlutils.cpp \
            ../../corelib/serialization/qxmlstream.cpp \
+           ../../corelib/time/qdatetime.cpp \
            ../../corelib/tools/qbitarray.cpp \
            ../../corelib/tools/qbytearray.cpp \
            ../../corelib/tools/qarraydata.cpp \
@@ -79,7 +80,6 @@ SOURCES += \
            ../../corelib/tools/qcommandlineparser.cpp \
            ../../corelib/tools/qcommandlineoption.cpp \
            ../../corelib/tools/qcryptographichash.cpp \
-           ../../corelib/tools/qdatetime.cpp \
            ../../corelib/tools/qhash.cpp \
            ../../corelib/tools/qlist.cpp \
            ../../corelib/tools/qlinkedlist.cpp \
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index 44e1c519b0..1d76e1549b 100644
--- a/tests/auto/corelib/corelib.pro
+++ b/tests/auto/corelib/corelib.pro
@@ -14,4 +14,5 @@ SUBDIRS = \
    serialization \
    statemachine \
    thread \
+   time \
    tools
diff --git a/tests/auto/corelib/tools/qdate/.gitignore b/tests/auto/corelib/time/qdate/.gitignore
index 70945d4a86..70945d4a86 100644
--- a/tests/auto/corelib/tools/qdate/.gitignore
+++ b/tests/auto/corelib/time/qdate/.gitignore
diff --git a/tests/auto/corelib/tools/qdate/qdate.pro b/tests/auto/corelib/time/qdate/qdate.pro
index 925c3b4c78..925c3b4c78 100644
--- a/tests/auto/corelib/tools/qdate/qdate.pro
+++ b/tests/auto/corelib/time/qdate/qdate.pro
diff --git a/tests/auto/corelib/tools/qdate/tst_qdate.cpp b/tests/auto/corelib/time/qdate/tst_qdate.cpp
index 0ef494b229..0ef494b229 100644
--- a/tests/auto/corelib/tools/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/time/qdate/tst_qdate.cpp
diff --git a/tests/auto/corelib/tools/qdatetime/.gitignore b/tests/auto/corelib/time/qdatetime/.gitignore
index 7784f3a3eb..7784f3a3eb 100644
--- a/tests/auto/corelib/tools/qdatetime/.gitignore
+++ b/tests/auto/corelib/time/qdatetime/.gitignore
diff --git a/tests/auto/corelib/tools/qdatetime/BLACKLIST b/tests/auto/corelib/time/qdatetime/BLACKLIST
index 3a42ee066b..3a42ee066b 100644
--- a/tests/auto/corelib/tools/qdatetime/BLACKLIST
+++ b/tests/auto/corelib/time/qdatetime/BLACKLIST
diff --git a/tests/auto/corelib/tools/qdatetime/qdatetime.pro b/tests/auto/corelib/time/qdatetime/qdatetime.pro
index 742eb47075..742eb47075 100644
--- a/tests/auto/corelib/tools/qdatetime/qdatetime.pro
+++ b/tests/auto/corelib/time/qdatetime/qdatetime.pro
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
index 6f0aebb071..6f0aebb071 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime_mac.mm b/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm
index f73c7b9d5d..f73c7b9d5d 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime_mac.mm
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm
diff --git a/tests/auto/corelib/tools/qtime/.gitignore b/tests/auto/corelib/time/qtime/.gitignore
index 26a4c65cc2..26a4c65cc2 100644
--- a/tests/auto/corelib/tools/qtime/.gitignore
+++ b/tests/auto/corelib/time/qtime/.gitignore
diff --git a/tests/auto/corelib/tools/qtime/qtime.pro b/tests/auto/corelib/time/qtime/qtime.pro
index 0973b7a9ef..0973b7a9ef 100644
--- a/tests/auto/corelib/tools/qtime/qtime.pro
+++ b/tests/auto/corelib/time/qtime/qtime.pro
diff --git a/tests/auto/corelib/tools/qtime/tst_qtime.cpp b/tests/auto/corelib/time/qtime/tst_qtime.cpp
index 3403c5bf7f..3403c5bf7f 100644
--- a/tests/auto/corelib/tools/qtime/tst_qtime.cpp
+++ b/tests/auto/corelib/time/qtime/tst_qtime.cpp
diff --git a/tests/auto/corelib/tools/qtimezone/BLACKLIST b/tests/auto/corelib/time/qtimezone/BLACKLIST
index 840c3b1181..840c3b1181 100644
--- a/tests/auto/corelib/tools/qtimezone/BLACKLIST
+++ b/tests/auto/corelib/time/qtimezone/BLACKLIST
diff --git a/tests/auto/corelib/tools/qtimezone/qtimezone.pro b/tests/auto/corelib/time/qtimezone/qtimezone.pro
index 5ec8d008e7..5ec8d008e7 100644
--- a/tests/auto/corelib/tools/qtimezone/qtimezone.pro
+++ b/tests/auto/corelib/time/qtimezone/qtimezone.pro
diff --git a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
index 9904719f7c..9904719f7c 100644
--- a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
+++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
diff --git a/tests/auto/corelib/tools/qtimezone/tst_qtimezone_darwin.mm b/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm
index de801e55d0..de801e55d0 100644
--- a/tests/auto/corelib/tools/qtimezone/tst_qtimezone_darwin.mm
+++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm
diff --git a/tests/auto/corelib/time/time.pro b/tests/auto/corelib/time/time.pro
new file mode 100644
index 0000000000..6f9ff038db
--- /dev/null
+++ b/tests/auto/corelib/time/time.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+    qdate \
+    qdatetime \
+    qtime \
+    qtimezone
diff --git a/tests/auto/corelib/tools/tools.pro b/tests/auto/corelib/tools/tools.pro
index c6da33cce0..243e7e96f5 100644
--- a/tests/auto/corelib/tools/tools.pro
+++ b/tests/auto/corelib/tools/tools.pro
@@ -16,8 +16,6 @@ SUBDIRS=\
     qcommandlineparser \
     qcontiguouscache \
     qcryptographichash \
-    qdate \
-    qdatetime \
     qeasingcurve \
     qexplicitlyshareddatapointer \
     qfreelist \
@@ -62,8 +60,6 @@ SUBDIRS=\
     qstringref \
     qstringview \
     qtextboundaryfinder \
-    qtime \
-    qtimezone \
     qtimeline \
     qvarlengtharray \
     qvector \
diff --git a/tests/benchmarks/corelib/corelib.pro b/tests/benchmarks/corelib/corelib.pro
index b5781ad49e..99af4c138f 100644
--- a/tests/benchmarks/corelib/corelib.pro
+++ b/tests/benchmarks/corelib/corelib.pro
@@ -5,6 +5,7 @@ SUBDIRS = \
         mimetypes \
         kernel \
         thread \
+        time \
         tools \
         codecs \
         plugin
diff --git a/tests/benchmarks/corelib/tools/qdate/qdate.pro b/tests/benchmarks/corelib/time/qdate/qdate.pro
index a655917135..a655917135 100644
--- a/tests/benchmarks/corelib/tools/qdate/qdate.pro
+++ b/tests/benchmarks/corelib/time/qdate/qdate.pro
diff --git a/tests/benchmarks/corelib/tools/qdate/tst_bench_qdate.cpp b/tests/benchmarks/corelib/time/qdate/tst_bench_qdate.cpp
index 399ac44065..399ac44065 100644
--- a/tests/benchmarks/corelib/tools/qdate/tst_bench_qdate.cpp
+++ b/tests/benchmarks/corelib/time/qdate/tst_bench_qdate.cpp
diff --git a/tests/benchmarks/corelib/tools/qdatetime/main.cpp b/tests/benchmarks/corelib/time/qdatetime/main.cpp
index b693400376..b693400376 100644
--- a/tests/benchmarks/corelib/tools/qdatetime/main.cpp
+++ b/tests/benchmarks/corelib/time/qdatetime/main.cpp
diff --git a/tests/benchmarks/corelib/tools/qdatetime/qdatetime.pro b/tests/benchmarks/corelib/time/qdatetime/qdatetime.pro
index a85e7346c6..a85e7346c6 100644
--- a/tests/benchmarks/corelib/tools/qdatetime/qdatetime.pro
+++ b/tests/benchmarks/corelib/time/qdatetime/qdatetime.pro
diff --git a/tests/benchmarks/corelib/tools/qtimezone/main.cpp b/tests/benchmarks/corelib/time/qtimezone/main.cpp
index 65455a7261..65455a7261 100644
--- a/tests/benchmarks/corelib/tools/qtimezone/main.cpp
+++ b/tests/benchmarks/corelib/time/qtimezone/main.cpp
diff --git a/tests/benchmarks/corelib/tools/qtimezone/qtimezone.pro b/tests/benchmarks/corelib/time/qtimezone/qtimezone.pro
index d0531b568b..d0531b568b 100644
--- a/tests/benchmarks/corelib/tools/qtimezone/qtimezone.pro
+++ b/tests/benchmarks/corelib/time/qtimezone/qtimezone.pro
diff --git a/tests/benchmarks/corelib/time/time.pro b/tests/benchmarks/corelib/time/time.pro
new file mode 100644
index 0000000000..b5184845d9
--- /dev/null
+++ b/tests/benchmarks/corelib/time/time.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+        qdate \
+        qdatetime \
+        qtimezone
diff --git a/tests/benchmarks/corelib/tools/tools.pro b/tests/benchmarks/corelib/tools/tools.pro
index ca9c0a6f89..33cbe00438 100644
--- a/tests/benchmarks/corelib/tools/tools.pro
+++ b/tests/benchmarks/corelib/tools/tools.pro
@@ -5,7 +5,6 @@ SUBDIRS = \
         qbytearray \
         qcontiguouscache \
         qcryptographichash \
-        qdatetime \
         qlist \
         qlocale \
         qmap \
@@ -15,7 +14,6 @@ SUBDIRS = \
         qstring \
         qstringbuilder \
         qstringlist \
-        qtimezone \
         qvector \
         qalgorithms
 
diff --git a/util/locale_database/cldr2qtimezone.py b/util/locale_database/cldr2qtimezone.py
index 256839317c..0817435d40 100755
--- a/util/locale_database/cldr2qtimezone.py
+++ b/util/locale_database/cldr2qtimezone.py
@@ -32,7 +32,7 @@ Script to parse the CLDR supplemental/windowsZones.xml file and encode
 for use in QTimeZone.  See ``./cldr2qlocalexml.py`` for where to get
 the CLDR data.  Pass its common/ directory as first parameter to this
 script and the qtbase root directory as second parameter.  It shall
-update qtbase's src/corelib/tools/qtimezoneprivate_data_p.h ready for
+update qtbase's src/corelib/time/qtimezoneprivate_data_p.h ready for
 use.
 
 The XML structure is as follows:
@@ -268,7 +268,7 @@ if not os.path.isdir(cldrPath) or not os.path.isdir(qtPath):
 
 windowsZonesPath = cldrPath + "/supplemental/windowsZones.xml"
 tempFileDir = qtPath
-dataFilePath = qtPath + "/src/corelib/tools/qtimezoneprivate_data_p.h"
+dataFilePath = qtPath + "/src/corelib/time/qtimezoneprivate_data_p.h"
 
 if not os.path.isfile(windowsZonesPath):
     usage()