diff options
39 files changed, 990 insertions, 813 deletions
diff --git a/.qmake.conf b/.qmake.conf index eb094e4b..eb6b6a3b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,6 @@ load(qt_build_config) CONFIG += warning_clean android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop -MODULE_VERSION = 5.13.2 +DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST + +MODULE_VERSION = 5.14.0 diff --git a/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp index b93641a9..1e47f23e 100644 --- a/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp +++ b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp @@ -132,11 +132,8 @@ QJSValue SortFilterProxyModel::get(int idx) const QJSValue value = engine->newObject(); if (idx >= 0 && idx < count()) { QHash<int, QByteArray> roles = roleNames(); - QHashIterator<int, QByteArray> it(roles); - while (it.hasNext()) { - it.next(); + for (auto it = roles.cbegin(), end = roles.cend(); it != end; ++it) value.setProperty(QString::fromUtf8(it.value()), data(index(idx, 0), it.key()).toString()); - } } return value; } @@ -156,14 +153,7 @@ void SortFilterProxyModel::componentComplete() int SortFilterProxyModel::roleKey(const QByteArray &role) const { - QHash<int, QByteArray> roles = roleNames(); - QHashIterator<int, QByteArray> it(roles); - while (it.hasNext()) { - it.next(); - if (it.value() == role) - return it.key(); - } - return -1; + return roleNames().key(role, -1); } QHash<int, QByteArray> SortFilterProxyModel::roleNames() const @@ -181,9 +171,7 @@ bool SortFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so QAbstractItemModel *model = sourceModel(); if (filterRole().isEmpty()) { QHash<int, QByteArray> roles = roleNames(); - QHashIterator<int, QByteArray> it(roles); - while (it.hasNext()) { - it.next(); + for (auto it = roles.cbegin(), end = roles.cend(); it != end; ++it) { QModelIndex sourceIndex = model->index(sourceRow, 0, sourceParent); QString key = model->data(sourceIndex, it.key()).toString(); if (key.contains(rx)) diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp index 69da88f0..ac9f5bd4 100644 --- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp +++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp @@ -345,7 +345,8 @@ QStringList DocumentHandler::defaultFontSizes() const // uhm... this is quite ugly QStringList sizes; QFontDatabase db; - foreach (int size, db.standardSizes()) + const auto standardSizes = db.standardSizes(); + for (int size : standardSizes) sizes.append(QString::number(size)); return sizes; } diff --git a/examples/quickcontrols/extras/flat/main.qml b/examples/quickcontrols/extras/flat/main.qml index d91c2063..661225eb 100644 --- a/examples/quickcontrols/extras/flat/main.qml +++ b/examples/quickcontrols/extras/flat/main.qml @@ -48,6 +48,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.4 import QtQuick.Layouts 1.0 import QtQuick.Controls 1.4 @@ -138,11 +139,12 @@ ApplicationWindow { height: parent.height // Don't let the menus become visible when resizing the window - Binding { + Qml.Binding { target: controlsMenu property: "x" value: container.x - controlsMenu.width when: !xBehavior.enabled && !xNumberAnimation.running && currentMenu == -1 + restoreMode: Binding.RestoreBinding } Behavior on x { diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index b739ecae..7d215556 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick.Window 2.2 import QtQuick 2.2 import QtQuick.Controls 1.2 @@ -171,19 +172,21 @@ Window { /*! \internal */ property real __width: 0 - Binding { + Qml.Binding { target: root property: "__width" when: (root.minimumWidth <= root.maximumWidth) && !contentArea.__noImplicitWidthGiven value: Math.max(Math.min(root.maximumWidth, contentArea.implicitWidth), root.minimumWidth) + restoreMode: Binding.RestoreBinding } /*! \internal */ property real __height: 0 - Binding { + Qml.Binding { target: root property: "__height" when: (root.minimumHeight <= root.maximumHeight) && !contentArea.__noImplicitHeightGiven value: Math.max(Math.min(root.maximumHeight, contentArea.implicitHeight + __topBottomMargins), root.minimumHeight) + restoreMode: Binding.RestoreBinding } /* As soon as an application developer writes width: 200 @@ -224,16 +227,32 @@ Window { onStatusChanged: if (status === Loader.Error) console.error("Failed to load Style for", root) } - Binding { target: toolBar; property: "parent"; value: __panel.toolBarArea } - Binding { target: statusBar; property: "parent"; value: __panel.statusBarArea } + Qml.Binding { + target: toolBar + property: "parent" + value: __panel.toolBarArea + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: statusBar + property: "parent" + value: __panel.statusBarArea + restoreMode: Binding.RestoreBinding + } - Binding { + Qml.Binding { property: "parent" target: menuBar ? menuBar.__contentItem : null when: menuBar && !menuBar.__isNative value: __panel.menuBarArea + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: menuBar + property: "__parentWindow" + value: root + restoreMode: Binding.RestoreBinding } - Binding { target: menuBar; property: "__parentWindow"; value: root } Keys.forwardTo: menuBar ? [menuBar.__contentItem, __panel] : [] diff --git a/src/controls/Button.qml b/src/controls/Button.qml index 71e657ec..73b3b349 100644 --- a/src/controls/Button.qml +++ b/src/controls/Button.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -93,16 +94,18 @@ BasicButton { style: Settings.styleComponent(Settings.style, "ButtonStyle.qml", button) - Binding { + Qml.Binding { target: menu property: "__minimumWidth" value: button.__panel.width + restoreMode: Binding.RestoreBinding } - Binding { + Qml.Binding { target: menu property: "__visualItem" value: button + restoreMode: Binding.RestoreBinding } Connections { diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index 7c6f93a7..94bbc0cd 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -549,11 +550,12 @@ Control { } } - Binding { + Qml.Binding { target: input property: "text" value: popup.currentText when: input.editTextMatches + restoreMode: Binding.RestoreBinding } onTextRoleChanged: popup.resolveTextValue(textRole) diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml index a98d0e81..2628d064 100644 --- a/src/controls/MenuBar.qml +++ b/src/controls/MenuBar.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 @@ -130,11 +131,12 @@ MenuBarPrivate { width: implicitWidth || root.__contentItem.preferredWidth height: Math.max(row.height + d.heightPadding, item ? item.implicitHeight : 0) - Binding { + Qml.Binding { // Make sure the styled menu bar is in the background target: menuBarLoader.item property: "z" value: menuMouseArea.z - 1 + restoreMode: Binding.RestoreBinding } QtObject { diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index 6c7c5511..48e6eadc 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -48,6 +48,7 @@ // We mean it. // +import QtQml 2.14 as Qml import QtQuick 2.6 import QtQuick.Controls 1.5 import QtQuick.Controls.Private 1.0 @@ -426,7 +427,7 @@ ScrollView { && !transientScrollBars && Qt.platform.os === "osx" ? __verticalScrollBar.width + __scroller.scrollBarSpacing + root.__style.padding.right : 0 - Binding { + Qml.Binding { // On Mac, we reserve the vSB space in the contentItem because the vSB should // appear under the header. Unfortunately, the ListView header won't expand // beyond the ListView's boundaries, that's why we need to ressort to this. @@ -434,6 +435,7 @@ ScrollView { when: Qt.platform.os === "osx" property: "verticalScrollbarOffset" value: 0 + restoreMode: Binding.RestoreBinding } function incrementCurrentIndexBlocking() { diff --git a/src/controls/Private/ColumnMenuContent.qml b/src/controls/Private/ColumnMenuContent.qml index e130b2a2..5f8b4d68 100644 --- a/src/controls/Private/ColumnMenuContent.qml +++ b/src/controls/Private/ColumnMenuContent.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -242,9 +243,10 @@ Item { ? ListView.Center : ListView.Beginning) } - Binding { + Qml.Binding { target: scrollView.__verticalScrollBar property: "singleStep" value: itemHeight + restoreMode: Binding.RestoreBinding } } diff --git a/src/controls/Private/MenuContentItem.qml b/src/controls/Private/MenuContentItem.qml index fe8e7726..9fcb2f0f 100644 --- a/src/controls/Private/MenuContentItem.qml +++ b/src/controls/Private/MenuContentItem.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 @@ -155,11 +156,12 @@ Loader { Keys.onReturnPressed: d.triggerCurrent() Keys.onEnterPressed: d.triggerCurrent() - Binding { + Qml.Binding { // Make sure the styled frame is in the background target: item property: "z" value: content.z - 1 + restoreMode: Binding.RestoreBinding } ColumnMenuContent { @@ -268,11 +270,12 @@ Loader { d.mnemonicsMap[title[ampersandPos + 1].toUpperCase()] = menuItemLoader } - Binding { + Qml.Binding { target: menuItemLoader.item property: "width" property alias menuItem: menuItemLoader.item value: menuItem ? Math.max(__menu.__minimumWidth, content.width) - 2 * menuItem.x : 0 + restoreMode: Binding.RestoreBinding } } } diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index 4f1d59f0..c16c55b8 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -143,21 +144,23 @@ Item { } } onValueChanged: { - if (!blockUpdates) { + if (flickableItem && !blockUpdates) { flickableItem.contentX = value + flickableItem.originX } } - Binding { + Qml.Binding { target: hscrollbar.__panel property: "raised" value: vscrollbar.active || scrollHelper.active when: hscrollbar.isTransient + restoreMode: Binding.RestoreBinding } - Binding { + Qml.Binding { target: hscrollbar.__panel property: "visible" value: true when: !hscrollbar.isTransient || scrollHelper.active + restoreMode: Binding.RestoreBinding } function flash() { if (hscrollbar.isTransient) { @@ -201,17 +204,19 @@ Item { flickableItem.contentY = value + flickableItem.originY } } - Binding { + Qml.Binding { target: vscrollbar.__panel property: "raised" value: hscrollbar.active || scrollHelper.active when: vscrollbar.isTransient + restoreMode: Binding.RestoreBinding } - Binding { + Qml.Binding { target: vscrollbar.__panel property: "visible" value: true when: !vscrollbar.isTransient || scrollHelper.active + restoreMode: Binding.RestoreBinding } function flash() { if (vscrollbar.isTransient) { diff --git a/src/controls/Private/TabBar.qml b/src/controls/Private/TabBar.qml index bf76b977..1186968d 100644 --- a/src/controls/Private/TabBar.qml +++ b/src/controls/Private/TabBar.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -170,11 +171,12 @@ FocusScope { focus: true enabled: modelData.enabled - Binding { + Qml.Binding { target: tabbar when: selected property: "__selectedTabRect" value: Qt.rect(x, y, width, height) + restoreMode: Binding.RestoreBinding } drag.target: tabsMovable ? tabloader : null diff --git a/src/controls/Private/ToolMenuButton.qml b/src/controls/Private/ToolMenuButton.qml index 2366d0c9..e6fba40c 100644 --- a/src/controls/Private/ToolMenuButton.qml +++ b/src/controls/Private/ToolMenuButton.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.4 import QtQuick.Controls 1.3 import QtQuick.Controls.Private 1.0 @@ -110,15 +111,17 @@ FocusScope { } } - Binding { + Qml.Binding { target: menu property: "__minimumWidth" value: button.width + restoreMode: Binding.RestoreBinding } - Binding { + Qml.Binding { target: menu property: "__visualItem" value: button + restoreMode: Binding.RestoreBinding } } diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp index f9596d35..08f80713 100644 --- a/src/controls/Private/qquickstyleitem.cpp +++ b/src/controls/Private/qquickstyleitem.cpp @@ -1466,7 +1466,7 @@ void QQuickStyleItem1::paint(QPainter *painter) case ItemRow :{ QPixmap pixmap; // Only draw through style once - const QString pmKey = QLatin1Literal("itemrow") % QString::number(m_styleoption->state,16) % activeControl(); + const QString pmKey = QLatin1String("itemrow") % QString::number(m_styleoption->state,16) % activeControl(); if (!QPixmapCache::find(pmKey, &pixmap) || pixmap.width() < width() || height() != pixmap.height()) { int newSize = width(); pixmap = QPixmap(newSize, height()); diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index b0df615e..951fe65e 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -224,18 +225,20 @@ FocusScope { property alias __control: root } - Binding { + Qml.Binding { target: flickableItem property: "contentHeight" when: contentItem !== flickableItem value: contentItem ? contentItem.height : 0 + restoreMode: Binding.RestoreBinding } - Binding { + Qml.Binding { target: flickableItem when: contentItem !== flickableItem property: "contentWidth" value: contentItem ? contentItem.width : 0 + restoreMode: Binding.RestoreBinding } Connections { diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index 07ad74c4..ff2f0c23 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -310,11 +311,12 @@ Control { // During the drag, we simply ignore the position set from the range, this // means that setting a value while dragging will not "interrupt" the // dragging activity. - Binding { + Qml.Binding { when: !mouseArea.drag.active target: fakeHandle property: __horizontal ? "x" : "y" value: range.position + restoreMode: Binding.RestoreBinding } WheelArea { diff --git a/src/controls/Styles/Android/ApplicationWindowStyle.qml b/src/controls/Styles/Android/ApplicationWindowStyle.qml index c8201de7..de1184ff 100644 --- a/src/controls/Styles/Android/ApplicationWindowStyle.qml +++ b/src/controls/Styles/Android/ApplicationWindowStyle.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.3 @@ -111,12 +112,13 @@ QtObject { items: control.menuBar ? control.menuBar.menus : [] } - Binding { + Qml.Binding { target: control.toolBar property: "__menu" value: proxyMenu.items.length > 1 ? proxyMenu : proxyMenu.items.length === 1 ? proxyMenu.items[0] : null when: hasToolBar + restoreMode: Binding.RestoreBinding } } } diff --git a/src/controls/Styles/Android/GroupBoxStyle.qml b/src/controls/Styles/Android/GroupBoxStyle.qml index bd077d5a..f312870d 100644 --- a/src/controls/Styles/Android/GroupBoxStyle.qml +++ b/src/controls/Styles/Android/GroupBoxStyle.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Window 2.2 import QtQuick.Controls 1.2 @@ -54,10 +55,30 @@ GroupBoxStyle { readonly property real contentMargin: label.implicitHeight / 3 readonly property real topMargin: control.checkable ? indicator.height : label.height - Binding { target: root; property: "padding.top"; value: topMargin + contentMargin } - Binding { target: root; property: "padding.left"; value: contentMargin } - Binding { target: root; property: "padding.right"; value: contentMargin } - Binding { target: root; property: "padding.bottom"; value: contentMargin } + Qml.Binding { + target: root + property: "padding.top" + value: topMargin + contentMargin + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: root + property: "padding.left" + value: contentMargin + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: root + property: "padding.right" + value: contentMargin + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: root + property: "padding.bottom" + value: contentMargin + restoreMode: Binding.RestoreBinding + } DrawableLoader { anchors.top: parent.top diff --git a/src/controls/Styles/Android/SpinBoxStyle.qml b/src/controls/Styles/Android/SpinBoxStyle.qml index 74126e9a..82a63dd8 100644 --- a/src/controls/Styles/Android/SpinBoxStyle.qml +++ b/src/controls/Styles/Android/SpinBoxStyle.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.4 import QtQuick.Window 2.2 import QtQuick.Controls 1.2 @@ -72,10 +73,30 @@ Style { styleDef: panel.styleDef.View_background } - Binding { target: style; property: "padding.top"; value: bg.padding.top } - Binding { target: style; property: "padding.left"; value: bg.padding.left } - Binding { target: style; property: "padding.right"; value: bg.padding.right } - Binding { target: style; property: "padding.bottom"; value: bg.padding.bottom } + Qml.Binding { + target: style + property: "padding.top" + value: bg.padding.top + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: style + property: "padding.left" + value: bg.padding.left + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: style + property: "padding.right" + value: bg.padding.right + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: style + property: "padding.bottom" + value: bg.padding.bottom + restoreMode: Binding.RestoreBinding + } readonly property alias font: label.font readonly property alias foregroundColor: label.color diff --git a/src/controls/Styles/Android/drawables/DrawableLoader.qml b/src/controls/Styles/Android/drawables/DrawableLoader.qml index e2d2873b..bd525253 100644 --- a/src/controls/Styles/Android/drawables/DrawableLoader.qml +++ b/src/controls/Styles/Android/drawables/DrawableLoader.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -85,17 +86,82 @@ Loader { type === "rotate" ? Qt.createComponent("RotateDrawable.qml") : type === "stateslist" ? Qt.createComponent("StateDrawable.qml") : null - Binding { target: loader.item; property: "styleDef"; value: loader.styleDef } - Binding { target: loader.item; property: "focused"; value: loader.focused } - Binding { target: loader.item; property: "pressed"; value: loader.pressed } - Binding { target: loader.item; property: "checked"; value: loader.checked } - Binding { target: loader.item; property: "selected"; value: loader.selected } - Binding { target: loader.item; property: "accelerated"; value: loader.accelerated } - Binding { target: loader.item; property: "window_focused"; value: loader.window_focused } - Binding { target: loader.item; property: "level"; value: loader.level } - Binding { target: loader.item; property: "levelId"; value: loader.levelId } - Binding { target: loader.item; property: "orientations"; value: loader.orientations } - Binding { target: loader.item; property: "duration"; value: loader.duration } - Binding { target: loader.item; property: "excludes"; value: loader.excludes } - Binding { target: loader.item; property: "clippables"; value: loader.clippables } + Qml.Binding { + target: loader.item + property: "styleDef" + value: loader.styleDef + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "focused" + value: loader.focused + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "pressed" + value: loader.pressed + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "checked" + value: loader.checked + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "selected" + value: loader.selected + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "accelerated" + value: loader.accelerated + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "window_focused" + value: loader.window_focused + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "level" + value: loader.level + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "levelId" + value: loader.levelId + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "orientations" + value: loader.orientations + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "duration" + value: loader.duration + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "excludes" + value: loader.excludes + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: loader.item + property: "clippables" + value: loader.clippables + restoreMode: Binding.RestoreBinding + } } diff --git a/src/controls/Styles/Android/qquickandroidstyle.cpp b/src/controls/Styles/Android/qquickandroidstyle.cpp index 0c57d795..36fe0e82 100644 --- a/src/controls/Styles/Android/qquickandroidstyle.cpp +++ b/src/controls/Styles/Android/qquickandroidstyle.cpp @@ -85,11 +85,11 @@ QByteArray QQuickAndroidStyle1::data() const return m_data; } -QString QQuickAndroidStyle1::filePath(const QString &fileName) const +QUrl QQuickAndroidStyle1::filePath(const QString &fileName) const { if (!fileName.isEmpty()) - return m_path + QFileInfo(fileName).fileName(); - return QString(); + return QUrl::fromLocalFile(m_path + QFileInfo(fileName).fileName()); + return {}; } QColor QQuickAndroidStyle1::colorValue(uint value) const diff --git a/src/controls/Styles/Android/qquickandroidstyle_p.h b/src/controls/Styles/Android/qquickandroidstyle_p.h index 6911eb8d..856b5753 100644 --- a/src/controls/Styles/Android/qquickandroidstyle_p.h +++ b/src/controls/Styles/Android/qquickandroidstyle_p.h @@ -41,6 +41,7 @@ #define QQUICKANDROIDSTYLE_P_H #include <QtCore/qobject.h> +#include <QtCore/qurl.h> #include <QtGui/qcolor.h> QT_BEGIN_NAMESPACE @@ -57,7 +58,7 @@ public: QByteArray data() const; Q_INVOKABLE QColor colorValue(uint value) const; - Q_INVOKABLE QString filePath(const QString &fileName) const; + Q_INVOKABLE QUrl filePath(const QString &fileName) const; enum Gravity { NO_GRAVITY = 0x0000, diff --git a/src/controls/Styles/Desktop/MenuStyle.qml b/src/controls/Styles/Desktop/MenuStyle.qml index 953f6a32..282860ae 100644 --- a/src/controls/Styles/Desktop/MenuStyle.qml +++ b/src/controls/Styles/Desktop/MenuStyle.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Window 2.1 import QtQuick.Controls 1.2 @@ -78,10 +79,11 @@ Style { // ### The Screen attached property can only be set on an Item, // ### and will get its values only when put on a Window. readonly property int desktopAvailableHeight: Screen.desktopAvailableHeight - Binding { + Qml.Binding { target: styleRoot property: "__maxPopupHeight" value: desktopAvailableHeight * 0.99 + restoreMode: Binding.RestoreBinding } } diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index 82eef800..6d34f285 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -239,30 +239,38 @@ void QtQuickControls1Plugin::initializeEngine(QQmlEngine *engine, const char *ur QString QtQuickControls1Plugin::fileLocation() const { -#ifndef QT_STATIC +#ifdef Q_OS_ANDROID + return "qrc:/android_rcc_bundle/qml/QtQuick/Controls"; +#else +# ifndef QT_STATIC if (isLoadedFromResource()) return "qrc:/QtQuick/Controls"; return baseUrl().toString(); -#else +# else return "qrc:/qt-project.org/imports/QtQuick/Controls"; +# endif #endif } bool QtQuickControls1Plugin::isLoadedFromResource() const { -#ifdef QT_STATIC +#ifdef Q_OS_ANDROID + return true; +#else +# ifdef QT_STATIC // When static it is included automatically // for us. return false; -#endif -#if defined(ALWAYS_LOAD_FROM_RESOURCES) +# endif +# if defined(ALWAYS_LOAD_FROM_RESOURCES) return true; -#else +# else // If one file is missing, it will load all the files from the resource QFile file(baseUrl().toLocalFile() + "/ApplicationWindow.qml"); if (!file.exists()) return true; return false; +# endif #endif } diff --git a/src/controls/plugins.qmltypes b/src/controls/plugins.qmltypes index db5788a5..8515aafd 100644 --- a/src/controls/plugins.qmltypes +++ b/src/controls/plugins.qmltypes @@ -9,6 +9,7 @@ import QtQuick.tooling 1.2 Module { dependencies: [ "QtGraphicalEffects 1.12", + "QtQml 2.14", "QtQml.Models 2.2", "QtQuick 2.9", "QtQuick.Controls.Styles 1.4", @@ -17,6 +18,283 @@ Module { "QtQuick.Window 2.2" ] Component { + name: "QAbstractItemModel" + prototype: "QObject" + exports: ["QtQuick.Controls.Private/AbstractItemModel 1.0"] + isCreatable: false + exportMetaObjectRevisions: [0] + Enum { + name: "LayoutChangeHint" + values: { + "NoLayoutChangeHint": 0, + "VerticalSortHint": 1, + "HorizontalSortHint": 2 + } + } + Enum { + name: "CheckIndexOption" + values: { + "NoOption": 0, + "IndexIsValid": 1, + "DoNotUseParent": 2, + "ParentIsInvalid": 4 + } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + Parameter { name: "roles"; type: "QVector<int>" } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + } + Signal { + name: "headerDataChanged" + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + } + Signal { name: "layoutChanged" } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + } + Signal { name: "layoutAboutToBeChanged" } + Signal { + name: "rowsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { name: "modelAboutToBeReset" } + Signal { name: "modelReset" } + Signal { + name: "rowsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationRow"; type: "int" } + } + Signal { + name: "rowsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "row"; type: "int" } + } + Signal { + name: "columnsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationColumn"; type: "int" } + } + Signal { + name: "columnsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "column"; type: "int" } + } + Method { name: "submit"; type: "bool" } + Method { name: "revert" } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "parent" + type: "QModelIndex" + Parameter { name: "child"; type: "QModelIndex" } + } + Method { + name: "sibling" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "idx"; type: "QModelIndex" } + } + Method { + name: "rowCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "rowCount"; type: "int" } + Method { + name: "columnCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "columnCount"; type: "int" } + Method { + name: "hasChildren" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "hasChildren"; type: "bool" } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + } + Method { + name: "fetchMore" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "canFetchMore" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "flags" + type: "Qt::ItemFlags" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + Parameter { name: "flags"; type: "Qt::MatchFlags" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + } + } + Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" } + Component { name: "QQuickAbstractStyle1" defaultProperty: "data" prototype: "QObject" @@ -421,6 +699,19 @@ Module { Property { name: "maximumDate"; type: "QDateTime" } } Component { + name: "QQuickRootItem" + defaultProperty: "data" + prototype: "QQuickItem" + Method { + name: "setWidth" + Parameter { name: "w"; type: "int" } + } + Method { + name: "setHeight" + Parameter { name: "h"; type: "int" } + } + } + Component { name: "QQuickScenePosListener1" prototype: "QObject" exports: ["QtQuick.Controls.Private/ScenePosListener 1.0"] @@ -672,7 +963,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "menuBar"; type: "MenuBar_QMLTYPE_3"; isPointer: true } + Property { name: "menuBar"; type: "MenuBar_QMLTYPE_4"; isPointer: true } Property { name: "toolBar"; type: "QQuickItem"; isPointer: true } Property { name: "statusBar"; type: "QQuickItem"; isPointer: true } Property { name: "style"; type: "QQmlComponent"; isPointer: true } @@ -680,7 +971,7 @@ Module { Property { name: "__qwindowsize_max"; type: "double"; isReadonly: true } Property { name: "__width"; type: "double" } Property { name: "__height"; type: "double" } - Property { name: "contentItem"; type: "ContentItem_QMLTYPE_1"; isReadonly: true; isPointer: true } + Property { name: "contentItem"; type: "ContentItem_QMLTYPE_2"; isReadonly: true; isPointer: true } Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "__panel"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } @@ -693,7 +984,7 @@ Module { isComposite: true Property { name: "control" - type: "ApplicationWindow_QMLTYPE_11" + type: "ApplicationWindow_QMLTYPE_12" isReadonly: true isPointer: true } @@ -715,17 +1006,15 @@ Module { Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/BusyIndicatorStyle 1.1" exports: ["QtQuick.Controls.Styles/BusyIndicatorStyle 1.1"] exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "BusyIndicator_QMLTYPE_18"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "BusyIndicator_QMLTYPE_19"; isReadonly: true; isPointer: true } Property { name: "indicator"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -735,7 +1024,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_51"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } @@ -762,24 +1051,22 @@ Module { Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/ButtonStyle 1.0" exports: ["QtQuick.Controls.Styles/ButtonStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Button_QMLTYPE_52"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Button_QMLTYPE_53"; isReadonly: true; isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "label"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Controls/Calendar 1.6" - exports: ["QtQuick.Controls/Calendar 1.6"] - exportMetaObjectRevisions: [6] + name: "QtQuick.Controls/Calendar 1.2" + exports: ["QtQuick.Controls/Calendar 1.2"] + exportMetaObjectRevisions: [2] isComposite: true defaultProperty: "data" Property { name: "visibleMonth"; type: "int" } @@ -838,9 +1125,9 @@ Module { } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Controls/Calendar 1.2" - exports: ["QtQuick.Controls/Calendar 1.2"] - exportMetaObjectRevisions: [2] + name: "QtQuick.Controls/Calendar 1.6" + exports: ["QtQuick.Controls/Calendar 1.6"] + exportMetaObjectRevisions: [6] isComposite: true defaultProperty: "data" Property { name: "visibleMonth"; type: "int" } @@ -898,13 +1185,13 @@ Module { Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/CalendarStyle 1.1" exports: ["QtQuick.Controls.Styles/CalendarStyle 1.1"] exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Calendar_QMLTYPE_56"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Calendar_QMLTYPE_57"; isReadonly: true; isPointer: true } Property { name: "gridColor"; type: "QColor" } Property { name: "gridVisible"; type: "bool" } Property { name: "__gridLineWidth"; type: "double" } @@ -926,8 +1213,6 @@ Module { type: "QVariant" Parameter { name: "date"; type: "QVariant" } } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -957,23 +1242,21 @@ Module { Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/CheckBoxStyle 1.0" exports: ["QtQuick.Controls.Styles/CheckBoxStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "CheckBox_QMLTYPE_75"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "CheckBox_QMLTYPE_77"; isReadonly: true; isPointer: true } Property { name: "label"; type: "QQmlComponent"; isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "spacing"; type: "int" } Property { name: "indicator"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/CircularButtonStyle 1.0" exports: ["QtQuick.Controls.Styles/CircularButtonStyle 1.0"] exportMetaObjectRevisions: [0] @@ -981,25 +1264,23 @@ Module { defaultProperty: "data" Property { name: "__buttonHelper" - type: "CircularButtonStyleHelper_QMLTYPE_79" + type: "CircularButtonStyleHelper_QMLTYPE_82" isReadonly: true isPointer: true } - Property { name: "control"; type: "Button_QMLTYPE_52"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Button_QMLTYPE_53"; isReadonly: true; isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "label"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/CircularGaugeStyle 1.0" exports: ["QtQuick.Controls.Styles/CircularGaugeStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "CircularGauge_QMLTYPE_82"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "CircularGauge_QMLTYPE_94"; isReadonly: true; isPointer: true } Property { name: "outerRadius"; type: "double"; isReadonly: true } Property { name: "minimumValueAngle"; type: "double" } Property { name: "maximumValueAngle"; type: "double" } @@ -1026,11 +1307,9 @@ Module { type: "QVariant" Parameter { name: "value"; type: "QVariant" } } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/CircularTickmarkLabelStyle 1.0" exports: ["QtQuick.Controls.Styles/CircularTickmarkLabelStyle 1.0"] exportMetaObjectRevisions: [0] @@ -1043,8 +1322,6 @@ Module { Property { name: "tickmarkLabel"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } Property { name: "control"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -1095,7 +1372,7 @@ Module { Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/ComboBoxStyle 1.0" exports: ["QtQuick.Controls.Styles/ComboBoxStyle 1.0"] exportMetaObjectRevisions: [0] @@ -1106,7 +1383,7 @@ Module { Property { name: "textColor"; type: "QColor" } Property { name: "selectionColor"; type: "QColor" } Property { name: "selectedTextColor"; type: "QColor" } - Property { name: "control"; type: "ComboBox_QMLTYPE_103"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "ComboBox_QMLTYPE_106"; isReadonly: true; isPointer: true } Property { name: "dropDownButtonWidth"; type: "int" } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "__editor"; type: "QQmlComponent"; isPointer: true } @@ -1118,8 +1395,6 @@ Module { Property { name: "__selectionHandle"; type: "QQmlComponent"; isPointer: true } Property { name: "__cursorDelegate"; type: "QQmlComponent"; isPointer: true } Property { name: "drowDownButtonWidth"; type: "int" } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QObject" @@ -1144,36 +1419,34 @@ Module { Property { name: "inactiveColorShine"; type: "QColor" } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/DelayButtonStyle 1.0" exports: ["QtQuick.Controls.Styles/DelayButtonStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "DelayButton_QMLTYPE_141"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "DelayButton_QMLTYPE_138"; isReadonly: true; isPointer: true } Property { name: "progressBarGradient"; type: "QQuickGradient"; isPointer: true } Property { name: "progressBarDropShadowColor"; type: "QColor" } Property { name: "foreground"; type: "QQmlComponent"; isPointer: true } Property { name: "__buttonHelper" - type: "CircularButtonStyleHelper_QMLTYPE_79" + type: "CircularButtonStyleHelper_QMLTYPE_82" isReadonly: true isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "label"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/DialStyle 1.1" exports: ["QtQuick.Controls.Styles/DialStyle 1.1"] exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Dial_QMLTYPE_144"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Dial_QMLTYPE_147"; isReadonly: true; isPointer: true } Property { name: "outerRadius"; type: "double"; isReadonly: true } Property { name: "handleInset"; type: "double" } Property { name: "tickmarkStepSize"; type: "double" } @@ -1198,17 +1471,15 @@ Module { type: "QVariant" Parameter { name: "value"; type: "QVariant" } } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/GaugeStyle 1.0" exports: ["QtQuick.Controls.Styles/GaugeStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Gauge_QMLTYPE_152"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Gauge_QMLTYPE_155"; isReadonly: true; isPointer: true } Property { name: "valuePosition"; type: "double"; isReadonly: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "tickmark"; type: "QQmlComponent"; isPointer: true } @@ -1217,8 +1488,6 @@ Module { Property { name: "valueBar"; type: "QQmlComponent"; isPointer: true } Property { name: "foreground"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -1234,11 +1503,11 @@ Module { Property { name: "checked"; type: "bool" } Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "__checkbox"; type: "CheckBox_QMLTYPE_75"; isReadonly: true; isPointer: true } + Property { name: "__checkbox"; type: "CheckBox_QMLTYPE_77"; isReadonly: true; isPointer: true } Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/HandleStyle 1.0" exports: ["QtQuick.Controls.Styles/HandleStyle 1.0"] exportMetaObjectRevisions: [0] @@ -1250,8 +1519,6 @@ Module { Property { name: "handleColorBottom"; type: "QColor" } Property { name: "handleColorBottomStop"; type: "double" } Property { name: "control"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QObject" @@ -1283,7 +1550,7 @@ Module { defaultProperty: "data" } Component { - prototype: "QObject" + prototype: "QQuickMenu1" name: "QtQuick.Controls/Menu 1.0" exports: ["QtQuick.Controls/Menu 1.0"] exportMetaObjectRevisions: [0] @@ -1305,78 +1572,9 @@ Module { Parameter { name: "index"; type: "QVariant" } Parameter { name: "title"; type: "QVariant" } } - Property { name: "title"; type: "string" } - Property { name: "items"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "__selectedIndex"; type: "int" } - Property { name: "__popupVisible"; type: "bool"; isReadonly: true } - Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "__minimumWidth"; type: "int" } - Property { name: "__font"; type: "QFont" } - Property { name: "__xOffset"; type: "double" } - Property { name: "__yOffset"; type: "double" } - Property { name: "__action"; type: "QQuickAction1"; isReadonly: true; isPointer: true } - Property { name: "__popupGeometry"; type: "QRect"; isReadonly: true } - Property { name: "__isProxy"; type: "bool" } - Signal { name: "aboutToShow" } - Signal { name: "aboutToHide" } - Signal { name: "popupVisibleChanged" } - Signal { name: "__menuPopupDestroyed" } - Signal { name: "menuContentItemChanged" } - Signal { name: "minimumWidthChanged" } - Signal { name: "__proxyChanged" } - Method { name: "__dismissMenu" } - Method { name: "__closeAndDestroy" } - Method { name: "__dismissAndDestroy" } - Method { name: "popup" } - Method { - name: "addItem" - type: "QQuickMenuItem1*" - Parameter { type: "string" } - } - Method { - name: "insertItem" - type: "QQuickMenuItem1*" - Parameter { type: "int" } - Parameter { type: "string" } - } - Method { name: "addSeparator" } - Method { - name: "insertSeparator" - Parameter { type: "int" } - } - Method { - name: "removeItem" - Parameter { type: "QQuickMenuBase1"; isPointer: true } - } - Method { name: "clear" } - Method { - name: "__popup" - Parameter { name: "targetRect"; type: "QRectF" } - Parameter { name: "atItemIndex"; type: "int" } - Parameter { name: "menuType"; type: "MenuType" } - } - Method { - name: "__popup" - Parameter { name: "targetRect"; type: "QRectF" } - Parameter { name: "atItemIndex"; type: "int" } - } - Method { - name: "__popup" - Parameter { name: "targetRect"; type: "QRectF" } - } - Property { name: "enabled"; type: "bool" } - Property { name: "iconSource"; type: "QUrl" } - Property { name: "iconName"; type: "string" } - Property { name: "__icon"; type: "QVariant"; isReadonly: true } - Signal { name: "__textChanged" } - Property { name: "visible"; type: "bool" } - Property { name: "type"; type: "QQuickMenuItemType1::MenuItemType"; isReadonly: true } - Property { name: "__parentMenu"; type: "QObject"; isReadonly: true; isPointer: true } - Property { name: "__isNative"; type: "bool"; isReadonly: true } - Property { name: "__visualItem"; type: "QQuickItem"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickMenuBar1" name: "QtQuick.Controls/MenuBar 1.0" exports: ["QtQuick.Controls/MenuBar 1.0"] exportMetaObjectRevisions: [0] @@ -1385,15 +1583,9 @@ Module { Property { name: "style"; type: "QQmlComponent"; isPointer: true } Property { name: "__style"; type: "QObject"; isPointer: true } Property { name: "__menuBarComponent"; type: "QQmlComponent"; isPointer: true } - Property { name: "menus"; type: "QQuickMenu1"; isList: true; isReadonly: true } - Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "__parentWindow"; type: "QQuickWindow"; isPointer: true } - Property { name: "__isNative"; type: "bool" } - Signal { name: "nativeChanged" } - Signal { name: "contentItemChanged" } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/MenuBarStyle 1.2" exports: ["QtQuick.Controls.Styles/MenuBarStyle 1.2"] exportMetaObjectRevisions: [2] @@ -1411,11 +1603,9 @@ Module { Parameter { name: "underline"; type: "QVariant" } } Property { name: "control"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/MenuStyle 1.2" exports: ["QtQuick.Controls.Styles/MenuStyle 1.2"] exportMetaObjectRevisions: [2] @@ -1443,7 +1633,7 @@ Module { Property { name: "menuItemPanel"; type: "QQmlComponent"; isPointer: true } Property { name: "itemDelegate" - type: "MenuItemSubControls_QMLTYPE_108" + type: "MenuItemSubControls_QMLTYPE_124" isReadonly: true isPointer: true } @@ -1454,17 +1644,15 @@ Module { Parameter { name: "underline"; type: "QVariant" } } Property { name: "control"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/PieMenuStyle 1.3" exports: ["QtQuick.Controls.Styles/PieMenuStyle 1.3"] exportMetaObjectRevisions: [3] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "PieMenu_QMLTYPE_171"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "PieMenu_QMLTYPE_174"; isReadonly: true; isPointer: true } Property { name: "backgroundColor"; type: "QColor" } Property { name: "selectionColor"; type: "QColor" } Property { name: "shadowColor"; type: "QColor" } @@ -1498,8 +1686,6 @@ Module { type: "QVariant" Parameter { name: "itemIndex"; type: "QVariant" } } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -1527,19 +1713,17 @@ Module { Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/ProgressBarStyle 1.0" exports: ["QtQuick.Controls.Styles/ProgressBarStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "ProgressBar_QMLTYPE_184"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "ProgressBar_QMLTYPE_187"; isReadonly: true; isPointer: true } Property { name: "currentProgress"; type: "double"; isReadonly: true } Property { name: "progress"; type: "QQmlComponent"; isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -1564,25 +1748,18 @@ Module { Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/RadioButtonStyle 1.0" exports: ["QtQuick.Controls.Styles/RadioButtonStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { - name: "control" - type: "AbstractCheckable_QMLTYPE_73" - isReadonly: true - isPointer: true - } + Property { name: "control"; type: "RadioButton_QMLTYPE_194"; isReadonly: true; isPointer: true } Property { name: "label"; type: "QQmlComponent"; isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "spacing"; type: "int" } Property { name: "indicator"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -1597,14 +1774,14 @@ Module { Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_2"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } Property { name: "horizontalScrollBarPolicy"; type: "int" } Property { name: "verticalScrollBarPolicy"; type: "int" } Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_28" + type: "ScrollViewHelper_QMLTYPE_31" isReadonly: true isPointer: true } @@ -1612,25 +1789,25 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/ScrollViewStyle 1.0" exports: ["QtQuick.Controls.Styles/ScrollViewStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "ScrollView_QMLTYPE_32"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "ScrollView_QMLTYPE_35"; isReadonly: true; isPointer: true } Property { name: "corner"; type: "QQmlComponent"; isPointer: true } Property { name: "scrollToClickedPosition"; type: "bool" } Property { name: "transientScrollBars"; type: "bool" } @@ -1647,8 +1824,6 @@ Module { Property { name: "__scrollBarFadeDelay"; type: "int" } Property { name: "__scrollBarFadeDuration"; type: "int" } Property { name: "__stickyScrollbars"; type: "bool" } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -1707,19 +1882,17 @@ Module { Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/SliderStyle 1.0" exports: ["QtQuick.Controls.Styles/SliderStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Slider_QMLTYPE_194"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Slider_QMLTYPE_198"; isReadonly: true; isPointer: true } Property { name: "handle"; type: "QQmlComponent"; isPointer: true } Property { name: "groove"; type: "QQmlComponent"; isPointer: true } Property { name: "tickmarks"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -1755,13 +1928,13 @@ Module { Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/SpinBoxStyle 1.1" exports: ["QtQuick.Controls.Styles/SpinBoxStyle 1.1"] exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "SpinBox_QMLTYPE_214"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "SpinBox_QMLTYPE_218"; isReadonly: true; isPointer: true } Property { name: "horizontalAlignment"; type: "int" } Property { name: "textColor"; type: "QColor" } Property { name: "selectionColor"; type: "QColor" } @@ -1775,8 +1948,6 @@ Module { Property { name: "__cursorHandle"; type: "QQmlComponent"; isPointer: true } Property { name: "__selectionHandle"; type: "QQmlComponent"; isPointer: true } Property { name: "__cursorDelegate"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickItem" @@ -1811,7 +1982,7 @@ Module { defaultProperty: "data" Property { name: "initialItem"; type: "QVariant" } Property { name: "busy"; type: "bool"; isReadonly: true } - Property { name: "delegate"; type: "StackViewDelegate_QMLTYPE_228"; isPointer: true } + Property { name: "delegate"; type: "StackViewDelegate_QMLTYPE_232"; isPointer: true } Property { name: "__currentItem"; type: "QQuickItem"; isPointer: true } Property { name: "__depth"; type: "int" } Property { name: "__currentTransition"; type: "QVariant" } @@ -1930,7 +2101,7 @@ Module { Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/StatusBarStyle 1.0" exports: ["QtQuick.Controls.Styles/StatusBarStyle 1.0"] exportMetaObjectRevisions: [0] @@ -1939,11 +2110,9 @@ Module { Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } Property { name: "control"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/StatusIndicatorStyle 1.1" exports: ["QtQuick.Controls.Styles/StatusIndicatorStyle 1.1"] exportMetaObjectRevisions: [1] @@ -1951,15 +2120,13 @@ Module { defaultProperty: "data" Property { name: "control" - type: "StatusIndicator_QMLTYPE_237" + type: "StatusIndicator_QMLTYPE_241" isReadonly: true isPointer: true } Property { name: "color"; type: "QColor" } Property { name: "indicator"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -1980,7 +2147,7 @@ Module { Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/SwitchStyle 1.1" exports: ["QtQuick.Controls.Styles/SwitchStyle 1.1"] exportMetaObjectRevisions: [1] @@ -1990,8 +2157,6 @@ Module { Property { name: "groove"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } Property { name: "control"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickLoader" @@ -2063,13 +2228,13 @@ Module { Method { name: "__setOpacities"; type: "QVariant" } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/TabViewStyle 1.0" exports: ["QtQuick.Controls.Styles/TabViewStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "TabView_QMLTYPE_253"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "TabView_QMLTYPE_257"; isReadonly: true; isPointer: true } Property { name: "tabsMovable"; type: "bool" } Property { name: "tabsAlignment"; type: "int" } Property { name: "tabOverlap"; type: "int" } @@ -2079,8 +2244,6 @@ Module { Property { name: "leftCorner"; type: "QQmlComponent"; isPointer: true } Property { name: "rightCorner"; type: "QQmlComponent"; isPointer: true } Property { name: "tabBar"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -2094,7 +2257,7 @@ Module { Property { name: "currentRow"; type: "int" } Property { name: "selection" - type: "TableViewSelection_QMLTYPE_259" + type: "TableViewSelection_QMLTYPE_285" isReadonly: true isPointer: true } @@ -2184,14 +2347,14 @@ Module { Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_2"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } Property { name: "horizontalScrollBarPolicy"; type: "int" } Property { name: "verticalScrollBarPolicy"; type: "int" } Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_28" + type: "ScrollViewHelper_QMLTYPE_31" isReadonly: true isPointer: true } @@ -2199,13 +2362,13 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } @@ -2230,13 +2393,13 @@ Module { Method { name: "resizeToContents"; type: "QVariant" } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/TableViewStyle 1.0" exports: ["QtQuick.Controls.Styles/TableViewStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "TableView_QMLTYPE_285"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "TableView_QMLTYPE_289"; isReadonly: true; isPointer: true } Property { name: "textColor"; type: "QColor" } Property { name: "backgroundColor"; type: "QColor" } Property { name: "alternateBackgroundColor"; type: "QColor" } @@ -2263,14 +2426,12 @@ Module { Property { name: "__scrollBarFadeDelay"; type: "int" } Property { name: "__scrollBarFadeDuration"; type: "int" } Property { name: "__stickyScrollbars"; type: "bool" } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Controls/TextArea 1.3" - exports: ["QtQuick.Controls/TextArea 1.3"] - exportMetaObjectRevisions: [3] + name: "QtQuick.Controls/TextArea 1.0" + exports: ["QtQuick.Controls/TextArea 1.0"] + exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } @@ -2388,14 +2549,14 @@ Module { Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_2"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } Property { name: "horizontalScrollBarPolicy"; type: "int" } Property { name: "verticalScrollBarPolicy"; type: "int" } Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_28" + type: "ScrollViewHelper_QMLTYPE_31" isReadonly: true isPointer: true } @@ -2403,22 +2564,22 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Controls/TextArea 1.0" - exports: ["QtQuick.Controls/TextArea 1.0"] - exportMetaObjectRevisions: [0] + name: "QtQuick.Controls/TextArea 1.3" + exports: ["QtQuick.Controls/TextArea 1.3"] + exportMetaObjectRevisions: [3] isComposite: true defaultProperty: "data" Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } @@ -2536,14 +2697,14 @@ Module { Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_2"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } Property { name: "horizontalScrollBarPolicy"; type: "int" } Property { name: "verticalScrollBarPolicy"; type: "int" } Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_28" + type: "ScrollViewHelper_QMLTYPE_31" isReadonly: true isPointer: true } @@ -2551,13 +2712,13 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } @@ -2684,14 +2845,14 @@ Module { Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_2"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } Property { name: "horizontalScrollBarPolicy"; type: "int" } Property { name: "verticalScrollBarPolicy"; type: "int" } Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_28" + type: "ScrollViewHelper_QMLTYPE_31" isReadonly: true isPointer: true } @@ -2699,25 +2860,25 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/TextAreaStyle 1.1" exports: ["QtQuick.Controls.Styles/TextAreaStyle 1.1"] exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "TextArea_QMLTYPE_291"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "TextArea_QMLTYPE_295"; isReadonly: true; isPointer: true } Property { name: "font"; type: "QFont" } Property { name: "textColor"; type: "QColor" } Property { name: "selectionColor"; type: "QColor" } @@ -2745,8 +2906,6 @@ Module { Property { name: "__scrollBarFadeDelay"; type: "int" } Property { name: "__scrollBarFadeDuration"; type: "int" } Property { name: "__stickyScrollbars"; type: "bool" } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -2834,13 +2993,13 @@ Module { Property { name: "__styleData"; type: "QObject"; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/TextFieldStyle 1.0" exports: ["QtQuick.Controls.Styles/TextFieldStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "TextField_QMLTYPE_296"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "TextField_QMLTYPE_300"; isReadonly: true; isPointer: true } Property { name: "font"; type: "QFont" } Property { name: "textColor"; type: "QColor" } Property { name: "selectionColor"; type: "QColor" } @@ -2854,17 +3013,15 @@ Module { Property { name: "__selectionHandle"; type: "QQmlComponent"; isPointer: true } Property { name: "__cursorDelegate"; type: "QQmlComponent"; isPointer: true } Property { name: "__editMenu"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/ToggleButtonStyle 1.0" exports: ["QtQuick.Controls.Styles/ToggleButtonStyle 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Button_QMLTYPE_52"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "ToggleButton_QMLTYPE_303"; isReadonly: true; isPointer: true } Property { name: "inactiveGradient"; type: "QQuickGradient"; isPointer: true } Property { name: "checkedGradient"; type: "QQuickGradient"; isPointer: true } Property { name: "uncheckedGradient"; type: "QQuickGradient"; isPointer: true } @@ -2872,15 +3029,13 @@ Module { Property { name: "uncheckedDropShadowColor"; type: "QColor" } Property { name: "__buttonHelper" - type: "CircularButtonStyleHelper_QMLTYPE_79" + type: "CircularButtonStyleHelper_QMLTYPE_82" isReadonly: true isPointer: true } Property { name: "background"; type: "QQmlComponent"; isPointer: true } Property { name: "label"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -2897,7 +3052,7 @@ Module { Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/ToolBarStyle 1.0" exports: ["QtQuick.Controls.Styles/ToolBarStyle 1.0"] exportMetaObjectRevisions: [0] @@ -2907,8 +3062,6 @@ Module { Property { name: "menuButton"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } Property { name: "control"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { prototype: "QQuickFocusScope" @@ -2918,7 +3071,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_51"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } @@ -2946,9 +3099,9 @@ Module { } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Controls/TreeView 1.5" - exports: ["QtQuick.Controls/TreeView 1.5"] - exportMetaObjectRevisions: [5] + name: "QtQuick.Controls/TreeView 1.4" + exports: ["QtQuick.Controls/TreeView 1.4"] + exportMetaObjectRevisions: [4] isComposite: true defaultProperty: "__columns" Property { name: "model"; type: "QVariant" } @@ -3058,14 +3211,14 @@ Module { Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_2"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } Property { name: "horizontalScrollBarPolicy"; type: "int" } Property { name: "verticalScrollBarPolicy"; type: "int" } Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_28" + type: "ScrollViewHelper_QMLTYPE_31" isReadonly: true isPointer: true } @@ -3073,22 +3226,22 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Controls/TreeView 1.4" - exports: ["QtQuick.Controls/TreeView 1.4"] - exportMetaObjectRevisions: [4] + name: "QtQuick.Controls/TreeView 1.5" + exports: ["QtQuick.Controls/TreeView 1.5"] + exportMetaObjectRevisions: [5] isComposite: true defaultProperty: "__columns" Property { name: "model"; type: "QVariant" } @@ -3198,14 +3351,14 @@ Module { Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_2"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_3"; isPointer: true } Property { name: "horizontalScrollBarPolicy"; type: "int" } Property { name: "verticalScrollBarPolicy"; type: "int" } Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly: true; isPointer: true } Property { name: "__scroller" - type: "ScrollViewHelper_QMLTYPE_28" + type: "ScrollViewHelper_QMLTYPE_31" isReadonly: true isPointer: true } @@ -3213,25 +3366,25 @@ Module { Property { name: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_24" + type: "ScrollBar_QMLTYPE_27" isReadonly: true isPointer: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/TreeViewStyle 1.4" exports: ["QtQuick.Controls.Styles/TreeViewStyle 1.4"] exportMetaObjectRevisions: [4] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "TreeView_QMLTYPE_315"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "TreeView_QMLTYPE_321"; isReadonly: true; isPointer: true } Property { name: "indentation"; type: "int" } Property { name: "branchDelegate"; type: "QQmlComponent"; isPointer: true } Property { name: "textColor"; type: "QColor" } @@ -3260,17 +3413,15 @@ Module { Property { name: "__scrollBarFadeDelay"; type: "int" } Property { name: "__scrollBarFadeDuration"; type: "int" } Property { name: "__stickyScrollbars"; type: "bool" } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - prototype: "QObject" + prototype: "QQuickAbstractStyle1" name: "QtQuick.Controls.Styles/TumblerStyle 1.2" exports: ["QtQuick.Controls.Styles/TumblerStyle 1.2"] exportMetaObjectRevisions: [2] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "Tumbler_QMLTYPE_318"; isReadonly: true; isPointer: true } + Property { name: "control"; type: "Tumbler_QMLTYPE_324"; isReadonly: true; isPointer: true } Property { name: "spacing"; type: "double" } Property { name: "visibleItemCount"; type: "int" } Property { name: "__padding"; type: "double"; isReadonly: true } @@ -3284,7 +3435,5 @@ Module { Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "highlight"; type: "QQmlComponent"; isPointer: true } Property { name: "panel"; type: "QQmlComponent"; isPointer: true } - Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } } diff --git a/src/dialogs/DefaultFileDialog.qml b/src/dialogs/DefaultFileDialog.qml index da273fc9..077b5acd 100644 --- a/src/dialogs/DefaultFileDialog.qml +++ b/src/dialogs/DefaultFileDialog.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 as ControlsPrivate @@ -153,15 +154,17 @@ AbstractFileDialog { implicitHeight: Math.min(root.__maximumDimension, Screen.pixelDensity * 80) color: root.palette.window - Binding { + Qml.Binding { target: view.model property: "folder" value: root.folder + restoreMode: Binding.RestoreBinding } - Binding { + Qml.Binding { target: currentPathField property: "text" value: root.urlToPath(root.folder) + restoreMode: Binding.RestoreBinding } Keys.onPressed: { event.accepted = true diff --git a/src/dialogs/Private/plugins.qmltypes b/src/dialogs/Private/plugins.qmltypes index 3f9c8054..f508d501 100644 --- a/src/dialogs/Private/plugins.qmltypes +++ b/src/dialogs/Private/plugins.qmltypes @@ -9,6 +9,280 @@ import QtQuick.tooling 1.2 Module { dependencies: ["QtQuick 2.0"] Component { + name: "QAbstractItemModel" + prototype: "QObject" + Enum { + name: "LayoutChangeHint" + values: { + "NoLayoutChangeHint": 0, + "VerticalSortHint": 1, + "HorizontalSortHint": 2 + } + } + Enum { + name: "CheckIndexOption" + values: { + "NoOption": 0, + "IndexIsValid": 1, + "DoNotUseParent": 2, + "ParentIsInvalid": 4 + } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + Parameter { name: "roles"; type: "QVector<int>" } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + } + Signal { + name: "headerDataChanged" + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + } + Signal { name: "layoutChanged" } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + } + Signal { name: "layoutAboutToBeChanged" } + Signal { + name: "rowsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { name: "modelAboutToBeReset" } + Signal { name: "modelReset" } + Signal { + name: "rowsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationRow"; type: "int" } + } + Signal { + name: "rowsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "row"; type: "int" } + } + Signal { + name: "columnsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationColumn"; type: "int" } + } + Signal { + name: "columnsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "column"; type: "int" } + } + Method { name: "submit"; type: "bool" } + Method { name: "revert" } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "parent" + type: "QModelIndex" + Parameter { name: "child"; type: "QModelIndex" } + } + Method { + name: "sibling" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "idx"; type: "QModelIndex" } + } + Method { + name: "rowCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "rowCount"; type: "int" } + Method { + name: "columnCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "columnCount"; type: "int" } + Method { + name: "hasChildren" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "hasChildren"; type: "bool" } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + } + Method { + name: "fetchMore" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "canFetchMore" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "flags" + type: "Qt::ItemFlags" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + Parameter { name: "flags"; type: "Qt::MatchFlags" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + } + } + Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" } + Component { name: "QQuickFontListModel" prototype: "QAbstractListModel" exports: ["QtQuick.Dialogs.Private/FontListModel 1.1"] diff --git a/src/dialogs/plugins.qmltypes b/src/dialogs/plugins.qmltypes index 2a827fe0..e698dc6c 100644 --- a/src/dialogs/plugins.qmltypes +++ b/src/dialogs/plugins.qmltypes @@ -11,6 +11,7 @@ Module { "Qt.labs.folderlistmodel 2.1", "Qt.labs.settings 1.0", "QtGraphicalEffects 1.12", + "QtQml 2.14", "QtQml.Models 2.2", "QtQuick 2.9", "QtQuick.Controls 1.5", @@ -325,6 +326,11 @@ Module { Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } } Component { + name: "QQuickControlsPrivate1Attached" + prototype: "QObject" + Property { name: "window"; type: "QQuickWindow"; isReadonly: true; isPointer: true } + } + Component { name: "QQuickDialog1" defaultProperty: "contentItem" prototype: "QQuickAbstractDialog" @@ -403,7 +409,7 @@ Module { exportMetaObjectRevisions: [0] } Component { - prototype: "QObject" + prototype: "QQuickColorDialog" name: "QtQuick.Dialogs/ColorDialog 1.0" exports: ["QtQuick.Dialogs/ColorDialog 1.0"] exportMetaObjectRevisions: [0] @@ -411,76 +417,12 @@ Module { defaultProperty: "contentItem" Property { name: "__valueSet"; type: "bool" } Method { name: "__setControlsFromColor"; type: "QVariant" } - Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "showAlphaChannel"; type: "bool" } - Property { name: "color"; type: "QColor" } - Property { name: "currentColor"; type: "QColor" } - Property { name: "currentHue"; type: "double"; isReadonly: true } - Property { name: "currentSaturation"; type: "double"; isReadonly: true } - Property { name: "currentLightness"; type: "double"; isReadonly: true } - Property { name: "currentAlpha"; type: "double"; isReadonly: true } - Signal { name: "selectionAccepted" } - Method { - name: "setVisible" - Parameter { name: "v"; type: "bool" } - } - Method { - name: "setModality" - Parameter { name: "m"; type: "Qt::WindowModality" } - } - Method { - name: "setTitle" - Parameter { name: "t"; type: "string" } - } - Method { - name: "setColor" - Parameter { name: "arg"; type: "QColor" } - } - Method { - name: "setCurrentColor" - Parameter { name: "currentColor"; type: "QColor" } - } - Method { - name: "setShowAlphaChannel" - Parameter { name: "arg"; type: "bool" } - } - Property { name: "visible"; type: "bool" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "title"; type: "string" } - Property { name: "isWindow"; type: "bool"; isReadonly: true } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "__maximumDimension"; type: "int"; isReadonly: true } - Signal { name: "visibilityChanged" } - Signal { name: "geometryChanged" } - Signal { name: "accepted" } - Signal { name: "rejected" } - Method { name: "open" } - Method { name: "close" } - Method { - name: "setX" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setY" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } - } } Component { - prototype: "QObject" - name: "QtQuick.Dialogs/Dialog 1.3" - exports: ["QtQuick.Dialogs/Dialog 1.3"] - exportMetaObjectRevisions: [3] + prototype: "QQuickDialog1" + name: "QtQuick.Dialogs/Dialog 1.2" + exports: ["QtQuick.Dialogs/Dialog 1.2"] + exportMetaObjectRevisions: [2] isComposite: true defaultProperty: "data" Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } @@ -489,71 +431,12 @@ Module { Parameter { name: "action"; type: "QVariant" } } Method { name: "setupButtons"; type: "QVariant" } - Property { name: "title"; type: "string" } - Property { name: "standardButtons"; type: "QQuickAbstractDialog::StandardButtons" } - Property { - name: "clickedButton" - type: "QQuickAbstractDialog::StandardButton" - isReadonly: true - } - Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Signal { name: "buttonClicked" } - Signal { name: "discard" } - Signal { name: "help" } - Signal { name: "yes" } - Signal { name: "no" } - Signal { name: "apply" } - Signal { name: "reset" } - Method { - name: "setTitle" - Parameter { name: "arg"; type: "string" } - } - Method { - name: "setStandardButtons" - Parameter { name: "buttons"; type: "StandardButtons" } - } - Method { - name: "click" - Parameter { name: "button"; type: "QQuickAbstractDialog::StandardButton" } - } - Method { name: "__standardButtonsLeftModel"; type: "QJSValue" } - Method { name: "__standardButtonsRightModel"; type: "QJSValue" } - Property { name: "visible"; type: "bool" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "isWindow"; type: "bool"; isReadonly: true } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "__maximumDimension"; type: "int"; isReadonly: true } - Signal { name: "visibilityChanged" } - Signal { name: "geometryChanged" } - Signal { name: "accepted" } - Signal { name: "rejected" } - Method { name: "open" } - Method { name: "close" } - Method { - name: "setX" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setY" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } - } } Component { - prototype: "QObject" - name: "QtQuick.Dialogs/Dialog 1.2" - exports: ["QtQuick.Dialogs/Dialog 1.2"] - exportMetaObjectRevisions: [2] + prototype: "QQuickDialog1" + name: "QtQuick.Dialogs/Dialog 1.3" + exports: ["QtQuick.Dialogs/Dialog 1.3"] + exportMetaObjectRevisions: [3] isComposite: true defaultProperty: "data" Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } @@ -562,68 +445,9 @@ Module { Parameter { name: "action"; type: "QVariant" } } Method { name: "setupButtons"; type: "QVariant" } - Property { name: "title"; type: "string" } - Property { name: "standardButtons"; type: "QQuickAbstractDialog::StandardButtons" } - Property { - name: "clickedButton" - type: "QQuickAbstractDialog::StandardButton" - isReadonly: true - } - Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Signal { name: "buttonClicked" } - Signal { name: "discard" } - Signal { name: "help" } - Signal { name: "yes" } - Signal { name: "no" } - Signal { name: "apply" } - Signal { name: "reset" } - Method { - name: "setTitle" - Parameter { name: "arg"; type: "string" } - } - Method { - name: "setStandardButtons" - Parameter { name: "buttons"; type: "StandardButtons" } - } - Method { - name: "click" - Parameter { name: "button"; type: "QQuickAbstractDialog::StandardButton" } - } - Method { name: "__standardButtonsLeftModel"; type: "QJSValue" } - Method { name: "__standardButtonsRightModel"; type: "QJSValue" } - Property { name: "visible"; type: "bool" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "isWindow"; type: "bool"; isReadonly: true } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "__maximumDimension"; type: "int"; isReadonly: true } - Signal { name: "visibilityChanged" } - Signal { name: "geometryChanged" } - Signal { name: "accepted" } - Signal { name: "rejected" } - Method { name: "open" } - Method { name: "close" } - Method { - name: "setX" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setY" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } - } } Component { - prototype: "QObject" + prototype: "QQuickFileDialog" name: "QtQuick.Dialogs/FileDialog 1.0" exports: ["QtQuick.Dialogs/FileDialog 1.0"] exportMetaObjectRevisions: [0] @@ -642,108 +466,9 @@ Module { } Method { name: "dirUp"; type: "QVariant" } Method { name: "acceptSelection"; type: "QVariant" } - Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Method { name: "clearSelection" } - Method { - name: "addSelection" - type: "bool" - Parameter { name: "path"; type: "QUrl" } - } - Property { name: "selectExisting"; type: "bool" } - Property { name: "selectMultiple"; type: "bool" } - Property { name: "selectFolder"; type: "bool" } - Property { name: "folder"; type: "QUrl" } - Property { name: "nameFilters"; type: "QStringList" } - Property { name: "selectedNameFilter"; type: "string" } - Property { name: "selectedNameFilterExtensions"; type: "QStringList"; isReadonly: true } - Property { name: "selectedNameFilterIndex"; type: "int" } - Property { name: "fileUrl"; type: "QUrl"; isReadonly: true } - Property { name: "fileUrls"; type: "QList<QUrl>"; isReadonly: true } - Property { name: "sidebarVisible"; type: "bool" } - Property { name: "defaultSuffix"; type: "string" } - Property { name: "shortcuts"; type: "QJSValue"; isReadonly: true } - Property { name: "__shortcuts"; type: "QJSValue"; isReadonly: true } - Signal { name: "filterSelected" } - Signal { name: "fileModeChanged" } - Signal { name: "selectionAccepted" } - Method { - name: "setVisible" - Parameter { name: "v"; type: "bool" } - } - Method { - name: "setTitle" - Parameter { name: "t"; type: "string" } - } - Method { - name: "setSelectExisting" - Parameter { name: "s"; type: "bool" } - } - Method { - name: "setSelectMultiple" - Parameter { name: "s"; type: "bool" } - } - Method { - name: "setSelectFolder" - Parameter { name: "s"; type: "bool" } - } - Method { - name: "setFolder" - Parameter { name: "f"; type: "QUrl" } - } - Method { - name: "setNameFilters" - Parameter { name: "f"; type: "QStringList" } - } - Method { - name: "selectNameFilter" - Parameter { name: "f"; type: "string" } - } - Method { - name: "setSelectedNameFilterIndex" - Parameter { name: "idx"; type: "int" } - } - Method { - name: "setSidebarVisible" - Parameter { name: "s"; type: "bool" } - } - Method { - name: "setDefaultSuffix" - Parameter { name: "suffix"; type: "string" } - } - Property { name: "visible"; type: "bool" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "title"; type: "string" } - Property { name: "isWindow"; type: "bool"; isReadonly: true } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "__maximumDimension"; type: "int"; isReadonly: true } - Signal { name: "visibilityChanged" } - Signal { name: "geometryChanged" } - Signal { name: "accepted" } - Signal { name: "rejected" } - Method { name: "open" } - Method { name: "close" } - Method { - name: "setX" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setY" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } - } } Component { - prototype: "QObject" + prototype: "QQuickFontDialog" name: "QtQuick.Dialogs/FontDialog 1.1" exports: ["QtQuick.Dialogs/FontDialog 1.1"] exportMetaObjectRevisions: [1] @@ -751,169 +476,14 @@ Module { defaultProperty: "contentItem" Property { name: "font"; type: "QFont" } Property { name: "currentFont"; type: "QFont" } - Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "scalableFonts"; type: "bool" } - Property { name: "nonScalableFonts"; type: "bool" } - Property { name: "monospacedFonts"; type: "bool" } - Property { name: "proportionalFonts"; type: "bool" } - Signal { name: "selectionAccepted" } - Method { - name: "setVisible" - Parameter { name: "v"; type: "bool" } - } - Method { - name: "setModality" - Parameter { name: "m"; type: "Qt::WindowModality" } - } - Method { - name: "setTitle" - Parameter { name: "t"; type: "string" } - } - Method { - name: "setFont" - Parameter { name: "arg"; type: "QFont" } - } - Method { - name: "setCurrentFont" - Parameter { name: "arg"; type: "QFont" } - } - Method { - name: "setScalableFonts" - Parameter { name: "arg"; type: "bool" } - } - Method { - name: "setNonScalableFonts" - Parameter { name: "arg"; type: "bool" } - } - Method { - name: "setMonospacedFonts" - Parameter { name: "arg"; type: "bool" } - } - Method { - name: "setProportionalFonts" - Parameter { name: "arg"; type: "bool" } - } - Property { name: "visible"; type: "bool" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "title"; type: "string" } - Property { name: "isWindow"; type: "bool"; isReadonly: true } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "__maximumDimension"; type: "int"; isReadonly: true } - Signal { name: "visibilityChanged" } - Signal { name: "geometryChanged" } - Signal { name: "accepted" } - Signal { name: "rejected" } - Method { name: "open" } - Method { name: "close" } - Method { - name: "setX" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setY" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } - } } Component { - prototype: "QObject" + prototype: "QQuickMessageDialog" name: "QtQuick.Dialogs/MessageDialog 1.1" exports: ["QtQuick.Dialogs/MessageDialog 1.1"] exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "contentItem" Method { name: "calculateImplicitWidth"; type: "QVariant" } - Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "text"; type: "string" } - Property { name: "informativeText"; type: "string" } - Property { name: "detailedText"; type: "string" } - Property { name: "icon"; type: "Icon" } - Property { name: "standardIconSource"; type: "QUrl"; isReadonly: true } - Property { name: "standardButtons"; type: "QQuickAbstractDialog::StandardButtons" } - Property { - name: "clickedButton" - type: "QQuickAbstractDialog::StandardButton" - isReadonly: true - } - Signal { name: "buttonClicked" } - Signal { name: "discard" } - Signal { name: "help" } - Signal { name: "yes" } - Signal { name: "no" } - Signal { name: "apply" } - Signal { name: "reset" } - Method { - name: "setVisible" - Parameter { name: "v"; type: "bool" } - } - Method { - name: "setTitle" - Parameter { name: "arg"; type: "string" } - } - Method { - name: "setText" - Parameter { name: "arg"; type: "string" } - } - Method { - name: "setInformativeText" - Parameter { name: "arg"; type: "string" } - } - Method { - name: "setDetailedText" - Parameter { name: "arg"; type: "string" } - } - Method { - name: "setIcon" - Parameter { name: "icon"; type: "Icon" } - } - Method { - name: "setStandardButtons" - Parameter { name: "buttons"; type: "StandardButtons" } - } - Method { - name: "click" - Parameter { name: "button"; type: "QQuickAbstractDialog::StandardButton" } - } - Property { name: "visible"; type: "bool" } - Property { name: "modality"; type: "Qt::WindowModality" } - Property { name: "title"; type: "string" } - Property { name: "isWindow"; type: "bool"; isReadonly: true } - Property { name: "x"; type: "int" } - Property { name: "y"; type: "int" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "__maximumDimension"; type: "int"; isReadonly: true } - Signal { name: "visibilityChanged" } - Signal { name: "geometryChanged" } - Signal { name: "accepted" } - Signal { name: "rejected" } - Method { name: "open" } - Method { name: "close" } - Method { - name: "setX" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setY" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setWidth" - Parameter { name: "arg"; type: "int" } - } - Method { - name: "setHeight" - Parameter { name: "arg"; type: "int" } - } } } diff --git a/src/extras/DelayButton.qml b/src/extras/DelayButton.qml index 6bace4ed..9a0c3a25 100644 --- a/src/extras/DelayButton.qml +++ b/src/extras/DelayButton.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 @@ -112,11 +113,12 @@ Button { } } - Binding { + Qml.Binding { // Force checkable to false to get full control over the checked -property target: root property: "checkable" value: false + restoreMode: Binding.RestoreBinding } onProgressChanged: { diff --git a/src/extras/Styles/Flat/ApplicationWindowStyle.qml b/src/extras/Styles/Flat/ApplicationWindowStyle.qml index f4fbd24a..222c9f7c 100644 --- a/src/extras/Styles/Flat/ApplicationWindowStyle.qml +++ b/src/extras/Styles/Flat/ApplicationWindowStyle.qml @@ -36,7 +36,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.14 import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 as Base import QtQuick.Controls.Styles.Flat 1.0 @@ -103,12 +103,13 @@ Base.ApplicationWindowStyle { items: control.menuBar ? control.menuBar.menus : [] } - Binding { + Qml.Binding { target: control.toolBar property: "__menu" value: proxyMenu.items.length > 1 ? proxyMenu : proxyMenu.items.length === 1 ? proxyMenu.items[0] : null when: hasToolBar + restoreMode: Binding.RestoreBinding } } } diff --git a/src/extras/Styles/Flat/GroupBoxStyle.qml b/src/extras/Styles/Flat/GroupBoxStyle.qml index c932262b..797086a2 100644 --- a/src/extras/Styles/Flat/GroupBoxStyle.qml +++ b/src/extras/Styles/Flat/GroupBoxStyle.qml @@ -36,6 +36,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls.Private 1.0 as Private import QtQuick.Controls.Styles.Flat 1.0 @@ -67,10 +69,11 @@ Private.GroupBoxStyle { } // TODO: - Binding { + Qml.Binding { target: root.padding property: "top" value: background.anchors.topMargin + root.spacing + restoreMode: Binding.RestoreBinding } CheckBoxDrawer { diff --git a/src/extras/Tumbler.qml b/src/extras/Tumbler.qml index 299ac83e..a6208708 100644 --- a/src/extras/Tumbler.qml +++ b/src/extras/Tumbler.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 @@ -330,10 +331,11 @@ Control { visible: columnObject.visible clip: true - Binding { + Qml.Binding { target: columnObject property: "__currentIndex" value: columnPathView.currentIndex + restoreMode: Binding.RestoreBinding } // We add one here so that the delegate's don't just appear in the view instantly, diff --git a/src/extras/plugins.qmltypes b/src/extras/plugins.qmltypes index 6749e548..8bb14246 100644 --- a/src/extras/plugins.qmltypes +++ b/src/extras/plugins.qmltypes @@ -9,6 +9,7 @@ import QtQuick.tooling 1.2 Module { dependencies: [ "QtGraphicalEffects 1.12", + "QtQml 2.14", "QtQml.Models 2.2", "QtQuick 2.9", "QtQuick.Controls 1.5", @@ -75,6 +76,11 @@ Module { Method { name: "redraw" } } Component { + name: "QQuickControlsPrivate1Attached" + prototype: "QObject" + Property { name: "window"; type: "QQuickWindow"; isReadonly: true; isPointer: true } + } + Component { name: "QQuickFlatProgressBar" defaultProperty: "data" prototype: "QQuickPaintedItem" @@ -210,7 +216,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_28"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } @@ -346,7 +352,7 @@ Module { Property { name: "progress"; type: "double"; isReadonly: true } Signal { name: "activated" } Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_28"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } @@ -493,15 +499,15 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "PieMenu_QMLTYPE_84"; isPointer: true } + Property { name: "control"; type: "PieMenu_QMLTYPE_87"; isPointer: true } Property { name: "styleData"; type: "QObject"; isPointer: true } Property { name: "iconSource"; type: "string"; isReadonly: true } } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras/StatusIndicator 1.1" - exports: ["QtQuick.Extras/StatusIndicator 1.1"] - exportMetaObjectRevisions: [1] + name: "QtQuick.Extras/StatusIndicator 1.0" + exports: ["QtQuick.Extras/StatusIndicator 1.0"] + exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" Property { name: "active"; type: "bool" } @@ -515,9 +521,9 @@ Module { } Component { prototype: "QQuickFocusScope" - name: "QtQuick.Extras/StatusIndicator 1.0" - exports: ["QtQuick.Extras/StatusIndicator 1.0"] - exportMetaObjectRevisions: [0] + name: "QtQuick.Extras/StatusIndicator 1.1" + exports: ["QtQuick.Extras/StatusIndicator 1.1"] + exportMetaObjectRevisions: [1] isComposite: true defaultProperty: "data" Property { name: "active"; type: "bool" } @@ -547,7 +553,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_28"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } diff --git a/tests/auto/controls/BLACKLIST b/tests/auto/controls/BLACKLIST new file mode 100644 index 00000000..ddf33812 --- /dev/null +++ b/tests/auto/controls/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-79161 +[Tests_TableView::test_headervisible] +macos diff --git a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml index 59127155..7c9ebeac 100644 --- a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml +++ b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml @@ -48,6 +48,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 @@ -75,15 +76,17 @@ Row { checked: textinput.font.underline } } - Binding { + Qml.Binding { target: textinput property: "font.bold" value: bold.checked + restoreMode: Binding.RestoreBinding } - Binding { + Qml.Binding { target: textinput property: "font.underline" value: underline.checked + restoreMode: Binding.RestoreBinding } ToolButton { id: _tb1 diff --git a/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp b/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp index 5c8d1ef8..c3e77cf9 100644 --- a/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp +++ b/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp @@ -1336,8 +1336,8 @@ void tst_QQuickTreeModelAdaptor::reparentOnSameRow() // at least DepthRole and ModeIndexRole changes should have happened for the affected row bool depthChanged = false; bool modelIndexChanged = false; - QList<QList<QVariant> > &changes = dataChangedSpy; - foreach (QList<QVariant> change, changes) { + const QList<QList<QVariant> > &changes = dataChangedSpy; + for (const QList<QVariant> &change : changes) { if (change.at(0) == movedIndex) { if (change.at(2).value<QVector<int> >().contains(QQuickTreeModelAdaptor1::DepthRole)) depthChanged = true; @@ -1461,7 +1461,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange() QCOMPARE(sel.count(), 2); // We don't know in which order the selection ranges are // being added, so we iterate and try to find what we expect. - foreach (const QItemSelectionRange &range, sel) { + for (const QItemSelectionRange &range : sel) { if (range.topLeft() == model.index(0, 0)) QCOMPARE(QModelIndex(range.bottomRight()), model.index(0, 0)); else if (range.topLeft() == model.index(0, 0, parent)) @@ -1478,7 +1478,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange() QCOMPARE(sel.count(), 2); // We don't know in which order the selection ranges are // being added, so we iterate and try to find what we expect. - foreach (const QItemSelectionRange &range, sel) { + for (const QItemSelectionRange &range : sel) { if (range.topLeft() == model.index(0, 0)) QCOMPARE(QModelIndex(range.bottomRight()), model.index(4, 0)); else if (range.topLeft() == model.index(0, 0, parent)) @@ -1499,7 +1499,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange() QCOMPARE(sel.count(), 3); // We don't know in which order the selection ranges are // being added, so we iterate and try to find what we expect. - foreach (const QItemSelectionRange &range, sel) { + for (const QItemSelectionRange &range : sel) { if (range.topLeft() == model.index(0, 0)) QCOMPARE(QModelIndex(range.bottomRight()), model.index(4, 0)); else if (range.topLeft() == model.index(0, 0, parent)) @@ -1522,7 +1522,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange() QCOMPARE(sel.count(), 3); // We don't know in which order the selection ranges are // being added, so we iterate and try to find what we expect. - foreach (const QItemSelectionRange &range, sel) { + for (const QItemSelectionRange &range : sel) { if (range.topLeft() == model.index(0, 0)) QCOMPARE(QModelIndex(range.bottomRight()), model.index(0, 0)); else if (range.topLeft() == model.index(0, 0, parent)) @@ -1541,7 +1541,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange() QCOMPARE(sel.count(), 4); // We don't know in which order the selection ranges are // being added, so we iterate and try to find what we expect. - foreach (const QItemSelectionRange &range, sel) { + for (const QItemSelectionRange &range : sel) { if (range.topLeft() == model.index(0, 0)) QCOMPARE(QModelIndex(range.bottomRight()), model.index(ModelRowCount - 1, 0)); else if (range.topLeft() == model.index(0, 0, parent)) @@ -1562,7 +1562,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange() QCOMPARE(sel.count(), 4); // We don't know in which order the selection ranges are // being added, so we iterate and try to find what we expect. - foreach (const QItemSelectionRange &range, sel) { + for (const QItemSelectionRange &range : sel) { if (range.topLeft() == model.index(1, 0)) QCOMPARE(QModelIndex(range.bottomRight()), model.index(1, 0)); else if (range.topLeft() == model.index(1, 0, parent)) diff --git a/tests/auto/shared/testmodel.h b/tests/auto/shared/testmodel.h index 6eaab74a..b1d9308e 100644 --- a/tests/auto/shared/testmodel.h +++ b/tests/auto/shared/testmodel.h @@ -289,8 +289,7 @@ public: ~Node() { - foreach (Node *n, children) - delete n; + qDeleteAll(children); } void addRows(int row, int count) diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp index c5797160..996b4b66 100644 --- a/tests/benchmarks/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/objectcount/tst_objectcount.cpp @@ -83,7 +83,7 @@ static void printItems(const QList<QQuickItem *> &items) std::cout << " QQuickItems: " << items.count() << " (total of QObjects: " << qt_qobjects->count() << ")" << std::endl; if (qt_verbose) { - foreach (QObject *object, *qt_qobjects) + for (QObject *object : qAsConst(*qt_qobjects)) qInfo() << "\t" << object; } } @@ -101,7 +101,7 @@ void tst_ObjectCount::controls() QVERIFY2(object.data(), qPrintable(component.errorString())); QList<QQuickItem *> items; - foreach (QObject *object, *qt_qobjects()) { + for (QObject *object : qAsConst(*qt_qobjects)) { QQuickItem *item = qobject_cast<QQuickItem *>(object); if (item) items += item; |