Browse Source
restore binary compability (via testing)
pull/2/head
Skycoder42
7 years ago
No known key found for this signature in database
GPG Key ID: 8E01AD9EF0578D2B
4 changed files with
3 additions and
3 deletions
-
appveyor.yml
-
src/mvvmcore/viewmodel.cpp
-
src/mvvmcore/viewmodel.h
-
BIN
tests/auto/qml/qmlsettingsgenerator/tst_qmlsettingsgenerator.qmlc
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -64,7 +64,7 @@ void ViewModel::showForResult(quint32 requestCode, const QMetaObject *viewMetaOb |
|
|
|
showImp(viewMetaObject, params, const_cast<ViewModel*>(this), requestCode); |
|
|
|
} |
|
|
|
|
|
|
|
void ViewModel::showImp(const QMetaObject *metaObject, QVariantHash params, QPointer<ViewModel> parent, quint32 requestCode) |
|
|
|
void ViewModel::showImp(const QMetaObject *metaObject, const QVariantHash ¶ms, QPointer<ViewModel> parent, quint32 requestCode) |
|
|
|
{ |
|
|
|
QMetaObject::invokeMethod(CoreAppPrivate::dInstance().data(), "showViewModel", Qt::QueuedConnection, |
|
|
|
Q_ARG(const QMetaObject*, metaObject), |
|
|
|
|
|
|
|
@ -61,7 +61,7 @@ private: |
|
|
|
|
|
|
|
QScopedPointer<ViewModelPrivate> d; |
|
|
|
|
|
|
|
static void showImp(const QMetaObject *metaObject, QVariantHash params, QPointer<ViewModel> parent, quint32 requestCode = 0); |
|
|
|
static void showImp(const QMetaObject *metaObject, const QVariantHash ¶ms, QPointer<ViewModel> parent, quint32 requestCode = 0); |
|
|
|
}; |
|
|
|
|
|
|
|
//TODO doc
|
|
|
|
|
