Merge remote-tracking branch 'origin/4.0'

Change-Id: Ieead754209dd535687870469a49c2371ecfa00de

src/libs/utils/runextensions.h

@@ -143,7 +143,7 @@ struct resultTypeHasCallOperator<Function, false>
 
 template <typename Callable>
 struct resultTypeHasCallOperator<Callable, true>
-        : public resultTypeTakesArguments<decltype(&Callable::operator()), 1, (functionTraits<decltype(&Callable::operator())>::arity > 1)>
+        : public resultTypeTakesArguments<Callable, 0, (functionTraits<Callable>::arity > 0)>
 {
 };
 
@@ -168,6 +168,17 @@ struct resultType<Function &&> : public resultType<Function>
 {
 };
 
+// work around bug in MSVC 2015 where a reference_wrapper has a call operator even if the wrapped
+// object doesn't
+template <typename Function>
+struct resultType<std::reference_wrapper<Function>> : public resultType<Function>
+{
+};
+template <typename Function>
+struct resultType<std::reference_wrapper<const Function>> : public resultType<Function>
+{
+};
+
 /*
    Callable object that wraps a member function pointer with the object it
    will be called on.

src/plugins/qmldesigner/components/componentcore/addsignalhandlerdialog.h

@@ -28,9 +28,9 @@
 #include <QDialog>
 #include <QStringList>
 
-namespace Ui {
-class AddSignalHandlerDialog;
-}
+QT_BEGIN_NAMESPACE
+namespace Ui { class AddSignalHandlerDialog; }
+QT_END_NAMESPACE
 
 class AddSignalHandlerDialog : public QDialog
 {

src/tools/valgrindfake/valgrindfake.qbs

@@ -5,6 +5,7 @@ CppApplication {
     consoleApplication: true
     destinationDirectory: project.ide_bin_path
     Depends { name: "Qt"; submodules: ["network", "xml"]; }
+    cpp.cxxLanguageVersion: "c++11"
     files: [
         "main.cpp",
         "outputgenerator.h", "outputgenerator.cpp"

tests/auto/extensionsystem/plugin.qbs

@@ -15,5 +15,6 @@ DynamicLibrary {
         project.buildDirectory + "/" + project.libDirName + "/qtcreator",
         project.buildDirectory + "/" + project.libDirName + "/qtcreator/plugins"
     ].concat(additionalRPaths)
+    cpp.cxxLanguageVersion: "c++11"
     property pathList additionalRPaths: []
 }