9 files changed, 11 insertions, 14 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs
index 586626b22d6..03670f29029 100644
--- a/qbs/imports/QtcAutotest.qbs
+++ b/qbs/imports/QtcAutotest.qbs
@@ -3,7 +3,7 @@ import qbs.FileInfo
 
 QtcProduct {
     type: ["application", "autotest"]
-    Depends { name: "Qt.test" }
+    Depends { name: "Qt.testlib" }
     Depends { name: "copyable_resource" }
     targetName: "tst_" + name.split(' ').join("")
 
diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs
index 5c54ba8894a..af6eb04bad6 100644
--- a/qbs/imports/QtcLibrary.qbs
+++ b/qbs/imports/QtcLibrary.qbs
@@ -8,7 +8,7 @@ QtcProduct {
     useNonGuiPchFile: true
     Depends {
         condition: qtc.testsEnabled
-        name: "Qt.test"
+        name: "Qt.testlib"
     }
 
     targetName: QtcFunctions.qtLibraryName(qbs, name)
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs
index 5f11e136eed..1a6406f176b 100644
--- a/qbs/imports/QtcPlugin.qbs
+++ b/qbs/imports/QtcPlugin.qbs
@@ -22,7 +22,7 @@ QtcProduct {
     Depends { name: "pluginjson" }
     Depends {
         condition: qtc.testsEnabled
-        name: "Qt.test"
+        name: "Qt.testlib"
     }
 
     Properties {
diff --git a/src/plugins/autotest/autotest.qbs b/src/plugins/autotest/autotest.qbs
index 9552909ed7d..6f6354e00c8 100644
--- a/src/plugins/autotest/autotest.qbs
+++ b/src/plugins/autotest/autotest.qbs
@@ -23,7 +23,7 @@ QtcPlugin {
     }
 
     Depends {
-        name: "Qt.test"
+        name: "Qt.testlib"
         condition: qtc.testsEnabled
     }
 
diff --git a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.qbs b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.qbs
index d10891316a2..971fcfaf041 100644
--- a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.qbs
+++ b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/bench/bench.qbs
@@ -6,7 +6,7 @@ CppApplication {
     targetName: "tst_benchtest"
 
     Depends { name: "cpp" }
-    Depends { name: "Qt.test" }
+    Depends { name: "Qt.testlib" }
 
     files: [ "tst_benchtest.cpp" ]
 
diff --git a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.qbs b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.qbs
index 012ba11a673..f5ad64f926d 100644
--- a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.qbs
+++ b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/dummy/dummy.qbs
@@ -5,7 +5,7 @@ CppApplication {
     name: "Dummy auto test"
     targetName: "tst_FooBar"
 
-    Depends { name: "Qt.test" }
+    Depends { name: "Qt.testlib" }
     Depends { name: "Qt.gui" }
 
     files: [ "tst_foo.cpp", "tst_foo.h" ]
diff --git a/src/plugins/autotest/unit_test/plain/test_plain/test_plain.qbs b/src/plugins/autotest/unit_test/plain/test_plain/test_plain.qbs
index 1b7937ce6a4..295c8a6acfd 100644
--- a/src/plugins/autotest/unit_test/plain/test_plain/test_plain.qbs
+++ b/src/plugins/autotest/unit_test/plain/test_plain/test_plain.qbs
@@ -4,7 +4,7 @@ CppApplication {
     type: "application" // suppress bundle generation on OSX
 
     Depends { name: "Qt.gui" }
-    Depends { name: "Qt.test" }
+    Depends { name: "Qt.testlib" }
 
     files: [ "tst_simple.cpp", "tst_simple.h" ]
 }
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index b80189782d4..626be0e04f8 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -21,12 +21,6 @@ Project {
         Depends { name: "QtSupport" }
         Depends { name: "TextEditor" }
 
-
-        Depends {
-            name: "Qt.test"
-            condition: qtc.testsEnabled
-        }
-
         pluginTestDepends: [
             "QmakeProjectManager"
         ]
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index fe903990cfe..b991840f919 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -4,7 +4,10 @@ import qbs.FileInfo
 QtcPlugin {
     name: "Designer"
 
-    Depends { name: "Qt"; submodules: ["widgets", "xml", "printsupport", "designer", "designercomponents"] }
+    Depends {
+        name: "Qt"
+        submodules: ["widgets", "xml", "printsupport", "designer", "designercomponents-private"]
+    }
     Depends { name: "CPlusPlus" }
     Depends { name: "Utils" }