diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-06 16:12:28 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-06 16:20:51 +0200 |
| commit | 5c6aaf182f2fa4860f9bdabcc31970769198a814 (patch) | |
| tree | c36295cab01349840e38337b730e18ac92cfa36a /src/imports/xmllistmodel/plugin.cpp | |
| parent | c6c446cc3d550770dae2e11fdd03cbfe6ca36c03 (diff) | |
| download | qtxmlpatterns-5c6aaf182f2fa4860f9bdabcc31970769198a814.tar.gz | |
Fix Qt6 buildwip/qt6
Modify all the qmlRegisterModule calls to use minor version 15
because minor version zero from 6.0.0 would make tests fail.
This is similar to what was done in qtdeclarative in
c147b20a2c1299b2d659fe7c9472ae3866b6a425.
Change-Id: I983fcc06cfffc27ed4864a81b75e90c53b079add
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports/xmllistmodel/plugin.cpp')
| -rw-r--r-- | src/imports/xmllistmodel/plugin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/xmllistmodel/plugin.cpp b/src/imports/xmllistmodel/plugin.cpp index c5356b8..7cf9759 100644 --- a/src/imports/xmllistmodel/plugin.cpp +++ b/src/imports/xmllistmodel/plugin.cpp @@ -57,8 +57,9 @@ public: qmlRegisterType<QQuickXmlListModel>(uri,2,0,"XmlListModel"); qmlRegisterType<QQuickXmlListModelRole>(uri,2,0,"XmlRole"); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(uri, 2, 15); } }; |