diff options
10 files changed, 12 insertions, 5 deletions
diff --git a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro b/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro index efbbea8..fae454d 100644 --- a/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro +++ b/examples/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro @@ -1,6 +1,7 @@ TEMPLATE = app QT += qml scxml +CONFIG += c++11 SOURCES += mediaplayer-qml-cppdatamodel.cpp \ thedatamodel.cpp diff --git a/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro b/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro index 3d8dfa0..1af874f 100644 --- a/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro +++ b/examples/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro @@ -1,6 +1,7 @@ TEMPLATE = app QT += qml scxml +CONFIG += c++11 SOURCES += mediaplayer-qml-dynamic.cpp diff --git a/examples/mediaplayer-qml-static/mediaplayer-qml-static.pro b/examples/mediaplayer-qml-static/mediaplayer-qml-static.pro index 9bf01a9..b6ca140 100644 --- a/examples/mediaplayer-qml-static/mediaplayer-qml-static.pro +++ b/examples/mediaplayer-qml-static/mediaplayer-qml-static.pro @@ -1,6 +1,7 @@ TEMPLATE = app QT += qml scxml +CONFIG += c++11 SOURCES += mediaplayer-qml-static.cpp diff --git a/examples/trafficlight-qml-static/trafficlight-qml-static.pro b/examples/trafficlight-qml-static/trafficlight-qml-static.pro index 7065dc1..4c19594 100644 --- a/examples/trafficlight-qml-static/trafficlight-qml-static.pro +++ b/examples/trafficlight-qml-static/trafficlight-qml-static.pro @@ -1,6 +1,7 @@ TEMPLATE = app QT += qml scxml +CONFIG += c++11 SOURCES += trafficlight-qml-static.cpp diff --git a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp b/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp index 6934fa9..21e7d74 100644 --- a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp +++ b/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp @@ -48,7 +48,7 @@ int main(int argc, char **argv) { QApplication app(argc, argv); - auto machine = QScxmlStateMachine::fromFile(QStringLiteral(":statemachine.scxml")); + QScxmlStateMachine *machine = QScxmlStateMachine::fromFile(QStringLiteral(":statemachine.scxml")); if (!machine->errors().isEmpty()) { QTextStream errs(stderr, QIODevice::WriteOnly); foreach (const QScxmlError &error, machine->errors()) { diff --git a/examples/trafficlight-widgets-static/trafficlight-widgets-static.pro b/examples/trafficlight-widgets-static/trafficlight-widgets-static.pro index 8422637..b40a692 100644 --- a/examples/trafficlight-widgets-static/trafficlight-widgets-static.pro +++ b/examples/trafficlight-widgets-static/trafficlight-widgets-static.pro @@ -1,4 +1,5 @@ QT += widgets scxml +CONFIG += c++11 SOURCES = ../trafficlight-common/trafficlight.cpp HEADERS = ../trafficlight-common/trafficlight.h diff --git a/src/scxml/qscxmlevent.h b/src/scxml/qscxmlevent.h index dc8df01..33bdb70 100644 --- a/src/scxml/qscxmlevent.h +++ b/src/scxml/qscxmlevent.h @@ -77,7 +77,7 @@ public: void setData(const QVariant &data); protected: - friend QScxmlInternal::WrappedQStateMachine; + friend class QScxmlInternal::WrappedQStateMachine; static QEvent::Type scxmlEventType; static QEvent::Type ignoreEventType; void makeIgnorable(); diff --git a/src/scxml/qscxmlparser.h b/src/scxml/qscxmlparser.h index ea13d17..ca512f5 100644 --- a/src/scxml/qscxmlparser.h +++ b/src/scxml/qscxmlparser.h @@ -71,7 +71,7 @@ public: void addError(const QString &msg); private: - friend QScxmlParserPrivate; + friend class QScxmlParserPrivate; QScxmlParserPrivate *p; }; diff --git a/src/scxml/qscxmlqstates.h b/src/scxml/qscxmlqstates.h index 4602789..c558d4c 100644 --- a/src/scxml/qscxmlqstates.h +++ b/src/scxml/qscxmlqstates.h @@ -76,7 +76,7 @@ protected: void onExit(QEvent * event) Q_DECL_OVERRIDE; private: - friend QScxmlStatePrivate; + friend class QScxmlStatePrivate; QScxmlStatePrivate *d; }; diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp index f6cd968..13c6a4d 100644 --- a/tools/qscxmlc/scxmlcppdumper.cpp +++ b/tools/qscxmlc/scxmlcppdumper.cpp @@ -153,6 +153,8 @@ static QString toHex(const QString &str) const char *headerStart = "#include <QScxmlStateMachine>\n" + "#include <QString>\n" + "#include <QByteArray>\n" "\n"; using namespace DocumentModel; @@ -1127,7 +1129,7 @@ void CppDumper::writeClass(const ClassDump &clazz) h << endl << l("private:") << endl << l(" struct Data;") << endl - << l(" friend Data;") << endl + << l(" friend struct Data;") << endl << l(" struct Data *data;") << endl << l("};") << endl << endl; } |