From 70cb1e525c8dd790e9e1f8f2192ecdb2667ac2a1 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Mon, 8 Dec 2014 16:56:51 +0100 Subject: Update plugins.qmltypes Change-Id: I8e208f58f33a83067fb2083e21fbed1060105223 Reviewed-by: Kai Koehne Reviewed-by: J-P Nurmi Reviewed-by: Shawn Rutledge --- src/controls/controls.pro | 2 +- src/controls/plugins.qmltypes | 260 +++++++++++++++++++++++++++++------------- src/dialogs/dialogs.pro | 2 +- src/dialogs/plugins.qmltypes | 16 +++ 4 files changed, 200 insertions(+), 80 deletions(-) diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 8416051d..78edc913 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -1,6 +1,6 @@ TARGET = qtquickcontrolsplugin TARGETPATH = QtQuick/Controls -IMPORT_VERSION = 1.2 +IMPORT_VERSION = 1.3 QT += qml quick quick-private qml-private gui-private core-private diff --git a/src/controls/plugins.qmltypes b/src/controls/plugins.qmltypes index d1a56b89..616951f0 100644 --- a/src/controls/plugins.qmltypes +++ b/src/controls/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.1 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Controls 1.2' +// 'qmlplugindump -nonrelocatable QtQuick.Controls 1.3' Module { Component { @@ -104,6 +104,7 @@ Module { Property { name: "dpiScaleFactor"; type: "double"; isReadonly: true } Property { name: "dragThreshold"; type: "double"; isReadonly: true } Property { name: "hasTouchScreen"; type: "bool"; isReadonly: true } + Property { name: "isMobile"; type: "bool"; isReadonly: true } } Component { name: "QQuickExclusiveGroup" @@ -128,6 +129,13 @@ Module { prototype: "QQuickMenuText" exports: ["QtQuick.Controls.Private/MenuPrivate 1.0"] exportMetaObjectRevisions: [0] + Enum { + name: "MenuType" + values: { + "DefaultMenu": 0, + "EditMenu": 1 + } + } Property { name: "title"; type: "string" } Property { name: "items"; type: "QObject"; isList: true; isReadonly: true } Property { name: "__selectedIndex"; type: "int" } @@ -174,14 +182,18 @@ Module { Method { name: "clear" } Method { name: "__popup" - Parameter { name: "x"; type: "double" } - Parameter { name: "y"; type: "double" } - Parameter { name: "atActionIndex"; type: "int" } + 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: "x"; type: "double" } - Parameter { name: "y"; type: "double" } + Parameter { name: "targetRect"; type: "QRectF" } } } Component { @@ -193,7 +205,8 @@ Module { Property { name: "menus"; type: "QQuickMenu"; isList: true; isReadonly: true } Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true } Property { name: "__parentWindow"; type: "QQuickWindow"; isPointer: true } - Property { name: "__isNative"; type: "bool"; isReadonly: true } + Property { name: "__isNative"; type: "bool" } + Signal { name: "nativeChanged" } Signal { name: "contentItemChanged" } } Component { @@ -259,6 +272,8 @@ Module { Component { name: "QQuickPadding" prototype: "QObject" + exports: ["QtQuick.Controls.Private/Padding 1.0"] + exportMetaObjectRevisions: [0] Property { name: "left"; type: "int" } Property { name: "top"; type: "int" } Property { name: "right"; type: "int" } @@ -348,6 +363,8 @@ Module { name: "setPosition" Parameter { name: "position"; type: "double" } } + Method { name: "increaseSingleStep" } + Method { name: "decreaseSingleStep" } Method { name: "valueForPosition" type: "double" @@ -665,6 +682,7 @@ Module { } Signal { name: "windowTitleChanged" + revision: 2 Parameter { name: "title"; type: "string" } } Signal { @@ -778,48 +796,6 @@ Module { Parameter { name: "msec"; type: "int" } } } - Component { - name: "QQuickWindow" - defaultProperty: "data" - prototype: "QWindow" - exports: ["QtQuick.Window/Window 2.0"] - exportMetaObjectRevisions: [0] - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "color"; type: "QColor" } - Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { - name: "activeFocusItem" - revision: 1 - type: "QQuickItem" - isReadonly: true - isPointer: true - } - Signal { name: "frameSwapped" } - Signal { name: "sceneGraphInitialized" } - Signal { name: "sceneGraphInvalidated" } - Signal { name: "beforeSynchronizing" } - Signal { name: "beforeRendering" } - Signal { name: "afterRendering" } - Signal { - name: "closing" - revision: 1 - Parameter { name: "close"; type: "QQuickCloseEvent"; isPointer: true } - } - Signal { - name: "colorChanged" - Parameter { type: "QColor" } - } - Signal { name: "activeFocusItemChanged"; revision: 1 } - Method { name: "update" } - Method { name: "releaseResources" } - } - Component { - name: "QQuickWindowQmlImpl" - defaultProperty: "data" - prototype: "QQuickWindow" - exports: ["QtQuick.Window/Window 2.1"] - exportMetaObjectRevisions: [0] - } Component { name: "QWindow" prototype: "QObject" @@ -862,6 +838,11 @@ Module { name: "windowStateChanged" Parameter { name: "windowState"; type: "Qt::WindowState" } } + Signal { + name: "windowTitleChanged" + revision: 2 + Parameter { name: "title"; type: "string" } + } Signal { name: "xChanged" Parameter { name: "arg"; type: "int" } @@ -973,6 +954,61 @@ Module { Parameter { name: "msec"; type: "int" } } } + Component { + name: "QQuickWindow" + defaultProperty: "data" + prototype: "QWindow" + exports: ["QtQuick.Window/Window 2.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "SceneGraphError" + values: { + "ContextNotAvailable": 1 + } + } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "color"; type: "QColor" } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { + name: "activeFocusItem" + revision: 1 + type: "QQuickItem" + isReadonly: true + isPointer: true + } + Signal { name: "frameSwapped" } + Signal { + name: "openglContextCreated" + revision: 2 + Parameter { name: "context"; type: "QOpenGLContext"; isPointer: true } + } + Signal { name: "sceneGraphInitialized" } + Signal { name: "sceneGraphInvalidated" } + Signal { name: "beforeSynchronizing" } + Signal { name: "afterSynchronizing"; revision: 2 } + Signal { name: "beforeRendering" } + Signal { name: "afterRendering" } + Signal { name: "afterAnimating"; revision: 2 } + Signal { name: "sceneGraphAboutToStop"; revision: 2 } + Signal { + name: "closing" + revision: 1 + Parameter { name: "close"; type: "QQuickCloseEvent"; isPointer: true } + } + Signal { + name: "colorChanged" + Parameter { type: "QColor" } + } + Signal { name: "activeFocusItemChanged"; revision: 1 } + Signal { + name: "sceneGraphError" + revision: 2 + Parameter { name: "error"; type: "QQuickWindow::SceneGraphError" } + Parameter { name: "message"; type: "string" } + } + Method { name: "update" } + Method { name: "releaseResources" } + } Component { prototype: "QQuickWindow" name: "QtQuick.Controls/ApplicationWindow" @@ -980,14 +1016,22 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "menuBar"; type: "MenuBar_QMLTYPE_1"; isPointer: true } + Property { name: "menuBar"; type: "MenuBar_QMLTYPE_3"; isPointer: true } Property { name: "toolBar"; type: "QQuickItem"; isPointer: true } Property { name: "statusBar"; type: "QQuickItem"; isPointer: true } + Property { name: "style"; type: "QQmlComponent"; isPointer: true } Property { name: "__topBottomMargins"; type: "double" } Property { name: "__qwindowsize_max"; type: "double"; isReadonly: true } Property { name: "__width"; type: "double" } Property { name: "__height"; type: "double" } - Property { name: "contentItem"; type: "ContentItem_QMLTYPE_9"; isReadonly: true; isPointer: true } + Property { + name: "contentItem" + type: "ContentItem_QMLTYPE_11" + 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 } Property { name: "visible"; type: "bool" } Property { name: "visibility"; type: "Visibility" } @@ -1066,6 +1110,7 @@ Module { } Signal { name: "windowTitleChanged" + revision: 2 Parameter { name: "title"; type: "string" } } Signal { @@ -1191,7 +1236,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_43"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_49"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } @@ -1228,6 +1273,7 @@ Module { Property { name: "visibleYear"; type: "int" } Property { name: "frameVisible"; type: "bool" } Property { name: "weekNumbersVisible"; type: "bool" } + Property { name: "navigationBarVisible"; type: "bool" } Property { name: "dayOfWeekFormat"; type: "int" } Property { name: "__model"; type: "QQuickCalendarModel"; isPointer: true } Property { name: "__locale"; type: "QVariant" } @@ -1254,6 +1300,10 @@ Module { name: "doubleClicked" Parameter { name: "date"; type: "QDateTime" } } + Signal { + name: "pressAndHold" + Parameter { name: "date"; type: "QDateTime" } + } Method { name: "showPreviousMonth"; type: "QVariant" } Method { name: "showNextMonth"; type: "QVariant" } Method { name: "showPreviousYear"; type: "QVariant" } @@ -1309,12 +1359,15 @@ Module { Property { name: "editable"; type: "bool" } Property { name: "activeFocusOnPress"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } Property { name: "__popup"; type: "QVariant" } Property { name: "model"; type: "QVariant" } Property { name: "currentIndex"; type: "int" } Property { name: "currentText"; type: "string"; isReadonly: true } Property { name: "editText"; type: "string" } - Property { name: "hovered"; type: "bool"; isReadonly: true } Property { name: "count"; type: "int"; isReadonly: true } Property { name: "validator"; type: "QValidator"; isPointer: true } Property { name: "acceptableInput"; type: "bool"; isReadonly: true } @@ -1356,7 +1409,7 @@ 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_69"; isReadonly: true; isPointer: true } + Property { name: "__checkbox"; type: "CheckBox_QMLTYPE_75"; isReadonly: true; isPointer: true } Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } } Component { @@ -1431,14 +1484,18 @@ Module { Method { name: "clear" } Method { name: "__popup" - Parameter { name: "x"; type: "double" } - Parameter { name: "y"; type: "double" } - Parameter { name: "atActionIndex"; type: "int" } + 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: "x"; type: "double" } - Parameter { name: "y"; type: "double" } + Parameter { name: "targetRect"; type: "QRectF" } } Property { name: "enabled"; type: "bool" } Property { name: "iconSource"; type: "QUrl" } @@ -1459,11 +1516,13 @@ Module { isComposite: true defaultProperty: "menus" 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: "QQuickMenu"; isList: true; isReadonly: true } Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true } Property { name: "__parentWindow"; type: "QQuickWindow"; isPointer: true } - Property { name: "__isNative"; type: "bool"; isReadonly: true } + Property { name: "__isNative"; type: "bool" } + Signal { name: "nativeChanged" } Signal { name: "contentItemChanged" } } Component { @@ -1526,19 +1585,21 @@ Module { Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_0"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_2"; 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: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_17" + type: "ScrollBar_QMLTYPE_25" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_17" + type: "ScrollBar_QMLTYPE_25" isReadonly: true isPointer: true } @@ -1562,6 +1623,8 @@ Module { Property { name: "hovered"; type: "bool"; isReadonly: true } Property { name: "stepSize"; type: "double" } Property { name: "value"; type: "double" } + Method { name: "accessibleIncreaseAction"; type: "QVariant" } + Method { name: "accessibleDecreaseAction"; type: "QVariant" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } Property { name: "__style"; type: "QObject"; isPointer: true } Property { name: "__panel"; type: "QQuickItem"; isPointer: true } @@ -1577,6 +1640,10 @@ Module { defaultProperty: "data" Property { name: "activeFocusOnPress"; type: "bool" } Property { name: "horizontalAlignment"; type: "int" } + Property { name: "hovered"; type: "bool"; isReadonly: true } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } Property { name: "value"; type: "double" } Property { name: "minimumValue"; type: "double" } Property { name: "maximumValue"; type: "double" } @@ -1585,7 +1652,6 @@ Module { Property { name: "prefix"; type: "string" } Property { name: "decimals"; type: "int" } Property { name: "font"; type: "QFont" } - Property { name: "hovered"; type: "bool"; isReadonly: true } Property { name: "__text"; type: "string" } Property { name: "__baselineOffset"; type: "double" } Signal { name: "editingFinished" } @@ -1610,16 +1676,21 @@ Module { Property { name: "__contents"; type: "QObject"; isList: true; isReadonly: true } Property { name: "__items"; type: "QQuickItem"; isList: true; isReadonly: true } Property { name: "__handles"; type: "QQuickItem"; isList: true; isReadonly: true } + Method { + name: "addItem" + type: "QVariant" + Parameter { name: "item"; type: "QVariant" } + } } Component { - prototype: "QQuickItem" + prototype: "QQuickFocusScope" name: "QtQuick.Controls/StackView" exports: ["QtQuick.Controls/StackView 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" Property { name: "busy"; type: "bool"; isReadonly: true } - Property { name: "delegate"; type: "StackViewDelegate_QMLTYPE_153"; isPointer: true } + Property { name: "delegate"; type: "StackViewDelegate_QMLTYPE_167"; isPointer: true } Property { name: "__currentItem"; type: "QQuickItem"; isPointer: true } Property { name: "__depth"; type: "int" } Property { name: "__guard"; type: "bool" } @@ -1733,6 +1804,7 @@ Module { isComposite: true defaultProperty: "__content" Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } @@ -1747,6 +1819,8 @@ Module { Property { name: "checked"; type: "bool" } Property { name: "activeFocusOnPress"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } + Property { name: "pressed"; type: "bool"; isReadonly: true } + Signal { name: "clicked" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } Property { name: "__style"; type: "QObject"; isPointer: true } Property { name: "__panel"; type: "QQuickItem"; isPointer: true } @@ -1772,13 +1846,14 @@ Module { isComposite: true defaultProperty: "data" Property { name: "currentIndex"; type: "int" } - Property { name: "count"; type: "int" } + Property { name: "count"; type: "int"; isReadonly: true } Property { name: "frameVisible"; type: "bool" } Property { name: "tabsVisible"; type: "bool" } Property { name: "tabPosition"; type: "int" } Property { name: "__tabs"; type: "QQmlListModel"; isPointer: true } Property { name: "style"; type: "QQmlComponent"; isPointer: true } Property { name: "__styleItem"; type: "QVariant" } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } Method { name: "addTab" @@ -1809,6 +1884,16 @@ Module { type: "QVariant" Parameter { name: "index"; type: "QVariant" } } + Method { + name: "__willRemoveIndex" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } + Method { + name: "__didInsertIndex" + type: "QVariant" + Parameter { name: "index"; type: "QVariant" } + } Method { name: "__setOpacities"; type: "QVariant" } } Component { @@ -1841,7 +1926,7 @@ Module { Property { name: "__listView"; type: "QQuickListView"; isReadonly: true; isPointer: true } Property { name: "selection" - type: "TableViewSelection_QMLTYPE_183" + type: "TableViewSelection_QMLTYPE_196" isReadonly: true isPointer: true } @@ -1857,6 +1942,10 @@ Module { name: "doubleClicked" Parameter { name: "row"; type: "int" } } + Signal { + name: "pressAndHold" + Parameter { name: "row"; type: "int" } + } Method { name: "positionViewAtRow" type: "QVariant" @@ -1906,19 +1995,21 @@ Module { Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_0"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_2"; 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: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_17" + type: "ScrollBar_QMLTYPE_25" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_17" + type: "ScrollBar_QMLTYPE_25" isReadonly: true isPointer: true } @@ -1945,11 +2036,14 @@ Module { Component { prototype: "QQuickFocusScope" name: "QtQuick.Controls/TextArea" - exports: ["QtQuick.Controls/TextArea 1.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick.Controls/TextArea 1.3"] + exportMetaObjectRevisions: [3] isComposite: true defaultProperty: "data" + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } Property { name: "tabChangesFocus"; type: "bool" } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } Property { name: "activeFocusOnPress"; type: "bool" } Property { name: "baseUrl"; type: "QUrl" } Property { name: "canPaste"; type: "bool"; isReadonly: true } @@ -1957,6 +2051,7 @@ Module { Property { name: "canUndo"; type: "bool"; isReadonly: true } Property { name: "textColor"; type: "QColor" } Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } Property { name: "font"; type: "QFont" } Property { name: "horizontalAlignment"; type: "int" } Property { name: "effectiveHorizontalAlignment"; type: "int"; isReadonly: true } @@ -1971,12 +2066,13 @@ Module { Property { name: "text"; type: "string" } Property { name: "textFormat"; type: "int" } Property { name: "wrapMode"; type: "int" } - Property { name: "selectByMouse"; type: "bool" } Property { name: "selectByKeyboard"; type: "bool" } Property { name: "hoveredLink"; type: "string"; isReadonly: true } Property { name: "backgroundVisible"; type: "bool" } Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } Property { name: "textMargin"; type: "double" } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "contentHeight"; type: "double"; isReadonly: true } Property { name: "textDocument"; type: "QQuickTextDocument"; isReadonly: true; isPointer: true } Signal { name: "linkActivated" @@ -2059,19 +2155,21 @@ Module { Property { name: "__scrollBarTopMargin"; type: "int" } Property { name: "__viewTopMargin"; type: "int" } Property { name: "style"; type: "QQmlComponent"; isPointer: true } - Property { name: "__style"; type: "Style_QMLTYPE_0"; isPointer: true } + Property { name: "__style"; type: "Style_QMLTYPE_2"; 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: "__wheelAreaScrollSpeed"; type: "double" } Property { name: "__horizontalScrollBar" - type: "ScrollBar_QMLTYPE_17" + type: "ScrollBar_QMLTYPE_25" isReadonly: true isPointer: true } Property { name: "__verticalScrollBar" - type: "ScrollBar_QMLTYPE_17" + type: "ScrollBar_QMLTYPE_25" isReadonly: true isPointer: true } @@ -2083,6 +2181,9 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" + Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true } + Property { name: "selectByMouse"; type: "bool" } + Property { name: "menu"; type: "QQmlComponent"; isPointer: true } Property { name: "acceptableInput"; type: "bool"; isReadonly: true } Property { name: "activeFocusOnPress"; type: "bool" } Property { name: "canPaste"; type: "bool"; isReadonly: true } @@ -2090,6 +2191,7 @@ Module { Property { name: "canUndo"; type: "bool"; isReadonly: true } Property { name: "textColor"; type: "QColor" } Property { name: "cursorPosition"; type: "int" } + Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true } Property { name: "displayText"; type: "string"; isReadonly: true } Property { name: "echoMode"; type: "int" } Property { name: "font"; type: "QFont" } @@ -2159,6 +2261,8 @@ Module { isComposite: true defaultProperty: "__content" Property { name: "style"; type: "QQmlComponent"; isPointer: true } + Property { name: "__panel"; type: "QQuickItem"; isPointer: true } + Property { name: "__menu"; type: "QVariant" } Property { name: "__style"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "__content"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } @@ -2171,7 +2275,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_43"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_49"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup"; isPointer: true } diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro index 93db78f4..70c674a1 100644 --- a/src/dialogs/dialogs.pro +++ b/src/dialogs/dialogs.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = dialogplugin TARGETPATH = QtQuick/Dialogs -IMPORT_VERSION = 1.1 +IMPORT_VERSION = 1.2 QMAKE_DOCS = $$PWD/doc/qtquickdialogs.qdocconf diff --git a/src/dialogs/plugins.qmltypes b/src/dialogs/plugins.qmltypes index 1bcebdc3..4d94782c 100644 --- a/src/dialogs/plugins.qmltypes +++ b/src/dialogs/plugins.qmltypes @@ -104,6 +104,7 @@ Module { 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" } @@ -140,6 +141,7 @@ Module { Property { name: "selectedNameFilterIndex"; type: "int" } Property { name: "fileUrl"; type: "QUrl"; isReadonly: true } Property { name: "fileUrls"; type: "QList"; isReadonly: true } + Property { name: "sidebarVisible"; type: "bool" } Signal { name: "filterSelected" } Signal { name: "fileModeChanged" } Signal { name: "selectionAccepted" } @@ -179,6 +181,10 @@ Module { name: "setSelectedNameFilterIndex" Parameter { name: "idx"; type: "int" } } + Method { + name: "setSidebarVisible" + Parameter { name: "s"; type: "bool" } + } } Component { name: "QQuickAbstractFontDialog" @@ -428,6 +434,7 @@ Module { 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" } @@ -496,6 +503,7 @@ Module { 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" } @@ -556,6 +564,7 @@ Module { Property { name: "selectedNameFilterIndex"; type: "int" } Property { name: "fileUrl"; type: "QUrl"; isReadonly: true } Property { name: "fileUrls"; type: "QList"; isReadonly: true } + Property { name: "sidebarVisible"; type: "bool" } Signal { name: "filterSelected" } Signal { name: "fileModeChanged" } Signal { name: "selectionAccepted" } @@ -595,6 +604,10 @@ Module { name: "setSelectedNameFilterIndex" Parameter { name: "idx"; type: "int" } } + Method { + name: "setSidebarVisible" + Parameter { name: "s"; type: "bool" } + } Property { name: "visible"; type: "bool" } Property { name: "modality"; type: "Qt::WindowModality" } Property { name: "title"; type: "string" } @@ -603,6 +616,7 @@ Module { 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" } @@ -685,6 +699,7 @@ Module { 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" } @@ -775,6 +790,7 @@ Module { 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" } -- cgit v1.2.1