diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-02-25 15:07:05 +0100 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@theqtcompany.com> | 2015-03-06 09:33:57 +0000 |
| commit | 06e63332054e441ac1c51e19e40399a8accd5db6 (patch) | |
| tree | 9e1bf8e260bb16d939ad2f4b85ebf5dd856b716d | |
| parent | 9216e2b5f2618e7b58c2a7fcfe50ab4f67dc0a68 (diff) | |
| download | qtquickcontrols-06e63332054e441ac1c51e19e40399a8accd5db6.tar.gz | |
Extras: Update plugins.qmltype
Including adding an import that was
required to fix an error while running qmlplugindump.
Change-Id: I728827a516b1fcd15aed523d4ff38bb195d34fcb
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| -rw-r--r-- | src/extras/Private/CircularButton.qml | 3 | ||||
| -rw-r--r-- | src/extras/plugins.qmltypes | 21 |
2 files changed, 6 insertions, 18 deletions
diff --git a/src/extras/Private/CircularButton.qml b/src/extras/Private/CircularButton.qml index 5c7f2b7e..b68c7d1b 100644 --- a/src/extras/Private/CircularButton.qml +++ b/src/extras/Private/CircularButton.qml @@ -37,8 +37,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 -import QtQuick.Extras 1.4 -import QtQuick.Extras.Private 1.0 +import QtQuick.Controls.Private 1.0 /*! \internal diff --git a/src/extras/plugins.qmltypes b/src/extras/plugins.qmltypes index 3421236e..59ca2dd1 100644 --- a/src/extras/plugins.qmltypes +++ b/src/extras/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.Extras 1.3' +// 'qmlplugindump -nonrelocatable QtQuick.Extras 1.4' Module { Component { @@ -174,23 +174,12 @@ Module { name: "QQuickPicture" defaultProperty: "data" prototype: "QQuickPaintedItem" - exports: ["QtQuick.Extras/Picture 1.3"] + exports: ["QtQuick.Extras/Picture 1.4"] exportMetaObjectRevisions: [0] Property { name: "source"; type: "QUrl" } Property { name: "color"; type: "QColor" } } Component { - name: "QQuickStyleSettings" - prototype: "QObject" - exports: ["QtQuick.Extras.Private/StyleSettings 1.0"] - isCreatable: false - isSingleton: true - exportMetaObjectRevisions: [0] - Property { name: "style"; type: "QUrl"; isReadonly: true } - Property { name: "styleName"; type: "string" } - Property { name: "stylePath"; type: "string" } - } - Component { name: "QQuickTriggerMode" exports: ["QtQuick.Extras/TriggerMode 1.3"] isCreatable: false @@ -212,7 +201,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_29"; 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: "QQuickExclusiveGroup"; isPointer: true } @@ -348,7 +337,7 @@ Module { Property { name: "progress"; type: "double"; isReadonly: true } Signal { name: "activated" } Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_29"; 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: "QQuickExclusiveGroup"; isPointer: true } @@ -511,7 +500,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_29"; 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: "QQuickExclusiveGroup"; isPointer: true } |