diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-10-14 10:50:45 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-10-14 10:41:19 +0000 |
| commit | d21bf21aed0c346b5666725ba52c4424c360c028 (patch) | |
| tree | eac8037b70a2edd9f7c98fb54d4f8fad951f7ff1 /examples/scxml | |
| parent | 46befdc26215c232047673e895245054f6a3079e (diff) | |
Use std::function for onEntry and onExit return types
This allows us to drop the C++14 requirement. As onEntry and onExit are
template functions we don't need to care about (not) using the standard
library for them.
Change-Id: Ie776e04f7e1771914c9f48d2440ef445d87d64c0
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'examples/scxml')
| -rw-r--r-- | examples/scxml/ftpclient/ftpclient.pro | 1 | ||||
| -rw-r--r-- | examples/scxml/ftpclient/main.cpp | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/examples/scxml/ftpclient/ftpclient.pro b/examples/scxml/ftpclient/ftpclient.pro index 7aa266e..3ba8adf 100644 --- a/examples/scxml/ftpclient/ftpclient.pro +++ b/examples/scxml/ftpclient/ftpclient.pro @@ -1,6 +1,5 @@ QT = core scxml -CONFIG += c++14 TARGET = ftpclient TEMPLATE = app diff --git a/examples/scxml/ftpclient/main.cpp b/examples/scxml/ftpclient/main.cpp index 3a99bd4..25102d2 100644 --- a/examples/scxml/ftpclient/main.cpp +++ b/examples/scxml/ftpclient/main.cpp @@ -62,7 +62,6 @@ struct Command { int main(int argc, char *argv[]) { -#if defined(__cpp_return_type_deduction) && __cpp_return_type_deduction == 201304 if (argc != 3) { qDebug() << "Usage: ftpclient <server> <file>"; return 1; @@ -127,9 +126,4 @@ int main(int argc, char *argv[]) }); return app.exec(); -#else - qDebug() << "The ftpclient example uses the C++14 return type deduction feature and will only " - "work with compilers that support it."; - return 2; -#endif } |