1 files changed, 4 insertions, 19 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index c4c347d6ff..5de0c09a4d 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -161,23 +161,12 @@ contains(QT_CONFIG, zlib) {
 }
 
 contains(QT_CONFIG,icu) {
+    include($$PWD/../../3rdparty/icu_dependency.pri)
+
     SOURCES += tools/qlocale_icu.cpp \
                tools/qcollator_icu.cpp \
                tools/qtimezoneprivate_icu.cpp
     DEFINES += QT_USE_ICU
-    win32 {
-        CONFIG(static, static|shared) {
-            CONFIG(debug, debug|release) {
-                LIBS_PRIVATE += -lsicuind -lsicuucd -lsicudtd
-            } else {
-                LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt
-            }
-        } else {
-            LIBS_PRIVATE += -licuin -licuuc -licudt
-        }
-    } else {
-        LIBS_PRIVATE += -licui18n -licuuc -licudata
-    }
 } else: win32 {
     SOURCES += tools/qcollator_win.cpp
 } else: macx {
@@ -187,14 +176,10 @@ contains(QT_CONFIG,icu) {
 }
 
 !contains(QT_DISABLED_FEATURES, regularexpression) {
+    include($$PWD/../../3rdparty/pcre_dependency.pri)
+
     HEADERS += tools/qregularexpression.h
     SOURCES += tools/qregularexpression.cpp
-
-    pcre {
-        include($$PWD/../../3rdparty/pcre.pri)
-    } else {
-        LIBS_PRIVATE += -lpcre16
-    }
 }
 
 INCLUDEPATH += ../3rdparty/harfbuzz/src