diff options
18 files changed, 1 insertions, 34 deletions
diff --git a/examples/scxml/calculator-qml/calculator-qml.pro b/examples/scxml/calculator-qml/calculator-qml.pro index 6221576..c40242f 100644 --- a/examples/scxml/calculator-qml/calculator-qml.pro +++ b/examples/scxml/calculator-qml/calculator-qml.pro @@ -11,5 +11,3 @@ STATECHARTS = ../calculator-common/statemachine.scxml # install target.path = $$[QT_INSTALL_EXAMPLES]/scxml/calculator-qml INSTALLS += target - -load(qscxmlc) diff --git a/examples/scxml/calculator-widgets/calculator-widgets.pro b/examples/scxml/calculator-widgets/calculator-widgets.pro index 55880f1..238980b 100644 --- a/examples/scxml/calculator-widgets/calculator-widgets.pro +++ b/examples/scxml/calculator-widgets/calculator-widgets.pro @@ -17,5 +17,3 @@ FORMS += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/scxml/calculator-widgets INSTALLS += target - -load(qscxmlc) diff --git a/examples/scxml/invoke-static/invoke-static.pro b/examples/scxml/invoke-static/invoke-static.pro index 86e0845..e2e206c 100644 --- a/examples/scxml/invoke-static/invoke-static.pro +++ b/examples/scxml/invoke-static/invoke-static.pro @@ -9,8 +9,6 @@ RESOURCES += invoke-static.qrc STATECHARTS = ../invoke-common/statemachine.scxml -load(qscxmlc) - target.path = $$[QT_INSTALL_EXAMPLES]/scxml/invoke-static INSTALLS += target diff --git a/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro index fae454d..2d21a37 100644 --- a/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.pro @@ -12,8 +12,6 @@ RESOURCES += mediaplayer-qml-cppdatamodel.qrc STATECHARTS = mediaplayer-cppdatamodel.scxml -load(qscxmlc) - target.path = $$[QT_INSTALL_EXAMPLES]/scxml/mediaplayer-qml-cppdatamodel INSTALLS += target diff --git a/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro index 1af874f..f032bba 100644 --- a/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro +++ b/examples/scxml/mediaplayer-qml-dynamic/mediaplayer-qml-dynamic.pro @@ -7,8 +7,6 @@ SOURCES += mediaplayer-qml-dynamic.cpp RESOURCES += mediaplayer-qml-dynamic.qrc -load(qscxmlc) - target.path = $$[QT_INSTALL_EXAMPLES]/scxml/mediaplayer-qml-dynamic INSTALLS += target diff --git a/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.pro b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.pro index b6ca140..d8af563 100644 --- a/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.pro +++ b/examples/scxml/mediaplayer-qml-static/mediaplayer-qml-static.pro @@ -9,8 +9,6 @@ RESOURCES += mediaplayer-qml-static.qrc STATECHARTS = ../mediaplayer-common/mediaplayer.scxml -load(qscxmlc) - target.path = $$[QT_INSTALL_EXAMPLES]/scxml/mediaplayer-qml-static INSTALLS += target diff --git a/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro b/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro index af87491..89a7e4a 100644 --- a/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro +++ b/examples/scxml/mediaplayer-widgets-static/mediaplayer-widgets-static.pro @@ -17,5 +17,3 @@ HEADERS += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/scxml/mediaplayer-widgets-static INSTALLS += target - -load(qscxmlc) diff --git a/examples/scxml/pinball/pinball.pro b/examples/scxml/pinball/pinball.pro index 2cb002d..549010d 100644 --- a/examples/scxml/pinball/pinball.pro +++ b/examples/scxml/pinball/pinball.pro @@ -17,5 +17,3 @@ HEADERS += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/scxml/pinball INSTALLS += target - -load(qscxmlc) diff --git a/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro index 886424e..c03a7ef 100644 --- a/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro +++ b/examples/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro @@ -6,7 +6,5 @@ SOURCES += trafficlight-qml-dynamic.cpp RESOURCES += trafficlight-qml-dynamic.qrc -load(qscxmlc) - target.path = $$[QT_INSTALL_EXAMPLES]/scxml/trafficlight-qml-dynamic INSTALLS += target diff --git a/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.pro b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.pro index 4c19594..e5dd64c 100644 --- a/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.pro +++ b/examples/scxml/trafficlight-qml-static/trafficlight-qml-static.pro @@ -9,8 +9,6 @@ RESOURCES += trafficlight-qml-static.qrc STATECHARTS = ../trafficlight-common/statemachine.scxml -load(qscxmlc) - target.path = $$[QT_INSTALL_EXAMPLES]/scxml/trafficlight-qml-static INSTALLS += target diff --git a/examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro b/examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro index 21da884..5613249 100644 --- a/examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro +++ b/examples/scxml/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro @@ -9,7 +9,5 @@ SOURCES += trafficlight-widgets-dynamic.cpp target.path = $$[QT_INSTALL_EXAMPLES]/scxml/trafficlight-widgets-dynamic INSTALLS += target -load(qscxmlc) - RESOURCES += \ trafficlight-widgets-dynamic.qrc diff --git a/examples/scxml/trafficlight-widgets-static/trafficlight-widgets-static.pro b/examples/scxml/trafficlight-widgets-static/trafficlight-widgets-static.pro index c98fa98..8a32984 100644 --- a/examples/scxml/trafficlight-widgets-static/trafficlight-widgets-static.pro +++ b/examples/scxml/trafficlight-widgets-static/trafficlight-widgets-static.pro @@ -5,8 +5,6 @@ SOURCES = ../trafficlight-common/trafficlight.cpp HEADERS = ../trafficlight-common/trafficlight.h STATECHARTS = ../trafficlight-common/statemachine.scxml -load(qscxmlc) - SOURCES += trafficlight-widgets-static.cpp # install diff --git a/src/scxml/scxml.pro b/src/scxml/scxml.pro index 4453a83..8722ea3 100644 --- a/src/scxml/scxml.pro +++ b/src/scxml/scxml.pro @@ -1,6 +1,6 @@ TARGET = QtScxml QT = core-private qml-private -MODULE_CONFIG += c++11 +MODULE_CONFIG += c++11 qscxmlc load(qt_module) diff --git a/tests/auto/compiled/compiled.pro b/tests/auto/compiled/compiled.pro index 4e8dfa9..fdf1364 100644 --- a/tests/auto/compiled/compiled.pro +++ b/tests/auto/compiled/compiled.pro @@ -21,4 +21,3 @@ STATECHARTS = \ initialhistory.scxml \ connection.scxml -load(qscxmlc) diff --git a/tests/auto/dynamicmetaobject/dynamicmetaobject.pro b/tests/auto/dynamicmetaobject/dynamicmetaobject.pro index f78e5ac..5ec4e5f 100644 --- a/tests/auto/dynamicmetaobject/dynamicmetaobject.pro +++ b/tests/auto/dynamicmetaobject/dynamicmetaobject.pro @@ -11,5 +11,3 @@ RESOURCES += tst_dynamicmetaobject.qrc SOURCES += \ tst_dynamicmetaobject.cpp - -load(qscxmlc) diff --git a/tests/auto/parser/parser.pro b/tests/auto/parser/parser.pro index 10deb2d..3a21a71 100644 --- a/tests/auto/parser/parser.pro +++ b/tests/auto/parser/parser.pro @@ -11,5 +11,3 @@ RESOURCES += tst_parser.qrc SOURCES += \ tst_parser.cpp - -load(qscxmlc) diff --git a/tests/auto/scion/scion.pro b/tests/auto/scion/scion.pro index 1b58a21..84d7b28 100644 --- a/tests/auto/scion/scion.pro +++ b/tests/auto/scion/scion.pro @@ -102,5 +102,3 @@ write_file("scxml/scion.h", contents)|error("Aborting.") contents = '<!DOCTYPE RCC><RCC version=\"1.0\">' '<qresource>' $$qrc '</qresource></RCC>' write_file("scion.qrc", contents)|error("Aborting.") - -load(qscxmlc) diff --git a/tests/auto/statemachine/statemachine.pro b/tests/auto/statemachine/statemachine.pro index eefbd7f..0e4de1a 100644 --- a/tests/auto/statemachine/statemachine.pro +++ b/tests/auto/statemachine/statemachine.pro @@ -11,5 +11,3 @@ RESOURCES += tst_statemachine.qrc SOURCES += \ tst_statemachine.cpp - -load(qscxmlc) |