Generalize error message

Replace "Product dependency XXX not found" with a more general
"Dependency XXX not found".

Change-Id: Iae0282fa295820643259ad46c25648499c62bf5a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

3 files changed, 5 insertions, 6 deletions

diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 5978a7f73..9e4121a68 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -1005,8 +1005,7 @@ void ModuleLoader::resolveDependsItem(DependsContext *dependsContext, Item *pare
         Item *moduleItem = loadModule(dependsContext->product, parentItem, dependsItem->location(),
                                       dependsItem->id(), moduleName, isRequired, &result.isProduct);
         if (!moduleItem) {
-            // ### 1.5: change error message to the more generic "Dependency '%1' not found.".
-            throw ErrorInfo(Tr::tr("Product dependency '%1' not found.").arg(moduleName.toString()),
+            throw ErrorInfo(Tr::tr("Dependency '%1' not found.").arg(moduleName.toString()),
                             dependsItem->location());
         }
         if (m_logger.traceEnabled())
diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp
index 622639823..3c1ea5132 100644
--- a/src/lib/corelib/language/tst_language.cpp
+++ b/src/lib/corelib/language/tst_language.cpp
@@ -456,7 +456,7 @@ void TestLanguage::erroneousFiles_data()
 {
     QTest::addColumn<QString>("errorMessage");
     QTest::newRow("unknown_module")
-            << "Product dependency 'neitherModuleNorProduct' not found";
+            << "Dependency 'neitherModuleNorProduct' not found";
     QTest::newRow("multiple_exports")
             << "Multiple Export items in one product are prohibited.";
     QTest::newRow("multiple_properties_in_subproject")
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp
index 74a2811c6..0291a55c5 100644
--- a/tests/auto/api/tst_api.cpp
+++ b/tests/auto/api/tst_api.cpp
@@ -1205,7 +1205,7 @@ void TestApi::inheritQbsSearchPaths()
     projectFile.close();
     errorInfo = doBuildProject(projectFilePath);
     QVERIFY(errorInfo.hasError());
-    QVERIFY2(errorInfo.toString().contains("Product dependency 'bli' not found"),
+    QVERIFY2(errorInfo.toString().contains("Dependency 'bli' not found"),
              qPrintable(errorInfo.toString()));
 
     QVariantMap overriddenValues;
@@ -1743,7 +1743,7 @@ void TestApi::renameProduct()
     f.close();
     errorInfo = doBuildProject("rename-product/rename.qbs");
     QVERIFY(errorInfo.hasError());
-    QVERIFY2(errorInfo.toString().contains("Product dependency 'thelib' not found"),
+    QVERIFY2(errorInfo.toString().contains("Dependency 'thelib' not found"),
              qPrintable(errorInfo.toString()));
 }
 
@@ -1900,7 +1900,7 @@ void TestApi::subProjects()
     f.close();
     errorInfo = doBuildProject("subprojects/toplevelproject.qbs");
     QVERIFY(errorInfo.hasError());
-    QVERIFY2(errorInfo.toString().contains("Product dependency 'testLib' not found"),
+    QVERIFY2(errorInfo.toString().contains("Dependency 'testLib' not found"),
              qPrintable(errorInfo.toString()));
 }