diff options
author | Michal Policht <michpolicht@gmail.com> | 2018-11-09 16:53:19 +0100 |
---|---|---|
committer | Michal Policht <michpolicht@gmail.com> | 2018-11-23 19:53:41 +0000 |
commit | 5246b910771e0dd824b4eea7c5245e5f9f3a63f0 (patch) | |
tree | 5d748705275269761603fe2fb81f375f33742074 /tests/auto/qml/qmlplugindump | |
parent | 900d2f611475df6e43972eac5fc3c9b4b06b1c0e (diff) |
Fix qmlplugindump version dump issue
Changed major and minor version of created QQmlType. Using major and
minor version of a candidate instead of major and minor versions passed
to a function.
Task-number: QTBUG-67292
Change-Id: I2c30f5e8f49aa0be3a1d5b404ab16eb376ad8092
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/qml/qmlplugindump')
4 files changed, 32 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/CompositeWithinSingleton/Composite.qml b/tests/auto/qml/qmlplugindump/data/dumper/CompositeWithinSingleton/Composite.qml new file mode 100644 index 0000000000..b1055b6992 --- /dev/null +++ b/tests/auto/qml/qmlplugindump/data/dumper/CompositeWithinSingleton/Composite.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +QtObject { + property int test: 0 +} diff --git a/tests/auto/qml/qmlplugindump/data/dumper/CompositeWithinSingleton/Singleton.qml b/tests/auto/qml/qmlplugindump/data/dumper/CompositeWithinSingleton/Singleton.qml new file mode 100644 index 0000000000..e81b2b6cb5 --- /dev/null +++ b/tests/auto/qml/qmlplugindump/data/dumper/CompositeWithinSingleton/Singleton.qml @@ -0,0 +1,6 @@ +pragma Singleton +import QtQuick 2.0 + +QtObject { + property Composite test: Composite {} +} diff --git a/tests/auto/qml/qmlplugindump/data/dumper/CompositeWithinSingleton/qmldir b/tests/auto/qml/qmlplugindump/data/dumper/CompositeWithinSingleton/qmldir new file mode 100644 index 0000000000..5a9cb1bd96 --- /dev/null +++ b/tests/auto/qml/qmlplugindump/data/dumper/CompositeWithinSingleton/qmldir @@ -0,0 +1,4 @@ +module dumper.CompositeWithinSingleton +singleton Singleton 1.0 Singleton.qml +Composite 1.0 Composite.qml +depends QtQuick 2.0 diff --git a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp index f673fca1d7..17766a89b5 100644 --- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp +++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp @@ -45,6 +45,8 @@ private slots: void initTestCase(); void builtins(); void singleton(); + void compositeWithinSingleton(); + void plugin_data(); void plugin(); @@ -118,6 +120,21 @@ void tst_qmlplugindump::singleton() QVERIFY2(result.contains(QLatin1String("exportMetaObjectRevisions: [0]")), qPrintable(result)); } +void tst_qmlplugindump::compositeWithinSingleton() +{ + QProcess dumper; + QStringList args; + args << QLatin1String("dumper.CompositeWithinSingleton") << QLatin1String("1.0") + << QLatin1String(QT_QMLTEST_DIR "/data"); + dumper.start(qmlplugindumpPath, args); + QVERIFY2(dumper.waitForStarted(), qPrintable(dumper.errorString())); + QVERIFY2(dumper.waitForFinished(), qPrintable(dumper.errorString())); + + const QString &result = dumper.readAllStandardOutput(); + QVERIFY2(result.contains(QLatin1String("exports: [\"Composite 1.0\"]")), qPrintable(result)); + QVERIFY2(result.contains(QLatin1String("exportMetaObjectRevisions: [0]")), qPrintable(result)); +} + void tst_qmlplugindump::plugin_data() { QTest::addColumn<QString>("import"); |