1 files changed, 45 insertions, 39 deletions

diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index b64ec756ba..fb80bbd6b8 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -15,8 +15,6 @@ HEADERS +=  \
         tools/qbytedata_p.h \
         tools/qcache.h \
         tools/qchar.h \
-        tools/qcommandlineoption.h \
-        tools/qcommandlineparser.h \
         tools/qcollator.h \
         tools/qcollator_p.h \
         tools/qcontainerfwd.h \
@@ -67,11 +65,7 @@ HEADERS +=  \
         tools/qstringmatcher.h \
         tools/qtextboundaryfinder.h \
         tools/qtimeline.h \
-        tools/qtimezone.h \
-        tools/qtimezoneprivate_p.h \
-        tools/qtimezoneprivate_data_p.h \
         tools/qtools_p.h \
-        tools/qelapsedtimer.h \
         tools/qunicodetables_p.h \
         tools/qunicodetools_p.h \
         tools/qvarlengtharray.h \
@@ -86,13 +80,10 @@ SOURCES += \
         tools/qbytearraylist.cpp \
         tools/qbytearraymatcher.cpp \
         tools/qcollator.cpp \
-        tools/qcommandlineoption.cpp \
-        tools/qcommandlineparser.cpp \
         tools/qcryptographichash.cpp \
         tools/qdatetime.cpp \
         tools/qdatetimeparser.cpp \
         tools/qeasingcurve.cpp \
-        tools/qelapsedtimer.cpp \
         tools/qfreelist.cpp \
         tools/qhash.cpp \
         tools/qline.cpp \
@@ -118,8 +109,6 @@ SOURCES += \
         tools/qstringlist.cpp \
         tools/qtextboundaryfinder.cpp \
         tools/qtimeline.cpp \
-        tools/qtimezone.cpp \
-        tools/qtimezoneprivate.cpp \
         tools/qunicodetools.cpp \
         tools/qvector.cpp \
         tools/qvsnprintf.cpp \
@@ -130,41 +119,31 @@ msvc: NO_PCH_SOURCES += tools/qvector_msvc.cpp
 false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator
 
 !nacl:mac: {
-    SOURCES += tools/qelapsedtimer_mac.cpp
-    OBJECTIVE_SOURCES += tools/qlocale_mac.mm \
-                         tools/qtimezoneprivate_mac.mm \
-                         tools/qstring_mac.mm \
-                         tools/qbytearray_mac.mm \
-                         tools/qdatetime_mac.mm
-}
-else:android {
-    SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp tools/qtimezoneprivate_android.cpp
+    SOURCES += tools/qlocale_mac.mm
 }
 else:unix {
-    SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp tools/qtimezoneprivate_tz.cpp
+    SOURCES += tools/qlocale_unix.cpp
 }
 else:win32 {
-    SOURCES += tools/qelapsedtimer_win.cpp \
-               tools/qlocale_win.cpp \
-               tools/qtimezoneprivate_win.cpp
+    SOURCES += tools/qlocale_win.cpp
     winphone: LIBS_PRIVATE += -lWindowsPhoneGlobalizationUtil
     winrt-*-msvc2013: LIBS += advapi32.lib
-} else:integrity:SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp
-else:SOURCES += tools/qelapsedtimer_generic.cpp
+} else:integrity {
+    SOURCES += tools/qlocale_unix.cpp
+}
 
-contains(QT_CONFIG, zlib) {
-    include($$PWD/../../3rdparty/zlib.pri)
+qtConfig(system-zlib) {
+    include($$PWD/../../3rdparty/zlib_dependency.pri)
 } else {
     CONFIG += no_core_dep
-    include($$PWD/../../3rdparty/zlib_dependency.pri)
+    include($$PWD/../../3rdparty/zlib.pri)
 }
 
-contains(QT_CONFIG,icu) {
+qtConfig(icu) {
     include($$PWD/../../3rdparty/icu_dependency.pri)
 
     SOURCES += tools/qlocale_icu.cpp \
-               tools/qcollator_icu.cpp \
-               tools/qtimezoneprivate_icu.cpp
+               tools/qcollator_icu.cpp
     DEFINES += QT_USE_ICU
 } else: win32 {
     SOURCES += tools/qcollator_win.cpp
@@ -174,13 +153,42 @@ contains(QT_CONFIG,icu) {
     SOURCES += tools/qcollator_posix.cpp
 }
 
-!contains(QT_DISABLED_FEATURES, regularexpression) {
-    include($$PWD/../../3rdparty/pcre_dependency.pri)
+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: \
+        SOURCES += tools/qtimezoneprivate_android.cpp
+    else: unix: \
+        SOURCES += tools/qtimezoneprivate_tz.cpp
+    else: win32: \
+        SOURCES += tools/qtimezoneprivate_win.cpp
+    qtConfig(icu): \
+        SOURCES += tools/qtimezoneprivate_icu.cpp
+}
+
+qtConfig(regularexpression) {
+    QMAKE_USE_PRIVATE += pcre
 
     HEADERS += tools/qregularexpression.h
     SOURCES += tools/qregularexpression.cpp
 }
 
+qtConfig(commandlineparser) {
+    HEADERS += \
+        tools/qcommandlineoption.h \
+        tools/qcommandlineparser.h
+    SOURCES += \
+        tools/qcommandlineoption.cpp \
+        tools/qcommandlineparser.cpp
+}
+
 INCLUDEPATH += ../3rdparty/harfbuzz/src
 HEADERS += ../3rdparty/harfbuzz/src/harfbuzz.h
 SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \
@@ -198,12 +206,10 @@ INCLUDEPATH += ../3rdparty/md5 \
                ../3rdparty/md4 \
                ../3rdparty/sha3
 
-contains(QT_CONFIG, doubleconversion) {
+qtConfig(system-doubleconversion) {
+    QMAKE_USE_PRIVATE += doubleconversion
+} else: qtConfig(doubleconversion) {
     include($$PWD/../../3rdparty/double-conversion/double-conversion.pri)
-} else:contains(QT_CONFIG, system-doubleconversion) {
-    LIBS_PRIVATE += -ldouble-conversion
-} else {
-    DEFINES += QT_NO_DOUBLECONVERSION
 }
 
 # Note: libm should be present by default becaue this is C++