diff --git a/appveyor.yml b/appveyor.yml index 992201a..8bbcd8b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,8 +10,8 @@ environment: MAKE_RUN_TESTS: true #experimental matrix: - - PLATFORM: mingw53_32 - PLATFORM: msvc2017_64 + - PLATFORM: mingw53_32 - PLATFORM: winrt_x64_msvc2017 - PLATFORM: winrt_x86_msvc2017 - PLATFORM: winrt_armv7_msvc2017 diff --git a/src/mvvmcore/viewmodel.cpp b/src/mvvmcore/viewmodel.cpp index 99a3fdf..c5a3af4 100644 --- a/src/mvvmcore/viewmodel.cpp +++ b/src/mvvmcore/viewmodel.cpp @@ -64,7 +64,7 @@ void ViewModel::showForResult(quint32 requestCode, const QMetaObject *viewMetaOb showImp(viewMetaObject, params, const_cast(this), requestCode); } -void ViewModel::showImp(const QMetaObject *metaObject, QVariantHash params, QPointer parent, quint32 requestCode) +void ViewModel::showImp(const QMetaObject *metaObject, const QVariantHash ¶ms, QPointer parent, quint32 requestCode) { QMetaObject::invokeMethod(CoreAppPrivate::dInstance().data(), "showViewModel", Qt::QueuedConnection, Q_ARG(const QMetaObject*, metaObject), diff --git a/src/mvvmcore/viewmodel.h b/src/mvvmcore/viewmodel.h index 1e844a6..7125477 100644 --- a/src/mvvmcore/viewmodel.h +++ b/src/mvvmcore/viewmodel.h @@ -61,7 +61,7 @@ private: QScopedPointer d; - static void showImp(const QMetaObject *metaObject, QVariantHash params, QPointer parent, quint32 requestCode = 0); + static void showImp(const QMetaObject *metaObject, const QVariantHash ¶ms, QPointer parent, quint32 requestCode = 0); }; //TODO doc diff --git a/tests/auto/qml/qmlsettingsgenerator/tst_qmlsettingsgenerator.qmlc b/tests/auto/qml/qmlsettingsgenerator/tst_qmlsettingsgenerator.qmlc index 795e1c4..6d26ab3 100644 Binary files a/tests/auto/qml/qmlsettingsgenerator/tst_qmlsettingsgenerator.qmlc and b/tests/auto/qml/qmlsettingsgenerator/tst_qmlsettingsgenerator.qmlc differ