Merge remote-tracking branch 'origin/2.5'

Conflicts:
	qtcreator.pri
	src/libs/utils/utils.qbs
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qmljsinspector/qmljsinspector.qbs

Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab

23 files changed, 32 insertions, 10 deletions

diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs
index a41a3fee68..1cb68930dc 100644
--- a/src/libs/3rdparty/botan/botan.qbs
+++ b/src/libs/3rdparty/botan/botan.qbs
@@ -543,6 +543,7 @@ QtcLibrary {
     }
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.linkerFlags: {
             if (qbs.toolchain === 'mingw') {
                 return ['--enable-auto-import']
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 828c41f52f..31b17d3d64 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -173,6 +173,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: [
             ".",
             "../3rdparty",
diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs
index 75e3926709..e0a57520d5 100644
--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -28,6 +28,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: ["."]
     }
 }
diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs
index 9a3d373aa3..52bfc354e5 100644
--- a/src/libs/qmldebug/qmldebug.qbs
+++ b/src/libs/qmldebug/qmldebug.qbs
@@ -42,6 +42,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         Depends { name: "symbianutils" }
         cpp.includePaths: [
             "."
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
index 935f58a341..e0b057e759 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -60,6 +60,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: ["."]
     }
 }
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index ffd63925ad..8aca221c48 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -103,6 +103,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: [
             ".",
             "parser"
diff --git a/src/libs/symbianutils/symbianutils.qbs b/src/libs/symbianutils/symbianutils.qbs
index a586dc8a28..9138a66b42 100644
--- a/src/libs/symbianutils/symbianutils.qbs
+++ b/src/libs/symbianutils/symbianutils.qbs
@@ -57,6 +57,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: [
             "../../shared/symbianutils",
             "../../shared/json",
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index c8d70380b9..d2ef7f4af8 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -684,7 +684,7 @@ void QtcProcess::start()
     prepareCommand(m_command, m_arguments, &command, &arguments, &env, &workDir);
     setNativeArguments(arguments);
     if (m_useCtrlCStub) {
-        argList << command;
+        argList << QDir::toNativeSeparators(command);
         command = QCoreApplication::applicationDirPath() + QLatin1String("/qtcreator_ctrlc_stub.exe");
     }
     QProcess::start(command, argList);
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 064cd44426..9953b2b800 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -256,7 +256,7 @@ QtcLibrary {
     }
 
     ProductModule {
-        Depends { name: "Qt"; submodules: ["concurrent"] }
+        Depends { name: "Qt"; submodules: ["concurrent", "widgets", "network"] }
     }
 }
 
diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs
index 279ce89510..08b72b0cb4 100644
--- a/src/libs/zeroconf/zeroconf.qbs
+++ b/src/libs/zeroconf/zeroconf.qbs
@@ -35,5 +35,8 @@ QtcLibrary {
         "syssocket.h"
     ]
 
-    ProductModule { cpp.includePaths: "." }
+    ProductModule {
+        Depends { name: "cpp" }
+        cpp.includePaths: "."
+    }
 }
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index ce2a5bc0aa..aa67cdcba5 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -54,6 +54,7 @@ QtcPlugin {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: [
             "."
         ]
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 2a1c123976..8c73379ea2 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -245,13 +245,14 @@ QtcPlugin {
     }
 
     ProductModule {
+        Depends { name: "cpp" }
         Depends { name: "Aggregation" }
         Depends { name: "ExtensionSystem" }
         Depends { name: "Utils" }
         cpp.includePaths: [
             "../..",
             "../../libs",
-            buildDirectory + "/.obj/Core/actionmanager"
+            product.buildDirectory + "/.obj/Core/actionmanager"
         ]
     }
 }
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 9b54e1d300..2da0988c08 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -305,6 +305,7 @@ QtcPlugin {
     }
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: ["."]
     }
 }
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index e19dad83c6..e193f9613a 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -521,7 +521,7 @@ static QList<DebuggerEngineType> enginesForToolChain(const Abi &toolChain,
             result.push_back(CdbEngineType);
         } else {
             result.push_back(CdbEngineType);
-            result.push_back(GdbEngineType);
+            //result.push_back(GdbEngineType);
         }
         if (languages & QmlLanguage)
             result.push_back(QmlEngineType);
