diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-20 15:11:22 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-21 19:42:51 +0100 |
| commit | c3a9b379bbeb1dfd406470712aad7157cf264059 (patch) | |
| tree | 219b892b65f21767e6a95d0f85b2139216c19ff3 /src/imports/labsmodels | |
| parent | f6808f89a8c17e046f53b0bb5ff36cd9e24e9772 (diff) | |
Provide the labs imports also under QT_VERSION
Now that they all have QML_ADDED_IN_VERSION we can allow the user to
import them also under a later version without losing compatibility.
Task-number: QTBUG-71278
Change-Id: I74b9c758ec37ef41e1a53873266df0eeebfcabc7
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/imports/labsmodels')
| -rw-r--r-- | src/imports/labsmodels/labsmodels.pro | 2 | ||||
| -rw-r--r-- | src/imports/labsmodels/qqmldelegatecomponent_p.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/labsmodels/labsmodels.pro b/src/imports/labsmodels/labsmodels.pro index 951f6fbce8..9fc52ce9cc 100644 --- a/src/imports/labsmodels/labsmodels.pro +++ b/src/imports/labsmodels/labsmodels.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = labsmodelsplugin TARGETPATH = Qt/labs/qmlmodels -QML_IMPORT_VERSION = 1.0 +QML_IMPORT_VERSION = $$QT_VERSION QT = qml-private qmlmodels-private diff --git a/src/imports/labsmodels/qqmldelegatecomponent_p.h b/src/imports/labsmodels/qqmldelegatecomponent_p.h index 6f3170e19a..9655d1baf9 100644 --- a/src/imports/labsmodels/qqmldelegatecomponent_p.h +++ b/src/imports/labsmodels/qqmldelegatecomponent_p.h @@ -108,6 +108,7 @@ class QQmlDelegateChooser : public QQmlAbstractDelegateComponent Q_PROPERTY(QQmlListProperty<QQmlDelegateChoice> choices READ choices CONSTANT) Q_CLASSINFO("DefaultProperty", "choices") QML_NAMED_ELEMENT(DelegateChooser) + QML_ADDED_IN_VERSION(1, 0) public: QString role() const { return m_role; } |