Merge remote-tracking branch 'origin/4.5'

Change-Id: Ie83666bd18e899dabf5190c360027bf02abecdaf
2017-10-19 13:01:12 +02:00
parent 7208ef1ff5 38d307ffb8
commit bb9663529b
64 changed files with 632 additions and 740 deletions
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -106,7 +106,7 @@ QString QmlProjectRunConfiguration::disabledReason() const
 {
    if (mainScript().isEmpty())
        return tr("No script file to execute.");
-    if (!QFileInfo(executable()).exists())
+    if (!QFileInfo::exists(executable()))
        return tr("No qmlviewer or qmlscene found.");
    return RunConfiguration::disabledReason();
 }