Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824

2 files changed, 6 insertions, 3 deletions

diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 6159673f21..2d07a23aa5 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -411,7 +411,8 @@ ProjectExplorer::ToolChain *BaseQtVersion::preferredToolChain(const FileName &ms
             continue;
         if (tc->suggestedMkspecList().contains(spec))
             return tc; // perfect match
-        possibleTc = tc; // possible match
+        if (!possibleTc)
+            possibleTc = tc; // first possible match
     }
     return possibleTc;
 }
@@ -1354,7 +1355,9 @@ FileName BaseQtVersion::qtCorePath(const QHash<QString,QString> &versionInfo, co
             }
             if (info.isReadable()) {
                 if (file.startsWith(QLatin1String("libQtCore"))
-                        || file.startsWith(QLatin1String("QtCore"))) {
+                        || file.startsWith(QLatin1String("libQt5Core"))
+                        || file.startsWith(QLatin1String("QtCore"))
+                        || file.startsWith(QLatin1String("Qt5Core"))) {
                     // Only handle static libs if we can not find dynamic ones:
                     if (file.endsWith(QLatin1String(".a")) || file.endsWith(QLatin1String(".lib")))
                         staticLibs.append(info);
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 6bdb044dd6..8cfc89763d 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -702,7 +702,7 @@ void QtOptionsPageWidget::editPath()
     if (current->type() != version->type()) {
         // not the same type, error out
         QMessageBox::critical(this, tr("Incompatible Qt Versions"),
-                              tr("The Qt version selected must be for the same target."),
+                              tr("The Qt version selected must be for the same device type."),
                               QMessageBox::Ok);
         delete version;
         return;