Merge remote-tracking branch 'origin/4.9'

 Conflicts:
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I473084232ab99c18e2316154656de0035af02628

1 files changed, 6 insertions, 2 deletions

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 27412c3d06..17e2d3bf29 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -234,8 +234,12 @@ static inline QStringList getPluginPaths()
                                     Core::Constants::IDE_DISPLAY_NAME :
                                     Core::Constants::IDE_ID);
     pluginPath += QLatin1String("/plugins/");
-    pluginPath += QLatin1String(Core::Constants::IDE_VERSION_LONG);
-    rc.push_back(pluginPath);
+    // Qt Creator X.Y.Z can load plugins from X.Y.(Z-1) etc, so add current and previous
+    // patch versions
+    const QString minorVersion = QString::number(IDE_VERSION_MAJOR) + '.'
+                                 + QString::number(IDE_VERSION_MINOR) + '.';
+    for (int patchVersion = IDE_VERSION_RELEASE; patchVersion >= 0; --patchVersion)
+        rc.push_back(pluginPath + minorVersion + QString::number(patchVersion));
     return rc;
 }