6 files changed, 29 insertions, 38 deletions
diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri
index 39280deb2f..7513e40bfd 100644
--- a/src/3rdparty/freetype_dependency.pri
+++ b/src/3rdparty/freetype_dependency.pri
@@ -1,7 +1,7 @@
-contains(QT_CONFIG, freetype) {
-    INCLUDEPATH += $$PWD/freetype/include
-    LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtfreetype$$qtPlatformTargetSuffix()
-} else:contains(QT_CONFIG, system-freetype) {
+contains(QT_CONFIG, system-freetype) {
     # pull in the proper freetype2 include directory
     include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
+} else: contains(QT_CONFIG, freetype) {
+    INCLUDEPATH += $$PWD/freetype/include
+    LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtfreetype$$qtPlatformTargetSuffix()
 }
diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri
index 74433688f6..36abbfbe35 100644
--- a/src/3rdparty/harfbuzz_dependency.pri
+++ b/src/3rdparty/harfbuzz_dependency.pri
@@ -1,6 +1,6 @@
-contains(QT_CONFIG, harfbuzz) {
+contains(QT_CONFIG, system-harfbuzz) {
+    LIBS_PRIVATE += -lharfbuzz
+} else: contains(QT_CONFIG, harfbuzz) {
     INCLUDEPATH += $$PWD/harfbuzz-ng/include
     LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix()
-} else:contains(QT_CONFIG, system-harfbuzz) {
-    LIBS_PRIVATE += -lharfbuzz
 }
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
index bfb677e6fb..b87d5f4e5d 100644
--- a/src/corelib/codecs/codecs.pri
+++ b/src/corelib/codecs/codecs.pri
@@ -41,19 +41,16 @@ contains(QT_CONFIG,icu) {
         codecs/qbig5codec.cpp
 
     unix:!qnx:!mac:!ios:!linux-android-* {
-            contains(QT_CONFIG,iconv) {
-                    HEADERS += codecs/qiconvcodec_p.h
-                    SOURCES += codecs/qiconvcodec.cpp
-            } else:contains(QT_CONFIG,gnu-libiconv) {
-                    HEADERS += codecs/qiconvcodec_p.h
-                    SOURCES += codecs/qiconvcodec.cpp
-                    DEFINES += GNU_LIBICONV
-                    LIBS_PRIVATE *= -liconv
-            } else:contains(QT_CONFIG,sun-libiconv) {
-                    HEADERS += codecs/qiconvcodec_p.h
-                    SOURCES += codecs/qiconvcodec.cpp
-                    DEFINES += GNU_LIBICONV
+        contains(QT_CONFIG, iconv) {
+            HEADERS += codecs/qiconvcodec_p.h
+            SOURCES += codecs/qiconvcodec.cpp
+            contains(QT_CONFIG, gnu-libiconv) {
+                DEFINES += GNU_LIBICONV
+                LIBS_PRIVATE *= -liconv
+            } else: contains(QT_CONFIG, sun-libiconv) {
+                DEFINES += GNU_LIBICONV
             }
+        }
     } else:!win32-msvc* {
         DEFINES += QT_NO_ICONV
     }
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 95a7ece67c..07200b1249 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -197,12 +197,10 @@ INCLUDEPATH += ../3rdparty/md5 \
                ../3rdparty/md4 \
                ../3rdparty/sha3
 
-contains(QT_CONFIG, doubleconversion) {
-    include($$PWD/../../3rdparty/double-conversion/double-conversion.pri)
-} else:contains(QT_CONFIG, system-doubleconversion) {
+contains(QT_CONFIG, system-doubleconversion) {
     LIBS_PRIVATE += -ldouble-conversion
-} else {
-    DEFINES += QT_NO_DOUBLECONVERSION
+} else: contains(QT_CONFIG, doubleconversion) {
+    include($$PWD/../../3rdparty/double-conversion/double-conversion.pri)
 }
 
 # Note: libm should be present by default becaue this is C++
diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
index cb784e89d2..2c6d316c34 100644
--- a/src/plugins/platforms/windows/windows.pri
+++ b/src/plugins/platforms/windows/windows.pri
@@ -110,18 +110,14 @@ contains(QT_CONFIG,dynamicgl) {
 RESOURCES += $$PWD/openglblacklists.qrc
 
 contains(QT_CONFIG, freetype) {
-    DEFINES *= QT_NO_FONTCONFIG
-    include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri)
-    HEADERS += \
-               $$PWD/qwindowsfontdatabase_ft.h
-    SOURCES += \
-               $$PWD/qwindowsfontdatabase_ft.cpp
-} else:contains(QT_CONFIG, system-freetype) {
-    include($$QT_SOURCE_TREE/src/platformsupport/fontdatabases/basic/basic.pri)
-    HEADERS += \
-               $$PWD/qwindowsfontdatabase_ft.h
-    SOURCES += \
-               $$PWD/qwindowsfontdatabase_ft.cpp
+    HEADERS += $$PWD/qwindowsfontdatabase_ft.h
+    SOURCES += $$PWD/qwindowsfontdatabase_ft.cpp
+    contains(QT_CONFIG, system-freetype) {
+        include($$QT_SOURCE_TREE/src/platformsupport/fontdatabases/basic/basic.pri)
+    } else {
+        DEFINES *= QT_NO_FONTCONFIG
+        include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri)
+    }
 }
 
 contains(QT_CONFIG, accessibility):include($$PWD/accessible/accessible.pri)
diff --git a/src/src.pro b/src/src.pro
index 88add4e807..0e411f96af 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -149,7 +149,7 @@ contains(QT_CONFIG, dbus) {
 }
 contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
 !contains(QT_CONFIG, no-gui) {
-    contains(QT_CONFIG, harfbuzz) {
+    contains(QT_CONFIG, harfbuzz):!contains(QT_CONFIG, system-harfbuzz) {
         SUBDIRS += src_3rdparty_harfbuzzng
         src_gui.depends += src_3rdparty_harfbuzzng
     }
@@ -157,7 +157,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
         SUBDIRS += src_angle
         src_gui.depends += src_angle
     }
-    contains(QT_CONFIG, freetype) {
+    contains(QT_CONFIG, freetype):!contains(QT_CONFIG, system-freetype) {
         SUBDIRS += src_3rdparty_freetype
         src_platformsupport.depends += src_3rdparty_freetype
     }