Remove qbspkgconfig.mergeDependencies

As promised.

Change-Id: I2e13d220057225f1afcad0cab1e5e049313cae2b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

3 files changed, 0 insertions, 56 deletions

diff --git a/tests/auto/pkgconfig/testdata/requires-test-merged-static.json b/tests/auto/pkgconfig/testdata/requires-test-merged-static.json
deleted file mode 100644
index 2c43b2d40..000000000
--- a/tests/auto/pkgconfig/testdata/requires-test-merged-static.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "Name": "Requires test package",
-    "Description": "Dummy pkgconfig test package for testing Requires/Requires.private",
-    "Version": "1.0.0",
-    "Libs": [
-        {"Type": "LibraryPath", "Value": "/public-dep/lib"},
-        {"Type": "LibraryName", "Value": "public-dep"},
-        {"Type": "LibraryPath", "Value": "/private-dep/lib"},
-        {"Type": "LibraryName", "Value": "private-dep"},
-        {"Type": "LibraryPath", "Value": "/requires-test/lib"},
-        {"Type": "LibraryName", "Value": "requires-test"}
-    ],
-    "Cflags": [
-        {"Type": "IncludePath", "Value": "/public-dep/include"},
-        {"Type": "IncludePath", "Value": "/private-dep/include"},
-        {"Type": "IncludePath", "Value": "/requires-test/include"}
-    ],
-    "Requires": [
-    ],
-    "RequiresPrivate": [
-    ]
-}
diff --git a/tests/auto/pkgconfig/testdata/requires-test-merged.json b/tests/auto/pkgconfig/testdata/requires-test-merged.json
deleted file mode 100644
index 88114ba30..000000000
--- a/tests/auto/pkgconfig/testdata/requires-test-merged.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "Name": "Requires test package",
-    "Description": "Dummy pkgconfig test package for testing Requires/Requires.private",
-    "Version": "1.0.0",
-    "Libs": [
-        {"Type": "LibraryPath", "Value": "/public-dep/lib"},
-        {"Type": "LibraryName", "Value": "public-dep"},
-        {"Type": "LibraryPath", "Value": "/requires-test/lib"},
-        {"Type": "LibraryName", "Value": "requires-test"}
-    ],
-    "Cflags": [
-        {"Type": "IncludePath", "Value": "/public-dep/include"},
-        {"Type": "IncludePath", "Value": "/requires-test/include"}
-    ],
-    "Requires": [
-    ],
-    "RequiresPrivate": [
-    ]
-}
diff --git a/tests/auto/pkgconfig/tst_pkgconfig.cpp b/tests/auto/pkgconfig/tst_pkgconfig.cpp
index ac94e1c48..86d954259 100644
--- a/tests/auto/pkgconfig/tst_pkgconfig.cpp
+++ b/tests/auto/pkgconfig/tst_pkgconfig.cpp
@@ -110,9 +110,6 @@ void TestPkgConfig::pkgConfig()
     if (jsonFileName.isEmpty())
         jsonFileName = pcFileName;
 
-    if (!optionsMap.contains("mergeDependencies"))
-        optionsMap["mergeDependencies"] = false;
-
     Options options = qbs::Internal::PkgConfigJs::convertOptions(
             QProcessEnvironment::systemEnvironment(), optionsMap);
     options.libDirs.push_back(m_workingDataDir.toStdString());
@@ -219,14 +216,6 @@ void TestPkgConfig::pkgConfig_data()
             << QStringLiteral("simple") << QString() << QVariantMap();
     QTest::newRow("requires-test")
             << QStringLiteral("requires-test") << QString() << QVariantMap();
-    QTest::newRow("requires-test-merged")
-            << QStringLiteral("requires-test")
-            << QStringLiteral("requires-test-merged")
-            << QVariantMap({{"mergeDependencies", true}});
-    QTest::newRow("requires-test-merged-static")
-            << QStringLiteral("requires-test")
-            << QStringLiteral("requires-test-merged-static")
-            << QVariantMap({{"mergeDependencies", true}, {"staticMode", true}});
     QTest::newRow("special-flags")
             << QStringLiteral("special-flags") << QString() << QVariantMap();
     QTest::newRow("system")
@@ -237,10 +226,6 @@ void TestPkgConfig::pkgConfig_data()
             << QStringLiteral("tilde") << QString() << QVariantMap();
     QTest::newRow("variables")
             << QStringLiteral("variables") << QString() << QVariantMap();
-    QTest::newRow("variables-merged")
-            << QStringLiteral("variables")
-            << QString()
-            << QVariantMap({{"mergeDependencies", true}});
     QTest::newRow("whitespace")
             << QStringLiteral("whitespace") << QString() << QVariantMap();
     QTest::newRow("base.name")