diff options
Diffstat (limited to 'src/imports/platform')
4 files changed, 36 insertions, 6 deletions
diff --git a/src/imports/platform/doc/qtlabsplatform.qdocconf b/src/imports/platform/doc/qtlabsplatform.qdocconf index c4a217ab..ae1a63f1 100644 --- a/src/imports/platform/doc/qtlabsplatform.qdocconf +++ b/src/imports/platform/doc/qtlabsplatform.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf) project = QtLabsPlatform description = Qt Labs Platform Reference Documentation diff --git a/src/imports/platform/doc/src/qtlabsplatform-index.qdoc b/src/imports/platform/doc/src/qtlabsplatform-index.qdoc index b5fd3046..7b3f78fb 100644 --- a/src/imports/platform/doc/src/qtlabsplatform-index.qdoc +++ b/src/imports/platform/doc/src/qtlabsplatform-index.qdoc @@ -45,6 +45,6 @@ \list \li \l{Qt Quick} - \li \l{Qt Quick Controls 2} + \li \l{Qt Quick Controls} \endlist */ diff --git a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc b/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc index 57f011ef..dec67b72 100644 --- a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc +++ b/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc @@ -33,7 +33,7 @@ The experimental \l{Qt Labs Platform} module provides QML types for native platform extensions. These QML types work in conjunction with \l{Qt Quick} - and \l{Qt Quick Controls 2}. + and \l{Qt Quick Controls}. The QML types can be imported into your application using the following import statement in your .qml file: @@ -51,7 +51,7 @@ \section1 Related Information \list - \li \l {Qt Quick Controls 2 QML Types} + \li \l {Qt Quick Controls QML Types} \endlist \noautolist diff --git a/src/imports/platform/plugins.qmltypes b/src/imports/platform/plugins.qmltypes index 6913405b..7b165ef3 100644 --- a/src/imports/platform/plugins.qmltypes +++ b/src/imports/platform/plugins.qmltypes @@ -7,7 +7,7 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable Qt.labs.platform 1.0' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.0"] Component { name: "QPlatformDialogHelper" prototype: "QObject" @@ -63,6 +63,18 @@ Module { "EOL": -1 } } + Enum { + name: "ButtonLayout" + values: { + "UnknownLayout": -1, + "WinLayout": 0, + "MacLayout": 1, + "KdeLayout": 2, + "GnomeLayout": 3, + "MacModelessLayout": 4, + "AndroidLayout": 5 + } + } Signal { name: "accept" } Signal { name: "reject" } } @@ -182,6 +194,12 @@ Module { Property { name: "options"; type: "QFontDialogOptions::FontDialogOptions" } } Component { + name: "QQuickPlatformIcon" + Property { name: "source"; type: "QUrl" } + Property { name: "name"; type: "string" } + Property { name: "mask"; type: "bool" } + } + Component { name: "QQuickPlatformMenu" defaultProperty: "data" prototype: "QObject" @@ -206,8 +224,10 @@ Module { Property { name: "iconSource"; type: "QUrl" } Property { name: "iconName"; type: "string" } Property { name: "font"; type: "QFont" } + Property { name: "icon"; revision: 1; type: "QQuickPlatformIcon" } Signal { name: "aboutToShow" } Signal { name: "aboutToHide" } + Signal { name: "iconChanged"; revision: 1 } Method { name: "open" Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } @@ -284,8 +304,10 @@ Module { Property { name: "iconName"; type: "string" } Property { name: "shortcut"; type: "QVariant" } Property { name: "font"; type: "QFont" } + Property { name: "icon"; revision: 1; type: "QQuickPlatformIcon" } Signal { name: "triggered" } Signal { name: "hovered" } + Signal { name: "iconChanged"; revision: 1 } Method { name: "toggle" } } Component { @@ -422,8 +444,11 @@ Module { Component { name: "QQuickPlatformSystemTrayIcon" prototype: "QObject" - exports: ["Qt.labs.platform/SystemTrayIcon 1.0"] - exportMetaObjectRevisions: [0] + exports: [ + "Qt.labs.platform/SystemTrayIcon 1.0", + "Qt.labs.platform/SystemTrayIcon 1.1" + ] + exportMetaObjectRevisions: [0, 1] Property { name: "available"; type: "bool"; isReadonly: true } Property { name: "supportsMessages"; type: "bool"; isReadonly: true } Property { name: "visible"; type: "bool" } @@ -431,11 +456,15 @@ Module { Property { name: "iconName"; type: "string" } Property { name: "tooltip"; type: "string" } Property { name: "menu"; type: "QQuickPlatformMenu"; isPointer: true } + Property { name: "geometry"; revision: 1; type: "QRect"; isReadonly: true } + Property { name: "icon"; revision: 1; type: "QQuickPlatformIcon" } Signal { name: "activated" Parameter { name: "reason"; type: "QPlatformSystemTrayIcon::ActivationReason" } } Signal { name: "messageClicked" } + Signal { name: "geometryChanged"; revision: 1 } + Signal { name: "iconChanged"; revision: 1 } Method { name: "show" } Method { name: "hide" } Method { |