1 files changed, 11 insertions, 7 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 72224f280d..30f7edb5f2 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -159,16 +159,18 @@ qtConfig(timezone) {
     SOURCES += \
         tools/qtimezone.cpp \
         tools/qtimezoneprivate.cpp
-    !nacl:darwin: \
+    !nacl:darwin: {
         SOURCES += tools/qtimezoneprivate_mac.mm
-    else: android:!android-embedded: \
+    } else: android:!android-embedded: {
         SOURCES += tools/qtimezoneprivate_android.cpp
-    else: unix: \
+    } else: unix: {
         SOURCES += tools/qtimezoneprivate_tz.cpp
-    else: win32: \
-        SOURCES += tools/qtimezoneprivate_win.cpp
-    qtConfig(icu): \
+        qtConfig(icu): SOURCES += tools/qtimezoneprivate_icu.cpp
+    } else: qtConfig(icu): {
         SOURCES += tools/qtimezoneprivate_icu.cpp
+    } else: win32: {
+        SOURCES += tools/qtimezoneprivate_win.cpp
+    }
 }
 
 qtConfig(datetimeparser) {
@@ -179,7 +181,9 @@ qtConfig(datetimeparser) {
 qtConfig(regularexpression) {
     QMAKE_USE_PRIVATE += pcre2
 
-    HEADERS += tools/qregularexpression.h
+    HEADERS += \
+        tools/qregularexpression.h \
+        tools/qregularexpression_p.h
     SOURCES += tools/qregularexpression.cpp
 }