Commit 29fadd61 authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/4.0'

Change-Id: Ieead754209dd535687870469a49c2371ecfa00de
parents c3a1355c 40e7e2cc
...@@ -143,7 +143,7 @@ struct resultTypeHasCallOperator<Function, false> ...@@ -143,7 +143,7 @@ struct resultTypeHasCallOperator<Function, false>
template <typename Callable> template <typename Callable>
struct resultTypeHasCallOperator<Callable, true> 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> ...@@ -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 Callable object that wraps a member function pointer with the object it
will be called on. will be called on.
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
#include <QDialog> #include <QDialog>
#include <QStringList> #include <QStringList>
namespace Ui { QT_BEGIN_NAMESPACE
class AddSignalHandlerDialog; namespace Ui { class AddSignalHandlerDialog; }
} QT_END_NAMESPACE
class AddSignalHandlerDialog : public QDialog class AddSignalHandlerDialog : public QDialog
{ {
......
...@@ -5,6 +5,7 @@ CppApplication { ...@@ -5,6 +5,7 @@ CppApplication {
consoleApplication: true consoleApplication: true
destinationDirectory: project.ide_bin_path destinationDirectory: project.ide_bin_path
Depends { name: "Qt"; submodules: ["network", "xml"]; } Depends { name: "Qt"; submodules: ["network", "xml"]; }
cpp.cxxLanguageVersion: "c++11"
files: [ files: [
"main.cpp", "main.cpp",
"outputgenerator.h", "outputgenerator.cpp" "outputgenerator.h", "outputgenerator.cpp"
......
...@@ -15,5 +15,6 @@ DynamicLibrary { ...@@ -15,5 +15,6 @@ DynamicLibrary {
project.buildDirectory + "/" + project.libDirName + "/qtcreator", project.buildDirectory + "/" + project.libDirName + "/qtcreator",
project.buildDirectory + "/" + project.libDirName + "/qtcreator/plugins" project.buildDirectory + "/" + project.libDirName + "/qtcreator/plugins"
].concat(additionalRPaths) ].concat(additionalRPaths)
cpp.cxxLanguageVersion: "c++11"
property pathList additionalRPaths: [] property pathList additionalRPaths: []
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment