From 958d4d8ecfc7afcbc9b7c0855857d2a2e1cbfa9f Mon Sep 17 00:00:00 2001 From: Julian Strobl Date: Wed, 3 May 2017 18:38:07 +0200 Subject: Fix bundling of module for static builds Without this patch the module is not bundled in static builds correctly causing 'module "" is not installed' errors in during runtime. As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)' at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false', which indicates that the module was not registered. Task-number: QTBUG-59559 Change-Id: If57fca92a0e04b9e04f1adb59dae0e4e9a3dcccb Reviewed-by: J-P Nurmi Reviewed-by: Oswald Buddenhagen --- src/imports/scxmlstatemachine/plugin.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/imports/scxmlstatemachine/plugin.cpp b/src/imports/scxmlstatemachine/plugin.cpp index b662491..f1cb413 100644 --- a/src/imports/scxmlstatemachine/plugin.cpp +++ b/src/imports/scxmlstatemachine/plugin.cpp @@ -46,6 +46,13 @@ #include #include +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtScxml); +#endif +} + QT_BEGIN_NAMESPACE class QScxmlStateMachinePlugin : public QQmlExtensionPlugin @@ -54,6 +61,7 @@ class QScxmlStateMachinePlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: + QScxmlStateMachinePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) { // @uri QtScxml -- cgit v1.2.3 From c2d154b99a1b7785d6c9e9f80cae8f179ca95d01 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 10 May 2017 19:07:28 +0200 Subject: Bump version Change-Id: I29454ed69949d5bf092b989f6ab6e5dd39f7d191 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index ab3b383..5339d5a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.9.0 +MODULE_VERSION = 5.9.1 -- cgit v1.2.3 From eff82ac957e051f16f64c287f2dfaec9049bdfc1 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Fri, 5 May 2017 10:39:49 +0300 Subject: Add changes file for 5.9.0 Listing important changes and bug-fixes. Change-Id: Ic1f2594bf15932dc8b687f1071cbded32c4c2e45 Reviewed-by: Leena Miettinen Reviewed-by: Alex Blasche --- dist/changes-5.9.0 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 dist/changes-5.9.0 diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0 new file mode 100644 index 0000000..c314b00 --- /dev/null +++ b/dist/changes-5.9.0 @@ -0,0 +1,25 @@ +Qt 5.9 introduces many new features and improvements as well as bugfixes +over the 5.8.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +Important Changes +----------------- + +- Accessor and signal methods for states can now be generated by qscmxlc. + Passing the argument "--statemethods" to qscxmlc will trigger this. + +- The qmake/qscxmlc integration will now pass any arguments given in the qmake + variable "QSCXMLC_ARGUMENTS" to qscxmlc. -- cgit v1.2.3 From 73c59c637fec1ef8de56311b420d1ff7f87da3c3 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Mon, 22 May 2017 10:17:45 +0200 Subject: Fix usage of old (internal) API Task-number: QTBUG-60938 Change-Id: I1bb77280bd4890cd5d7c5a96115d4b83973f5445 Reviewed-by: Simon Hausmann --- src/scxml/qscxmlecmascriptdatamodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scxml/qscxmlecmascriptdatamodel.cpp b/src/scxml/qscxmlecmascriptdatamodel.cpp index a12bb30..2bbf134 100644 --- a/src/scxml/qscxmlecmascriptdatamodel.cpp +++ b/src/scxml/qscxmlecmascriptdatamodel.cpp @@ -289,7 +289,7 @@ private: // Uses private API return; } - s->makeIdentifier(scope.engine); + s->makeIdentifier(); QV4::ScopedValue v(scope, QJSValuePrivate::convertedToValue(engine, value)); o->defineReadonlyProperty(s, v); if (engine->hasException) -- cgit v1.2.3 From 013c2991869989a0957441d4a259462bd07427e4 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 22 May 2017 11:38:24 +0200 Subject: Doc: Update screenshots of examples to show Windows 10 style - Calculator - Mediaplayer - Sudoku Change-Id: I4eaa71d178f81f9d317de2f3626b7fb08e5776e1 Reviewed-by: Jarek Kobus --- .../calculator-widgets/doc/images/calculator.png | Bin 6054 -> 6272 bytes .../mediaplayer-common/doc/images/mediaplayer.png | Bin 7706 -> 5951 bytes examples/scxml/sudoku/doc/images/sudoku.png | Bin 18609 -> 23599 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/examples/scxml/calculator-widgets/doc/images/calculator.png b/examples/scxml/calculator-widgets/doc/images/calculator.png index 443242a..0834d0a 100644 Binary files a/examples/scxml/calculator-widgets/doc/images/calculator.png and b/examples/scxml/calculator-widgets/doc/images/calculator.png differ diff --git a/examples/scxml/mediaplayer-common/doc/images/mediaplayer.png b/examples/scxml/mediaplayer-common/doc/images/mediaplayer.png index 9c32b78..b4c051e 100644 Binary files a/examples/scxml/mediaplayer-common/doc/images/mediaplayer.png and b/examples/scxml/mediaplayer-common/doc/images/mediaplayer.png differ diff --git a/examples/scxml/sudoku/doc/images/sudoku.png b/examples/scxml/sudoku/doc/images/sudoku.png index ef6d113..5a4a94f 100644 Binary files a/examples/scxml/sudoku/doc/images/sudoku.png and b/examples/scxml/sudoku/doc/images/sudoku.png differ -- cgit v1.2.3 From 27c4c643bae356d5bbdb58e44ec4b7932f277886 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 19 May 2017 15:50:11 +0200 Subject: Fix a crash when log tag doesn't contain the expr attribute Don't try to evaluate to string NoEvaluator is for log. Task-number: QTBUG-59568 Change-Id: Id2faa7f8b94aa18e8611aafcaa9f27217f5a4a9c Reviewed-by: Erik Verbruggen --- src/scxml/qscxmlexecutablecontent.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/scxml/qscxmlexecutablecontent.cpp b/src/scxml/qscxmlexecutablecontent.cpp index 682ea47..2401aa6 100644 --- a/src/scxml/qscxmlexecutablecontent.cpp +++ b/src/scxml/qscxmlexecutablecontent.cpp @@ -418,15 +418,17 @@ const InstructionId *QScxmlExecutionEngine::step(const InstructionId *ip, bool * qCDebug(qscxmlLog) << stateMachine << "Executing log step"; const Log *log = reinterpret_cast(instr); ip += log->size(); - QString str = dataModel->evaluateToString(log->expr, ok); - if (*ok) { - const QString label = tableData->string(log->label); - qCDebug(scxmlLog) << label << ":" << str; - QMetaObject::invokeMethod(stateMachine, - "log", - Qt::QueuedConnection, - Q_ARG(QString, label), - Q_ARG(QString, str)); + if (log->expr != NoEvaluator) { + const QString str = dataModel->evaluateToString(log->expr, ok); + if (*ok) { + const QString label = tableData->string(log->label); + qCDebug(scxmlLog) << label << ":" << str; + QMetaObject::invokeMethod(stateMachine, + "log", + Qt::QueuedConnection, + Q_ARG(QString, label), + Q_ARG(QString, str)); + } } return ip; } -- cgit v1.2.3