From 5c6aaf182f2fa4860f9bdabcc31970769198a814 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 6 Aug 2019 16:12:28 +0200 Subject: Fix Qt6 build 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 --- src/imports/xmllistmodel/plugin.cpp | 5 +++-- 1 file 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(uri,2,0,"XmlListModel"); qmlRegisterType(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); } }; -- cgit v1.2.1