qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix TODO comments for revisions 

These could not be revisioned as 6.0 at the time, but now they can.

Fixes: QTBUG-84190
Change-Id: I14dbd7609b0662a3ca13ac413204d953c37af7cf
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Mitch Curtis 2020-08-26 15:33:00 +02:00
parent ec408de703
commit 113ea20a12
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/imports/controls/imagine/impl/OpacityMask.qml
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.

3
src/imports/controls/imagine/impl/qmldir
View File

@ -2,5 +2,4 @@ module QtQuick.Controls.Imagine.impl
plugin qtquickcontrols2imaginestyleimplplugin
classname QtQuickControls2ImagineStyleImplPlugin
#TODO: update to 6.0
OpacityMask 2.0 OpacityMask.qml
OpacityMask 6.0 OpacityMask.qml

4
src/quicktemplates2/qquickcombobox_p.h
View File

@ -94,9 +94,9 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickComboBox : public QQuickControl
Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole NOTIFY valueRoleChanged FINAL REVISION(2, 14))
// 2.15 (Qt 5.15)
Q_PROPERTY(bool selectTextByMouse READ selectTextByMouse WRITE setSelectTextByMouse NOTIFY selectTextByMouseChanged FINAL REVISION(2, 15))
// TODO: 6.0 (Qt 6.0) - QTBUG-84190
// 6.0 (Qt 6.0)
Q_PROPERTY(ImplicitContentWidthPolicy implicitContentWidthPolicy READ implicitContentWidthPolicy
WRITE setImplicitContentWidthPolicy NOTIFY implicitContentWidthPolicyChanged FINAL REVISION 15)
WRITE setImplicitContentWidthPolicy NOTIFY implicitContentWidthPolicyChanged FINAL REVISION(6, 0))
QML_NAMED_ELEMENT(ComboBox)
QML_ADDED_IN_VERSION(2, 0)