diff --git a/src/plugins/projectexplorer/images/disabledbuildstep.png b/src/plugins/projectexplorer/images/disabledbuildstep.png
index db11dd6216..a0e784cecb 100644
--- a/src/plugins/projectexplorer/images/disabledbuildstep.png
+++ b/src/plugins/projectexplorer/images/disabledbuildstep.png
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index ae47eba002..954578b919 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -249,7 +249,7 @@ void ProjectListWidget::addProject(Project *project)
     m_ignoreIndexChange = true;
 
     QString sortName = fullName(project);
-    int pos = 0;
+    int pos = count();
     for (int i=0; i < count(); ++i) {
         Project *p = item(i)->data(Qt::UserRole).value<Project*>();
         if (projectLesserThan(project, p)) {
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index bd7cb46ad3..2a15d787c8 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -269,6 +269,9 @@ QList<PropertyInfo> getObjectTypes(const ObjectValue *ov, const ContextPtr &cont
     if (!local) {
         const ObjectValue* prototype = ov->prototype(context);
 
+        if (prototype == ov)
+            return list;
+
         const CppComponentValue * qmlObjectValue = value_cast<CppComponentValue>(prototype);
 
         if (qmlObjectValue) {
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 0000d918ec..da5e7bbeb6 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "QmlJSEditor"
 
-    Depends { name: "qt"; submodules: ['widgets'] }
+    Depends { name: "qt"; submodules: ['widgets', 'script'] }
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
diff --git a/src/plugins/qmljsinspector/qmljsinspector.qbs b/src/plugins/qmljsinspector/qmljsinspector.qbs
index 96e47a62a3..68bdbe88cd 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.qbs
+++ b/src/plugins/qmljsinspector/qmljsinspector.qbs
@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "QmlJSInspector"
 
-    Depends { name: "qt"; submodules: ['widgets'] }
+    Depends { name: "qt"; submodules: ['widgets', 'quick1'] }
     Depends { name: "Core" }
     Depends { name: "Debugger" }
     Depends { name: "LanguageUtils" }
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 54c4a91e7a..d5b595e3de 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -1863,6 +1863,10 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
         newVarValues[DefinesVar] = m_readerExact->values(QLatin1String("DEFINES"));
         newVarValues[IncludePathVar] = includePaths(m_readerExact);
         newVarValues[CppFlagsVar] = m_readerExact->values("QMAKE_CXXFLAGS");
+        newVarValues[CppHeaderVar] = m_readerExact->absoluteFileValues(QLatin1String("HEADERS"),
+                                                                       m_projectDir,
+                                                                       QStringList() << m_projectDir,
+                                                                       0);
         newVarValues[CppSourceVar] = m_readerExact->absoluteFileValues(QLatin1String("SOURCES"),
                                                                        m_projectDir,
                                                                        QStringList() << m_projectDir,
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index 8df585e1ac..8735448959 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -83,6 +83,7 @@ enum Qt4Variable {
     DefinesVar = 1,
     IncludePathVar,
     CppFlagsVar,
+    CppHeaderVar,
     CppSourceVar,
     ObjCSourceVar,
     UiDirVar,
@@ -117,7 +118,6 @@ using ProjectExplorer::FileType;
 
 namespace Internal {
 class Qt4UiCodeModelSupport;
-class ProFileReader;
 class Qt4PriFile;
 struct InternalNode;
 }
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 59f45cda4e..21503c5dd4 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -545,6 +545,8 @@ void Qt4Project::updateCppCodeModel()
             part->cxx11Enabled = tc->compilerFlags(pro->variableValue(CppFlagsVar)) == ToolChain::STD_CXX11;
 
         part->sourceFiles = pro->variableValue(CppSourceVar);
+        part->sourceFiles += pro->variableValue(CppHeaderVar);
+        part->sourceFiles.prepend(QLatin1String("<configuration>"));
         pinfo.appendProjectPart(part);
 
         allFiles += part->sourceFiles;
diff --git a/src/plugins/valgrind/suppressiondialog.cpp b/src/plugins/valgrind/suppressiondialog.cpp
index d52dd5001a..61ad2f9006 100644
--- a/src/plugins/valgrind/suppressiondialog.cpp
+++ b/src/plugins/valgrind/suppressiondialog.cpp
@@ -78,7 +78,7 @@ static QString suppressionText(const Error &error)
     // we take the last stack frame and append the suppression kind, e.g.:
     // QDebug::operator<<(bool) [Memcheck:Cond]
     if (!error.stacks().isEmpty() && !error.stacks().first().frames().isEmpty()) {
-        const Frame &frame = error.stacks().first().frames().first();
+        const Frame frame = error.stacks().first().frames().first();
 
         QString newName;
         if (!frame.functionName().isEmpty())