Merge remote-tracking branch 'origin/1.1'

Conflicts:
	src/lib/language/moduleloader.cpp
	src/lib/language/tst_language.cpp
	src/lib/language/tst_language.h

Change-Id: Iaaf4e015a234cdd9f51630ad218daec1b83b2a84

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index bf02d86a8..cc817242c 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -1456,6 +1456,29 @@ void TestBlackbox::installedApp()
             + HostOsInfo::appendExecutableSuffix(QLatin1String("/usr/bin/installedApp"))));
     QVERIFY(!addedFile.exists());
 
+    // Check whether changing install parameters on the product causes re-installation.
+    QFile projectFile("installed_artifact.qbs");
+    QVERIFY(projectFile.open(QIODevice::ReadWrite));
+    QByteArray content = projectFile.readAll();
+    content.replace("qbs.installPrefix: \"/usr\"", "qbs.installPrefix: '/usr/local'");
+    waitForNewTimestamp();
+    projectFile.resize(0);
+    projectFile.write(content);
+    QVERIFY(projectFile.flush());
+    QCOMPARE(runQbs(QbsRunParameters(QStringList("install"))), 0);
+    QVERIFY(QFile::exists(defaultInstallRoot
+            + HostOsInfo::appendExecutableSuffix(QLatin1String("/usr/local/bin/installedApp"))));
+
+    // Check whether changing install parameters on the artifact causes re-installation.
+    content.replace("qbs.installDir: \"bin\"", "qbs.installDir: 'custom'");
+    waitForNewTimestamp();
+    projectFile.resize(0);
+    projectFile.write(content);
+    projectFile.close();
+    QCOMPARE(runQbs(QbsRunParameters(QStringList("install"))), 0);
+    QVERIFY(QFile::exists(defaultInstallRoot
+            + HostOsInfo::appendExecutableSuffix(QLatin1String("/usr/local/custom/installedApp"))));
+
     rmDirR(buildDir);
     QbsRunParameters params;
     params.arguments << "install" << "--no-build";