summaryrefslogtreecommitdiff
path: root/src/controls
diff options
context:
space:
mode:
Diffstat (limited to 'src/controls')
-rw-r--r--src/controls/Private/EditMenu_ios.qml43
-rw-r--r--src/controls/Private/TextInputWithHandles.qml12
-rw-r--r--src/controls/SplitView.qml2
-rw-r--r--src/controls/Styles/Android/ApplicationWindowStyle.qml1
-rw-r--r--src/controls/Styles/Base/DelayButtonStyle.qml3
-rw-r--r--src/controls/Styles/Base/PieMenuStyle.qml24
-rw-r--r--src/controls/Styles/Base/StatusIndicatorStyle.qml8
-rw-r--r--src/controls/Styles/Base/ToggleButtonStyle.qml4
-rw-r--r--src/controls/Styles/Base/TumblerStyle.qml5
-rw-r--r--src/controls/TabView.qml15
-rw-r--r--src/controls/plugins.qmltypes635
-rw-r--r--src/controls/qquickmenu.cpp11
-rw-r--r--src/controls/qquickmenu_p.h6
-rw-r--r--src/controls/qquickmenupopupwindow_p.h2
-rw-r--r--src/controls/qquickpopupwindow.cpp15
-rw-r--r--src/controls/qquickpopupwindow_p.h1
16 files changed, 625 insertions, 162 deletions
diff --git a/src/controls/Private/EditMenu_ios.qml b/src/controls/Private/EditMenu_ios.qml
index 94c4617a..690b8797 100644
--- a/src/controls/Private/EditMenu_ios.qml
+++ b/src/controls/Private/EditMenu_ios.qml
@@ -44,48 +44,7 @@ Item {
property bool __showMenuFromTouch: false
property Component defaultMenu: Menu {
- MenuItem {
- text: qsTr("Cut")
- shortcut: StandardKey.Cut
- visible: !input.readOnly && selectionStart !== selectionEnd
- onTriggered: {
- cut();
- select(input.cursorPosition, input.cursorPosition);
- }
- }
- MenuItem {
- text: qsTr("Copy")
- shortcut: StandardKey.Copy
- visible: selectionStart !== selectionEnd
- onTriggered: {
- copy();
- select(input.cursorPosition, input.cursorPosition);
- }
- }
- MenuItem {
- text: qsTr("Paste")
- shortcut: StandardKey.Paste
- visible: input.canPaste
- onTriggered: paste();
- }
- MenuItem {
- text: qsTr("Delete")
- shortcut: StandardKey.Delete
- visible: !input.readOnly && selectionStart !== selectionEnd
- onTriggered: remove(selectionStart, selectionEnd)
- }
- MenuItem {
- text: qsTr("Select")
- shortcut: StandardKey.Select
- visible: selectionStart === selectionEnd && input.length > 0
- onTriggered: selectWord();
- }
- MenuItem {
- text: qsTr("Select All")
- shortcut: StandardKey.SelectAll
- visible: !(selectionStart === 0 && selectionEnd === length)
- onTriggered: selectAll();
- }
+ /* iOS plugin will automatically populate edit menus with standard edit actions */
}
Connections {
diff --git a/src/controls/Private/TextInputWithHandles.qml b/src/controls/Private/TextInputWithHandles.qml
index 42e7fde0..b1ea9a57 100644
--- a/src/controls/Private/TextInputWithHandles.qml
+++ b/src/controls/Private/TextInputWithHandles.qml
@@ -144,13 +144,15 @@ TextInput {
active: control.selectByMouse && Settings.isMobile
maximum: cursorHandle.position - 1
+ readonly property var mappedOrigin: editor.mapToItem(parent, 0,0)
+
// Mention scenePos in the mappedPos binding to force re-evaluation if it changes
- property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ?
+ readonly property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ?
editor.mapToItem(parent, editor.selectionRectangle.x, editor.selectionRectangle.y) : -1
x: mappedPos.x
y: mappedPos.y
- visible: pressed || (input.hasSelection && handleX + handleWidth >= -1 && handleX <= control.width + 1)
+ visible: pressed || (input.hasSelection && handleX + handleWidth >= -1 && handleX - mappedOrigin.x <= control.width + 1)
onPositionChanged: {
if (!input.blockRecursion) {
@@ -173,13 +175,15 @@ TextInput {
active: control.selectByMouse && Settings.isMobile
minimum: input.hasSelection ? selectionHandle.position + 1 : -1
+ readonly property var mappedOrigin: editor.mapToItem(parent, 0,0)
+
// Mention scenePos in the mappedPos binding to force re-evaluation if it changes
- property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ?
+ readonly property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ?
editor.mapToItem(parent, editor.cursorRectangle.x, editor.cursorRectangle.y) : -1
x: mappedPos.x
y: mappedPos.y
- visible: pressed || ((input.cursorVisible || input.hasSelection) && handleX + handleWidth >= -1 && handleX <= control.width + 1)
+ visible: pressed || ((input.cursorVisible || input.hasSelection) && handleX + handleWidth >= -1 && handleX - mappedOrigin.x <= control.width + 1)
onPositionChanged: {
if (!input.blockRecursion) {
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml
index c2e361ac..868108aa 100644
--- a/src/controls/SplitView.qml
+++ b/src/controls/SplitView.qml
@@ -82,7 +82,7 @@ import QtQuick.Window 2.1
\li \l{Layout::fillHeight}{Layout.fillHeight} (\c true for only one child)
\endlist
- \note Please import QtQuick.Layout 1.0 in your QML file in order to use the Layout
+ \note import QtQuick.Layouts 1.0 in your QML file in order to use the Layout
attached properties inside SplitView.
Example:
diff --git a/src/controls/Styles/Android/ApplicationWindowStyle.qml b/src/controls/Styles/Android/ApplicationWindowStyle.qml
index 550d31a3..6f703845 100644
--- a/src/controls/Styles/Android/ApplicationWindowStyle.qml
+++ b/src/controls/Styles/Android/ApplicationWindowStyle.qml
@@ -104,6 +104,7 @@ QtObject {
Menu {
id: proxyMenu
+ __isProxy: true
items: control.menuBar ? control.menuBar.menus : []
}
diff --git a/src/controls/Styles/Base/DelayButtonStyle.qml b/src/controls/Styles/Base/DelayButtonStyle.qml
index 12f545be..71e1c67d 100644
--- a/src/controls/Styles/Base/DelayButtonStyle.qml
+++ b/src/controls/Styles/Base/DelayButtonStyle.qml
@@ -191,11 +191,8 @@ CircularButtonStyle {
DropShadow {
id: progressBarDropShadow
anchors.fill: progressBar
- fast: true
// QTBUG-33747
// cached: !control.pressed
- radius: 4
- samples: radius * 2
color: progressBarDropShadowColor
source: progressBar
}
diff --git a/src/controls/Styles/Base/PieMenuStyle.qml b/src/controls/Styles/Base/PieMenuStyle.qml
index fdfa92e7..6137cc91 100644
--- a/src/controls/Styles/Base/PieMenuStyle.qml
+++ b/src/controls/Styles/Base/PieMenuStyle.qml
@@ -115,13 +115,25 @@ Style {
/*! The selection color. */
property color selectionColor: "#eee"
- /*! The shadow color. */
+ /*!
+ The shadow color.
+
+ \sa DropShadow
+ */
property color shadowColor: Qt.rgba(0, 0, 0, 0.26)
- /*! The shadow radius. */
- property real shadowRadius: 50
+ /*!
+ The shadow radius.
- /*! The shadow spread. */
+ \sa DropShadow
+ */
+ property real shadowRadius: 10
+
+ /*!
+ The shadow spread.
+
+ \sa DropShadow
+ */
property real shadowSpread: 0.3
/*!
@@ -366,11 +378,9 @@ Style {
DropShadow {
id: dropShadow
anchors.fill: itemgroup
- fast: true
- radius: shadowRadius
spread: shadowSpread
+ samples: shadowRadius * 2 + 1
transparentBorder: true
- samples: 12
color: shadowColor
source: itemgroup
}
diff --git a/src/controls/Styles/Base/StatusIndicatorStyle.qml b/src/controls/Styles/Base/StatusIndicatorStyle.qml
index 4366d1f7..bd539db3 100644
--- a/src/controls/Styles/Base/StatusIndicatorStyle.qml
+++ b/src/controls/Styles/Base/StatusIndicatorStyle.qml
@@ -73,7 +73,6 @@ Style {
property Component indicator: Item {
readonly property real shineStep: 0.05
readonly property real smallestAxis: Math.min(control.width, control.height)
- readonly property real shadowRadius: smallestAxis * 0.4
readonly property real outerRecessPercentage: 0.11
readonly property color offColor: Qt.rgba(0.13, 0.13, 0.13)
readonly property color baseColor: control.active ? control.color : offColor
@@ -113,12 +112,12 @@ Style {
Item {
id: shadowGuard
anchors.fill: backgroundCanvas
- anchors.margins: -shadowRadius
+ anchors.margins: -shadow.radius
Canvas {
id: colorCanvas
anchors.fill: parent
- anchors.margins: shadowRadius
+ anchors.margins: shadow.radius
Connections {
target: control
@@ -144,9 +143,6 @@ Style {
id: shadow
source: shadowGuard
color: control.color
- // Don't set fast here because Qt < 5.3 will run into QTBUG-36931
- radius: shadowRadius
- samples: Math.min(32, radius)
cached: true
anchors.fill: shadowGuard
visible: control.active
diff --git a/src/controls/Styles/Base/ToggleButtonStyle.qml b/src/controls/Styles/Base/ToggleButtonStyle.qml
index ca185012..64f1bb56 100644
--- a/src/controls/Styles/Base/ToggleButtonStyle.qml
+++ b/src/controls/Styles/Base/ToggleButtonStyle.qml
@@ -249,8 +249,6 @@ CircularButtonStyle {
id: uncheckedDropShadow
anchors.fill: uncheckedCanvas
cached: true
- radius: 4
- samples: 8
color: uncheckedDropShadowColor
source: uncheckedCanvas
visible: !control.checked
@@ -260,8 +258,6 @@ CircularButtonStyle {
id: checkedDropShadow
anchors.fill: checkedCanvas
cached: true
- radius: 4
- samples: 8
color: checkedDropShadowColor
source: checkedCanvas
visible: control.checked
diff --git a/src/controls/Styles/Base/TumblerStyle.qml b/src/controls/Styles/Base/TumblerStyle.qml
index 46605538..fd847e85 100644
--- a/src/controls/Styles/Base/TumblerStyle.qml
+++ b/src/controls/Styles/Base/TumblerStyle.qml
@@ -132,8 +132,9 @@ Style {
DropShadow {
anchors.fill: rect
source: rect
- radius: __padding
- samples: Math.min(32, radius * 2)
+ samples: 15
+ spread: 0.45
+ cached: true
}
}
diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml
index f7a8324a..c671a273 100644
--- a/src/controls/TabView.qml
+++ b/src/controls/TabView.qml
@@ -116,16 +116,23 @@ FocusScope {
/*! \internal */
default property alias data: stack.data
- /*! \qmlmethod Tab TabView::addTab(string title, Component component)
- Adds a new tab page with title with and optional Component.
+ /*!
+ \qmlmethod Tab TabView::addTab(string title, Component component)
+
+ Adds a new tab with the given \a title and an optional \a component.
+
Returns the newly added tab.
*/
function addTab(title, component) {
return insertTab(__tabs.count, title, component)
}
- /*! \qmlmethod Tab TabView::insertTab(int index, string title, Component component)
- Inserts a new tab with title at index, with an optional Component.
+ /*!
+ \qmlmethod Tab TabView::insertTab(int index, string title, Component component)
+
+ Inserts a new tab at \a index, with the given \a title and
+ an optional \a component.
+
Returns the newly added tab.
*/
function insertTab(index, title, component) {
diff --git a/src/controls/plugins.qmltypes b/src/controls/plugins.qmltypes
index 89b9260a..11994894 100644
--- a/src/controls/plugins.qmltypes
+++ b/src/controls/plugins.qmltypes
@@ -4,13 +4,14 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.Controls 1.4'
+// 'qmlplugindump -nonrelocatable QtQuick.Controls 1.5'
Module {
dependencies: [
"QtGraphicalEffects 1.0",
+ "QtGraphicalEffects.private 1.0",
"QtQml.Models 2.2",
- "QtQuick 2.5",
+ "QtQuick 2.6",
"QtQuick.Controls.Styles 1.4",
"QtQuick.Extras 1.4",
"QtQuick.Extras.Private.CppUtils 1.1",
@@ -184,10 +185,9 @@ Module {
Signal { name: "__menuPopupDestroyed" }
Signal { name: "menuContentItemChanged" }
Signal { name: "minimumWidthChanged" }
- Method { name: "__closeMenu" }
Method { name: "__dismissMenu" }
- Method { name: "__destroyMenuPopup" }
- Method { name: "__destroyAllMenuPopups" }
+ Method { name: "__closeAndDestroy" }
+ Method { name: "__dismissAndDestroy" }
Method { name: "popup" }
Method {
name: "addItem"
@@ -603,6 +603,7 @@ Module {
exports: ["QtQuick.Controls.Private/TreeModelAdaptor 1.0"]
exportMetaObjectRevisions: [0]
Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
+ Property { name: "rootIndex"; type: "QModelIndex" }
Signal {
name: "modelChanged"
Parameter { name: "model"; type: "QAbstractItemModel"; isPointer: true }
@@ -665,12 +666,12 @@ Module {
}
Component {
prototype: "QQuickWindowQmlImpl"
- name: "QtQuick.Controls/ApplicationWindow"
+ name: "QtQuick.Controls/ApplicationWindow 1.0"
exports: ["QtQuick.Controls/ApplicationWindow 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
defaultProperty: "data"
- Property { name: "menuBar"; type: "MenuBar_QMLTYPE_3"; isPointer: true }
+ Property { name: "menuBar"; type: "MenuBar_QMLTYPE_2"; isPointer: true }
Property { name: "toolBar"; type: "QQuickItem"; isPointer: true }
Property { name: "statusBar"; type: "QQuickItem"; isPointer: true }
Property { name: "style"; type: "QQmlComponent"; isPointer: true }
@@ -678,14 +679,19 @@ 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_10"
+ 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 }
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/BusyIndicator"
+ name: "QtQuick.Controls/BusyIndicator 1.1"
exports: ["QtQuick.Controls/BusyIndicator 1.1"]
exportMetaObjectRevisions: [1]
isComposite: true
@@ -699,7 +705,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/Button"
+ name: "QtQuick.Controls/Button 1.0"
exports: ["QtQuick.Controls/Button 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -719,8 +725,8 @@ Module {
Property { name: "__iconOverriden"; type: "bool"; isReadonly: true }
Property { name: "__action"; type: "QQuickAction"; isPointer: true }
Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true }
- Property { name: "__effectivePressed"; type: "bool" }
Property { name: "__behavior"; type: "QVariant" }
+ Property { name: "__effectivePressed"; type: "bool" }
Property { name: "pressed"; type: "bool"; isReadonly: true }
Property { name: "hovered"; type: "bool"; isReadonly: true }
Signal { name: "clicked" }
@@ -733,7 +739,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/Calendar"
+ name: "QtQuick.Controls/Calendar 1.2"
exports: ["QtQuick.Controls/Calendar 1.2"]
exportMetaObjectRevisions: [2]
isComposite: true
@@ -744,8 +750,8 @@ Module {
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" }
+ Property { name: "__model"; type: "QQuickCalendarModel"; isPointer: true }
Property { name: "selectedDate"; type: "QDate" }
Property { name: "minimumDate"; type: "QDate" }
Property { name: "maximumDate"; type: "QDate" }
@@ -793,7 +799,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/CheckBox"
+ name: "QtQuick.Controls/CheckBox 1.0"
exports: ["QtQuick.Controls/CheckBox 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -819,7 +825,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Extras.Private/CircularButton"
+ name: "QtQuick.Extras.Private/CircularButton 1.0"
exports: ["QtQuick.Extras.Private/CircularButton 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -839,8 +845,8 @@ Module {
Property { name: "__iconOverriden"; type: "bool"; isReadonly: true }
Property { name: "__action"; type: "QQuickAction"; isPointer: true }
Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true }
- Property { name: "__effectivePressed"; type: "bool" }
Property { name: "__behavior"; type: "QVariant" }
+ Property { name: "__effectivePressed"; type: "bool" }
Property { name: "pressed"; type: "bool"; isReadonly: true }
Property { name: "hovered"; type: "bool"; isReadonly: true }
Signal { name: "clicked" }
@@ -853,7 +859,7 @@ Module {
}
Component {
prototype: "QObject"
- name: "QtQuick.Extras.Private/CircularButtonStyleHelper"
+ name: "QtQuick.Extras.Private/CircularButtonStyleHelper 1.0"
exports: ["QtQuick.Extras.Private/CircularButtonStyleHelper 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -899,7 +905,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Extras/CircularGauge"
+ name: "QtQuick.Extras/CircularGauge 1.0"
exports: ["QtQuick.Extras/CircularGauge 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -917,7 +923,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Extras.Private/CircularTickmarkLabel"
+ name: "QtQuick.Extras.Private/CircularTickmarkLabel 1.0"
exports: ["QtQuick.Extras.Private/CircularTickmarkLabel 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -951,7 +957,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/ComboBox"
+ name: "QtQuick.Controls/ComboBox 1.0"
exports: ["QtQuick.Controls/ComboBox 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -969,6 +975,7 @@ Module {
Property { name: "currentIndex"; type: "int" }
Property { name: "currentText"; type: "string"; isReadonly: true }
Property { name: "editText"; type: "string" }
+ Property { name: "inputMethodHints"; type: "int" }
Property { name: "count"; type: "int"; isReadonly: true }
Property { name: "validator"; type: "QValidator"; isPointer: true }
Property { name: "acceptableInput"; type: "bool"; isReadonly: true }
@@ -998,7 +1005,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Extras/DelayButton"
+ name: "QtQuick.Extras/DelayButton 1.0"
exports: ["QtQuick.Extras/DelayButton 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1022,8 +1029,8 @@ Module {
Property { name: "__iconOverriden"; type: "bool"; isReadonly: true }
Property { name: "__action"; type: "QQuickAction"; isPointer: true }
Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true }
- Property { name: "__effectivePressed"; type: "bool" }
Property { name: "__behavior"; type: "QVariant" }
+ Property { name: "__effectivePressed"; type: "bool" }
Property { name: "pressed"; type: "bool"; isReadonly: true }
Property { name: "hovered"; type: "bool"; isReadonly: true }
Signal { name: "clicked" }
@@ -1036,7 +1043,29 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Extras/Dial"
+ name: "QtQuick.Extras/Dial 1.0"
+ exports: ["QtQuick.Extras/Dial 1.0"]
+ exportMetaObjectRevisions: [0]
+ isComposite: true
+ defaultProperty: "data"
+ Property { name: "__wrap"; type: "bool" }
+ Property { name: "activeFocusOnPress"; type: "bool" }
+ Property { name: "tickmarksVisible"; type: "bool" }
+ Property { name: "value"; type: "double" }
+ Property { name: "minimumValue"; type: "double" }
+ Property { name: "maximumValue"; type: "double" }
+ Property { name: "hovered"; type: "bool"; isReadonly: true }
+ Property { name: "stepSize"; type: "double" }
+ Property { name: "pressed"; type: "bool"; isReadonly: true }
+ Property { name: "style"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "__style"; type: "QObject"; isPointer: true }
+ Property { name: "__panel"; type: "QQuickItem"; isPointer: true }
+ Property { name: "styleHints"; type: "QVariant" }
+ Property { name: "__styleData"; type: "QObject"; isPointer: true }
+ }
+ Component {
+ prototype: "QQuickFocusScope"
+ name: "QtQuick.Extras/Dial 1.1"
exports: ["QtQuick.Extras/Dial 1.1"]
exportMetaObjectRevisions: [1]
isComposite: true
@@ -1058,7 +1087,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Extras/Gauge"
+ name: "QtQuick.Extras/Gauge 1.0"
exports: ["QtQuick.Extras/Gauge 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1083,7 +1112,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/GroupBox"
+ name: "QtQuick.Controls/GroupBox 1.0"
exports: ["QtQuick.Controls/GroupBox 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1100,7 +1129,7 @@ Module {
}
Component {
prototype: "QQuickText"
- name: "QtQuick.Controls/Label"
+ name: "QtQuick.Controls/Label 1.0"
exports: ["QtQuick.Controls/Label 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1108,7 +1137,7 @@ Module {
}
Component {
prototype: "QObject"
- name: "QtQuick.Controls/Menu"
+ name: "QtQuick.Controls/Menu 1.0"
exports: ["QtQuick.Controls/Menu 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1116,8 +1145,8 @@ Module {
Property { name: "__selfComponent"; type: "QQmlComponent"; isPointer: true }
Property { name: "style"; type: "QQmlComponent"; isPointer: true }
Property { name: "__usingDefaultStyle"; type: "bool" }
- Property { name: "__currentIndex"; type: "int" }
Property { name: "__parentContentItem"; type: "QVariant" }
+ Property { name: "__currentIndex"; type: "int" }
Method {
name: "addMenu"
type: "QVariant"
@@ -1146,10 +1175,9 @@ Module {
Signal { name: "__menuPopupDestroyed" }
Signal { name: "menuContentItemChanged" }
Signal { name: "minimumWidthChanged" }
- Method { name: "__closeMenu" }
Method { name: "__dismissMenu" }
- Method { name: "__destroyMenuPopup" }
- Method { name: "__destroyAllMenuPopups" }
+ Method { name: "__closeAndDestroy" }
+ Method { name: "__dismissAndDestroy" }
Method { name: "popup" }
Method {
name: "addItem"
@@ -1200,7 +1228,7 @@ Module {
}
Component {
prototype: "QObject"
- name: "QtQuick.Controls/MenuBar"
+ name: "QtQuick.Controls/MenuBar 1.0"
exports: ["QtQuick.Controls/MenuBar 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1217,7 +1245,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Extras/PieMenu"
+ name: "QtQuick.Extras/PieMenu 1.0"
exports: ["QtQuick.Extras/PieMenu 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1262,18 +1290,18 @@ Module {
}
Component {
prototype: "QQuickLoader"
- name: "QtQuick.Extras.Private/PieMenuIcon"
+ name: "QtQuick.Extras.Private/PieMenuIcon 1.0"
exports: ["QtQuick.Extras.Private/PieMenuIcon 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
defaultProperty: "data"
- Property { name: "control"; type: "PieMenu_QMLTYPE_176"; isPointer: true }
+ Property { name: "control"; type: "PieMenu_QMLTYPE_168"; isPointer: true }
Property { name: "styleData"; type: "QObject"; isPointer: true }
Property { name: "iconSource"; type: "string"; isReadonly: true }
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/ProgressBar"
+ name: "QtQuick.Controls/ProgressBar 1.0"
exports: ["QtQuick.Controls/ProgressBar 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1298,7 +1326,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/RadioButton"
+ name: "QtQuick.Controls/RadioButton 1.0"
exports: ["QtQuick.Controls/RadioButton 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1319,7 +1347,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/ScrollView"
+ name: "QtQuick.Controls/ScrollView 1.0"
exports: ["QtQuick.Controls/ScrollView 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1331,7 +1359,7 @@ 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_1"; isPointer: true }
Property { name: "horizontalScrollBarPolicy"; type: "int" }
Property { name: "verticalScrollBarPolicy"; type: "int" }
Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true }
@@ -1339,20 +1367,20 @@ Module {
Property { name: "__wheelAreaScrollSpeed"; type: "double" }
Property {
name: "__horizontalScrollBar"
- type: "ScrollBar_QMLTYPE_25"
+ type: "ScrollBar_QMLTYPE_24"
isReadonly: true
isPointer: true
}
Property {
name: "__verticalScrollBar"
- type: "ScrollBar_QMLTYPE_25"
+ type: "ScrollBar_QMLTYPE_24"
isReadonly: true
isPointer: true
}
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/Slider"
+ name: "QtQuick.Controls/Slider 1.0"
exports: ["QtQuick.Controls/Slider 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1379,7 +1407,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/SpinBox"
+ name: "QtQuick.Controls/SpinBox 1.0"
exports: ["QtQuick.Controls/SpinBox 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1398,6 +1426,7 @@ Module {
Property { name: "prefix"; type: "string" }
Property { name: "decimals"; type: "int" }
Property { name: "font"; type: "QFont" }
+ Property { name: "cursorPosition"; type: "int" }
Property { name: "__text"; type: "string" }
Property { name: "__baselineOffset"; type: "double" }
Signal { name: "editingFinished" }
@@ -1411,7 +1440,7 @@ Module {
}
Component {
prototype: "QQuickItem"
- name: "QtQuick.Controls/SplitView"
+ name: "QtQuick.Controls/SplitView 1.0"
exports: ["QtQuick.Controls/SplitView 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1435,19 +1464,19 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/StackView"
+ name: "QtQuick.Controls/StackView 1.0"
exports: ["QtQuick.Controls/StackView 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
defaultProperty: "data"
+ Property { name: "initialItem"; type: "QVariant" }
Property { name: "busy"; type: "bool"; isReadonly: true }
- Property { name: "delegate"; type: "StackViewDelegate_QMLTYPE_233"; isPointer: true }
+ Property { name: "delegate"; type: "StackViewDelegate_QMLTYPE_225"; isPointer: true }
Property { name: "__currentItem"; type: "QQuickItem"; isPointer: true }
Property { name: "__depth"; type: "int" }
+ Property { name: "__currentTransition"; type: "QVariant" }
Property { name: "__guard"; type: "bool" }
Property { name: "invalidItemReplacement"; type: "QQmlComponent"; isPointer: true }
- Property { name: "initialItem"; type: "QVariant" }
- Property { name: "__currentTransition"; type: "QVariant" }
Property { name: "depth"; type: "int"; isReadonly: true }
Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
Method {
@@ -1517,7 +1546,7 @@ Module {
}
Component {
prototype: "QObject"
- name: "QtQuick.Controls/StackViewDelegate"
+ name: "QtQuick.Controls/StackViewDelegate 1.0"
exports: ["QtQuick.Controls/StackViewDelegate 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1537,7 +1566,7 @@ Module {
}
Component {
prototype: "QQuickParallelAnimation"
- name: "QtQuick.Controls/StackViewTransition"
+ name: "QtQuick.Controls/StackViewTransition 1.0"
exports: ["QtQuick.Controls/StackViewTransition 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1549,7 +1578,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/StatusBar"
+ name: "QtQuick.Controls/StatusBar 1.0"
exports: ["QtQuick.Controls/StatusBar 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1562,7 +1591,23 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Extras/StatusIndicator"
+ name: "QtQuick.Extras/StatusIndicator 1.0"
+ exports: ["QtQuick.Extras/StatusIndicator 1.0"]
+ exportMetaObjectRevisions: [0]
+ isComposite: true
+ defaultProperty: "data"
+ Property { name: "active"; type: "bool" }
+ Property { name: "color"; type: "QColor" }
+ Property { name: "on"; type: "bool" }
+ Property { name: "style"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "__style"; type: "QObject"; isPointer: true }
+ Property { name: "__panel"; type: "QQuickItem"; isPointer: true }
+ Property { name: "styleHints"; type: "QVariant" }
+ Property { name: "__styleData"; type: "QObject"; isPointer: true }
+ }
+ Component {
+ prototype: "QQuickFocusScope"
+ name: "QtQuick.Extras/StatusIndicator 1.1"
exports: ["QtQuick.Extras/StatusIndicator 1.1"]
exportMetaObjectRevisions: [1]
isComposite: true
@@ -1578,7 +1623,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/Switch"
+ name: "QtQuick.Controls/Switch 1.1"
exports: ["QtQuick.Controls/Switch 1.1"]
exportMetaObjectRevisions: [1]
isComposite: true
@@ -1596,7 +1641,7 @@ Module {
}
Component {
prototype: "QQuickLoader"
- name: "QtQuick.Controls/Tab"
+ name: "QtQuick.Controls/Tab 1.0"
exports: ["QtQuick.Controls/Tab 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1607,7 +1652,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/TabView"
+ name: "QtQuick.Controls/TabView 1.0"
exports: ["QtQuick.Controls/TabView 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1665,17 +1710,17 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/TableView"
+ name: "QtQuick.Controls/TableView 1.0"
exports: ["QtQuick.Controls/TableView 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
defaultProperty: "__columns"
- Property { name: "rowCount"; type: "int"; isReadonly: true }
Property { name: "model"; type: "QVariant" }
+ Property { name: "rowCount"; type: "int"; isReadonly: true }
Property { name: "currentRow"; type: "int" }
Property {
name: "selection"
- type: "TableViewSelection_QMLTYPE_265"
+ type: "TableViewSelection_QMLTYPE_281"
isReadonly: true
isPointer: true
}
@@ -1719,9 +1764,9 @@ Module {
Property { name: "__viewTypeName"; type: "string" }
Property { name: "__isTreeView"; type: "bool"; isReadonly: true }
Property { name: "__itemDelegateLoader"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "__model"; type: "QVariant" }
Property { name: "__activateItemOnSingleClick"; type: "bool" }
Property { name: "__mouseArea"; type: "QQuickItem"; isPointer: true }
- Property { name: "__model"; type: "QVariant" }
Property { name: "backgroundVisible"; type: "bool" }
Property { name: "contentHeader"; type: "QQmlComponent"; isPointer: true }
Property { name: "contentFooter"; type: "QQmlComponent"; isPointer: true }
@@ -1766,7 +1811,7 @@ 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_1"; isPointer: true }
Property { name: "horizontalScrollBarPolicy"; type: "int" }
Property { name: "verticalScrollBarPolicy"; type: "int" }
Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true }
@@ -1774,20 +1819,20 @@ Module {
Property { name: "__wheelAreaScrollSpeed"; type: "double" }
Property {
name: "__horizontalScrollBar"
- type: "ScrollBar_QMLTYPE_25"
+ type: "ScrollBar_QMLTYPE_24"
isReadonly: true
isPointer: true
}
Property {
name: "__verticalScrollBar"
- type: "ScrollBar_QMLTYPE_25"
+ type: "ScrollBar_QMLTYPE_24"
isReadonly: true
isPointer: true
}
}
Component {
prototype: "QObject"
- name: "QtQuick.Controls/TableViewColumn"
+ name: "QtQuick.Controls/TableViewColumn 1.0"
exports: ["QtQuick.Controls/TableViewColumn 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -1806,7 +1851,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/TextArea"
+ name: "QtQuick.Controls/TextArea 1.3"
exports: ["QtQuick.Controls/TextArea 1.3"]
exportMetaObjectRevisions: [3]
isComposite: true
@@ -1853,6 +1898,291 @@ Module {
name: "linkHovered"
Parameter { name: "link"; type: "string" }
}
+ Signal { name: "editingFinished" }
+ Method {
+ name: "append"
+ type: "QVariant"
+ Parameter { name: "string"; type: "QVariant" }
+ }
+ Method { name: "copy"; type: "QVariant" }
+ Method { name: "cut"; type: "QVariant" }
+ Method { name: "deselect"; type: "QVariant" }
+ Method {
+ name: "getFormattedText"
+ type: "QVariant"
+ Parameter { name: "start"; type: "QVariant" }
+ Parameter { name: "end"; type: "QVariant" }
+ }
+ Method {
+ name: "getText"
+ type: "QVariant"
+ Parameter { name: "start"; type: "QVariant" }
+ Parameter { name: "end"; type: "QVariant" }
+ }
+ Method {
+ name: "insert"
+ type: "QVariant"
+ Parameter { name: "position"; type: "QVariant" }
+ Parameter { name: "text"; type: "QVariant" }
+ }
+ Method {
+ name: "isRightToLeft"
+ type: "QVariant"
+ Parameter { name: "start"; type: "QVariant" }
+ Parameter { name: "end"; type: "QVariant" }
+ }
+ Method {
+ name: "moveCursorSelection"
+ type: "QVariant"
+ Parameter { name: "position"; type: "QVariant" }
+ Parameter { name: "mode"; type: "QVariant" }
+ }
+ Method { name: "paste"; type: "QVariant" }
+ Method {
+ name: "positionAt"
+ type: "QVariant"
+ Parameter { name: "x"; type: "QVariant" }
+ Parameter { name: "y"; type: "QVariant" }
+ }
+ Method {
+ name: "positionToRectangle"
+ type: "QVariant"
+ Parameter { name: "position"; type: "QVariant" }
+ }
+ Method { name: "redo"; type: "QVariant" }
+ Method {
+ name: "remove"
+ type: "QVariant"
+ Parameter { name: "start"; type: "QVariant" }
+ Parameter { name: "end"; type: "QVariant" }
+ }
+ Method {
+ name: "select"
+ type: "QVariant"
+ Parameter { name: "start"; type: "QVariant" }
+ Parameter { name: "end"; type: "QVariant" }
+ }
+ Method { name: "selectAll"; type: "QVariant" }
+ Method { name: "selectWord"; type: "QVariant" }
+ Method { name: "undo"; type: "QVariant" }
+ Property { name: "frameVisible"; type: "bool" }
+ Property { name: "highlightOnFocus"; type: "bool" }
+ Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
+ Property { name: "__scroller"; type: "QQuickItem"; isPointer: true }
+ Property { name: "__scrollBarTopMargin"; type: "int" }
+ Property { name: "__viewTopMargin"; type: "int" }
+ Property { name: "style"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "__style"; type: "Style_QMLTYPE_1"; 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_24"
+ isReadonly: true
+ isPointer: true
+ }
+ Property {
+ name: "__verticalScrollBar"
+ type: "ScrollBar_QMLTYPE_24"
+ isReadonly: true
+ isPointer: true
+ }
+ }
+ Component {
+ prototype: "QQuickFocusScope"
+ 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 }
+ 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 }
+ Property { name: "canRedo"; type: "bool"; isReadonly: true }
+ 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 }
+ Property { name: "verticalAlignment"; type: "int" }
+ Property { name: "inputMethodHints"; type: "int" }
+ Property { name: "length"; type: "int"; isReadonly: true }
+ Property { name: "lineCount"; type: "int"; isReadonly: true }
+ Property { name: "readOnly"; type: "bool" }
+ Property { name: "selectedText"; type: "string"; isReadonly: true }
+ Property { name: "selectionEnd"; type: "int"; isReadonly: true }
+ Property { name: "selectionStart"; type: "int"; isReadonly: true }
+ Property { name: "text"; type: "string" }
+ Property { name: "textFormat"; type: "int" }
+ Property { name: "wrapMode"; type: "int" }
+ 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"
+ Parameter { name: "link"; type: "string" }
+ }
+ Signal {
+ name: "linkHovered"
+ Parameter { name: "link"; type: "string" }
+ }
+ Signal { name: "editingFinished" }
+ Method {
+ name: "append"
+ type: "QVariant"
+ Parameter { name: "string"; type: "QVariant" }
+ }
+ Method { name: "copy"; type: "QVariant" }
+ Method { name: "cut"; type: "QVariant" }
+ Method { name: "deselect"; type: "QVariant" }
+ Method {
+ name: "getFormattedText"
+ type: "QVariant"
+ Parameter { name: "start"; type: "QVariant" }
+ Parameter { name: "end"; type: "QVariant" }
+ }
+ Method {
+ name: "getText"
+ type: "QVariant"
+ Parameter { name: "start"; type: "QVariant" }
+ Parameter { name: "end"; type: "QVariant" }
+ }
+ Method {
+ name: "insert"
+ type: "QVariant"
+ Parameter { name: "position"; type: "QVariant" }
+ Parameter { name: "text"; type: "QVariant" }
+ }
+ Method {
+ name: "isRightToLeft"
+ type: "QVariant"
+ Parameter { name: "start"; type: "QVariant" }
+ Parameter { name: "end"; type: "QVariant" }
+ }
+ Method {
+ name: "moveCursorSelection"
+ type: "QVariant"
+ Parameter { name: "position"; type: "QVariant" }
+ Parameter { name: "mode"; type: "QVariant" }
+ }
+ Method { name: "paste"; type: "QVariant" }
+ Method {
+ name: "positionAt"
+ type: "QVariant"
+ Parameter { name: "x"; type: "QVariant" }
+ Parameter { name: "y"; type: "QVariant" }
+ }
+ Method {
+ name: "positionToRectangle"
+ type: "QVariant"
+ Parameter { name: "position"; type: "QVariant" }
+ }
+ Method { name: "redo"; type: "QVariant" }
+ Method {
+ name: "remove"
+ type: "QVariant"
+ Parameter { name: "start"; type: "QVariant" }
+ Parameter { name: "end"; type: "QVariant" }
+ }
+ Method {
+ name: "select"
+ type: "QVariant"
+ Parameter { name: "start"; type: "QVariant" }
+ Parameter { name: "end"; type: "QVariant" }
+ }
+ Method { name: "selectAll"; type: "QVariant" }
+ Method { name: "selectWord"; type: "QVariant" }
+ Method { name: "undo"; type: "QVariant" }
+ Property { name: "frameVisible"; type: "bool" }
+ Property { name: "highlightOnFocus"; type: "bool" }
+ Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
+ Property { name: "__scroller"; type: "QQuickItem"; isPointer: true }
+ Property { name: "__scrollBarTopMargin"; type: "int" }
+ Property { name: "__viewTopMargin"; type: "int" }
+ Property { name: "style"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "__style"; type: "Style_QMLTYPE_1"; 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_24"
+ isReadonly: true
+ isPointer: true
+ }
+ Property {
+ name: "__verticalScrollBar"
+ type: "ScrollBar_QMLTYPE_24"
+ isReadonly: true
+ isPointer: true
+ }
+ }
+ Component {
+ prototype: "QQuickFocusScope"
+ name: "QtQuick.Controls/TextArea 1.5"
+ exports: ["QtQuick.Controls/TextArea 1.5"]
+ exportMetaObjectRevisions: [5]
+ 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 }
+ Property { name: "canRedo"; type: "bool"; isReadonly: true }
+ 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 }
+ Property { name: "verticalAlignment"; type: "int" }
+ Property { name: "inputMethodHints"; type: "int" }
+ Property { name: "length"; type: "int"; isReadonly: true }
+ Property { name: "lineCount"; type: "int"; isReadonly: true }
+ Property { name: "readOnly"; type: "bool" }
+ Property { name: "selectedText"; type: "string"; isReadonly: true }
+ Property { name: "selectionEnd"; type: "int"; isReadonly: true }
+ Property { name: "selectionStart"; type: "int"; isReadonly: true }
+ Property { name: "text"; type: "string" }
+ Property { name: "textFormat"; type: "int" }
+ Property { name: "wrapMode"; type: "int" }
+ 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"
+ Parameter { name: "link"; type: "string" }
+ }
+ Signal {
+ name: "linkHovered"
+ Parameter { name: "link"; type: "string" }
+ }
+ Signal { name: "editingFinished" }
Method {
name: "append"
type: "QVariant"
@@ -1926,7 +2256,7 @@ 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_1"; isPointer: true }
Property { name: "horizontalScrollBarPolicy"; type: "int" }
Property { name: "verticalScrollBarPolicy"; type: "int" }
Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true }
@@ -1934,20 +2264,20 @@ Module {
Property { name: "__wheelAreaScrollSpeed"; type: "double" }
Property {
name: "__horizontalScrollBar"
- type: "ScrollBar_QMLTYPE_25"
+ type: "ScrollBar_QMLTYPE_24"
isReadonly: true
isPointer: true
}
Property {
name: "__verticalScrollBar"
- type: "ScrollBar_QMLTYPE_25"
+ type: "ScrollBar_QMLTYPE_24"
isReadonly: true
isPointer: true
}
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/TextField"
+ name: "QtQuick.Controls/TextField 1.0"
exports: ["QtQuick.Controls/TextField 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -2032,7 +2362,7 @@ Module {
}
Component {
prototype: "QQuickText"
- name: "QtQuick.Extras.Private/TextSingleton"
+ name: "QtQuick.Extras.Private/TextSingleton 1.0"
exports: ["QtQuick.Extras.Private/TextSingleton 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -2042,7 +2372,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Extras/ToggleButton"
+ name: "QtQuick.Extras/ToggleButton 1.0"
exports: ["QtQuick.Extras/ToggleButton 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -2062,8 +2392,8 @@ Module {
Property { name: "__iconOverriden"; type: "bool"; isReadonly: true }
Property { name: "__action"; type: "QQuickAction"; isPointer: true }
Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true }
- Property { name: "__effectivePressed"; type: "bool" }
Property { name: "__behavior"; type: "QVariant" }
+ Property { name: "__effectivePressed"; type: "bool" }
Property { name: "pressed"; type: "bool"; isReadonly: true }
Property { name: "hovered"; type: "bool"; isReadonly: true }
Signal { name: "clicked" }
@@ -2076,7 +2406,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/ToolBar"
+ name: "QtQuick.Controls/ToolBar 1.0"
exports: ["QtQuick.Controls/ToolBar 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -2090,7 +2420,7 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/ToolButton"
+ name: "QtQuick.Controls/ToolButton 1.0"
exports: ["QtQuick.Controls/ToolButton 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
@@ -2110,8 +2440,8 @@ Module {
Property { name: "__iconOverriden"; type: "bool"; isReadonly: true }
Property { name: "__action"; type: "QQuickAction"; isPointer: true }
Property { name: "__iconAction"; type: "QQuickAction"; isReadonly: true; isPointer: true }
- Property { name: "__effectivePressed"; type: "bool" }
Property { name: "__behavior"; type: "QVariant" }
+ Property { name: "__effectivePressed"; type: "bool" }
Property { name: "pressed"; type: "bool"; isReadonly: true }
Property { name: "hovered"; type: "bool"; isReadonly: true }
Signal { name: "clicked" }
@@ -2124,14 +2454,149 @@ Module {
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/TreeView"
+ name: "QtQuick.Controls/TreeView 1.5"
+ exports: ["QtQuick.Controls/TreeView 1.5"]
+ exportMetaObjectRevisions: [5]
+ isComposite: true
+ defaultProperty: "__columns"
+ Property { name: "model"; type: "QVariant" }
+ Property { name: "currentIndex"; type: "QVariant"; isReadonly: true }
+ Property { name: "selection"; type: "QItemSelectionModel"; isPointer: true }
+ Property { name: "rootIndex"; type: "QModelIndex" }
+ Signal {
+ name: "activated"
+ Parameter { name: "index"; type: "QVariant" }
+ }
+ Signal {
+ name: "clicked"
+ Parameter { name: "index"; type: "QVariant" }
+ }
+ Signal {
+ name: "doubleClicked"
+ Parameter { name: "index"; type: "QVariant" }
+ }
+ Signal {
+ name: "pressAndHold"
+ Parameter { name: "index"; type: "QVariant" }
+ }
+ Signal {
+ name: "expanded"
+ Parameter { name: "index"; type: "QVariant" }
+ }
+ Signal {
+ name: "collapsed"
+ Parameter { name: "index"; type: "QVariant" }
+ }
+ Method {
+ name: "isExpanded"
+ type: "QVariant"
+ Parameter { name: "index"; type: "QVariant" }
+ }
+ Method {
+ name: "collapse"
+ type: "QVariant"
+ Parameter { name: "index"; type: "QVariant" }
+ }
+ Method {
+ name: "expand"
+ type: "QVariant"
+ Parameter { name: "index"; type: "QVariant" }
+ }
+ Method {
+ name: "indexAt"
+ type: "QVariant"
+ Parameter { name: "x"; type: "QVariant" }
+ Parameter { name: "y"; type: "QVariant" }
+ }
+ Property { name: "alternatingRowColors"; type: "bool" }
+ Property { name: "headerVisible"; type: "bool" }
+ Property { name: "itemDelegate"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "rowDelegate"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "headerDelegate"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "sortIndicatorColumn"; type: "int" }
+ Property { name: "sortIndicatorVisible"; type: "bool" }
+ Property { name: "sortIndicatorOrder"; type: "int" }
+ Property { name: "selectionMode"; type: "int" }
+ Property { name: "__viewTypeName"; type: "string" }
+ Property { name: "__isTreeView"; type: "bool"; isReadonly: true }
+ Property { name: "__itemDelegateLoader"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "__model"; type: "QVariant" }
+ Property { name: "__activateItemOnSingleClick"; type: "bool" }
+ Property { name: "__mouseArea"; type: "QQuickItem"; isPointer: true }
+ Property { name: "backgroundVisible"; type: "bool" }
+ Property { name: "contentHeader"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "contentFooter"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "columnCount"; type: "int"; isReadonly: true }
+ Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true }
+ Property { name: "__columns"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "__currentRowItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "__currentRow"; type: "int" }
+ Property { name: "__listView"; type: "QQuickListView"; isReadonly: true; isPointer: true }
+ Method {
+ name: "addColumn"
+ type: "QVariant"
+ Parameter { name: "column"; type: "QVariant" }
+ }
+ Method {
+ name: "insertColumn"
+ type: "QVariant"
+ Parameter { name: "index"; type: "QVariant" }
+ Parameter { name: "column"; type: "QVariant" }
+ }
+ Method {
+ name: "removeColumn"
+ type: "QVariant"
+ Parameter { name: "index"; type: "QVariant" }
+ }
+ Method {
+ name: "moveColumn"
+ type: "QVariant"
+ Parameter { name: "from"; type: "QVariant" }
+ Parameter { name: "to"; type: "QVariant" }
+ }
+ Method {
+ name: "getColumn"
+ type: "QVariant"
+ Parameter { name: "index"; type: "QVariant" }
+ }
+ Method { name: "resizeColumnsToContents"; type: "QVariant" }
+ Property { name: "frameVisible"; type: "bool" }
+ Property { name: "highlightOnFocus"; type: "bool" }
+ Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
+ Property { name: "__scroller"; type: "QQuickItem"; isPointer: true }
+ Property { name: "__scrollBarTopMargin"; type: "int" }
+ Property { name: "__viewTopMargin"; type: "int" }
+ Property { name: "style"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "__style"; type: "Style_QMLTYPE_1"; 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_24"
+ isReadonly: true
+ isPointer: true
+ }
+ Property {
+ name: "__verticalScrollBar"
+ type: "ScrollBar_QMLTYPE_24"
+ isReadonly: true
+ isPointer: true
+ }
+ }
+ Component {
+ prototype: "QQuickFocusScope"
+ name: "QtQuick.Controls/TreeView 1.4"
exports: ["QtQuick.Controls/TreeView 1.4"]
exportMetaObjectRevisions: [4]
isComposite: true
defaultProperty: "__columns"
- Property { name: "selection"; type: "QItemSelectionModel"; isPointer: true }
Property { name: "model"; type: "QVariant" }
Property { name: "currentIndex"; type: "QVariant"; isReadonly: true }
+ Property { name: "selection"; type: "QItemSelectionModel"; isPointer: true }
+ Property { name: "rootIndex"; type: "QModelIndex" }
Signal {
name: "activated"
Parameter { name: "index"; type: "QVariant" }
@@ -2189,9 +2654,9 @@ Module {
Property { name: "__viewTypeName"; type: "string" }
Property { name: "__isTreeView"; type: "bool"; isReadonly: true }
Property { name: "__itemDelegateLoader"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "__model"; type: "QVariant" }
Property { name: "__activateItemOnSingleClick"; type: "bool" }
Property { name: "__mouseArea"; type: "QQuickItem"; isPointer: true }
- Property { name: "__model"; type: "QVariant" }
Property { name: "backgroundVisible"; type: "bool" }
Property { name: "contentHeader"; type: "QQmlComponent"; isPointer: true }
Property { name: "contentFooter"; type: "QQmlComponent"; isPointer: true }
@@ -2236,7 +2701,7 @@ 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_1"; isPointer: true }
Property { name: "horizontalScrollBarPolicy"; type: "int" }
Property { name: "verticalScrollBarPolicy"; type: "int" }
Property { name: "viewport"; type: "QQuickItem"; isReadonly: true; isPointer: true }
@@ -2244,20 +2709,20 @@ Module {
Property { name: "__wheelAreaScrollSpeed"; type: "double" }
Property {
name: "__horizontalScrollBar"
- type: "ScrollBar_QMLTYPE_25"
+ type: "ScrollBar_QMLTYPE_24"
isReadonly: true
isPointer: true
}
Property {
name: "__verticalScrollBar"
- type: "ScrollBar_QMLTYPE_25"
+ type: "ScrollBar_QMLTYPE_24"
isReadonly: true
isPointer: true
}
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Extras/Tumbler"
+ name: "QtQuick.Extras/Tumbler 1.2"
exports: ["QtQuick.Extras/Tumbler 1.2"]
exportMetaObjectRevisions: [2]
isComposite: true
@@ -2317,13 +2782,14 @@ Module {
}
Component {
prototype: "QObject"
- name: "QtQuick.Extras/TumblerColumn"
+ name: "QtQuick.Extras/TumblerColumn 1.2"
exports: ["QtQuick.Extras/TumblerColumn 1.2"]
exportMetaObjectRevisions: [2]
isComposite: true
Property { name: "__tumbler"; type: "QQuickItem"; isPointer: true }
Property { name: "__index"; type: "int" }
Property { name: "__currentIndex"; type: "int" }
+ Property { name: "model"; type: "QVariant" }
Property { name: "role"; type: "string" }
Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
Property { name: "highlight"; type: "QQmlComponent"; isPointer: true }
@@ -2331,10 +2797,12 @@ Module {
Property { name: "visible"; type: "bool" }
Property { name: "activeFocus"; type: "bool"; isReadonly: true }
Property { name: "width"; type: "double" }
- Property { name: "model"; type: "QVariant" }
Property { name: "currentIndex"; type: "int"; isReadonly: true }
}
+ //
+ // Manually added to work around QtC limitations:
+ //
Component {
name: "QQuickWindow"
defaultProperty: "data"
@@ -2581,4 +3049,5 @@ Module {
}
Method { name: "requestUpdate"; revision: 3 }
}
+
}
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp
index fec24189..84f7b1aa 100644
--- a/src/controls/qquickmenu.cpp
+++ b/src/controls/qquickmenu.cpp
@@ -266,7 +266,8 @@ QQuickMenu::QQuickMenu(QObject *parent)
m_containersCount(0),
m_xOffset(0),
m_yOffset(0),
- m_triggerCount(0)
+ m_triggerCount(0),
+ m_proxy(false)
{
connect(this, SIGNAL(__textChanged()), this, SIGNAL(titleChanged()));
@@ -593,6 +594,9 @@ void QQuickMenu::__closeAndDestroy()
void QQuickMenu::__dismissAndDestroy()
{
+ if (m_platformMenu)
+ return;
+
__dismissMenu();
destroyAllMenuPopups();
}
@@ -763,6 +767,11 @@ void QQuickMenu::clear()
m_containers.clear();
m_containersCount = 0;
+ // QTBUG-48927: a proxy menu (ApplicationWindowStyle.qml) must not
+ // delete its items, because they are owned by the menubar
+ if (m_proxy)
+ m_menuItems.clear();
+
while (!m_menuItems.empty())
delete m_menuItems.takeFirst();
m_itemsCount = 0;
diff --git a/src/controls/qquickmenu_p.h b/src/controls/qquickmenu_p.h
index 1c51fe71..f49f6d62 100644
--- a/src/controls/qquickmenu_p.h
+++ b/src/controls/qquickmenu_p.h
@@ -70,6 +70,7 @@ class QQuickMenu : public QQuickMenuText
Q_PROPERTY(qreal __yOffset READ yOffset WRITE setYOffset)
Q_PROPERTY(QQuickAction *__action READ action CONSTANT)
Q_PROPERTY(QRect __popupGeometry READ popupGeometry NOTIFY __popupGeometryChanged)
+ Q_PROPERTY(bool __isProxy READ isProxy WRITE setProxy NOTIFY __proxyChanged)
Q_ENUMS(MenuType)
public:
@@ -106,6 +107,7 @@ Q_SIGNALS:
void __popupGeometryChanged();
void menuContentItemChanged();
void minimumWidthChanged();
+ void __proxyChanged();
public:
QQuickMenu(QObject *parent = 0);
@@ -142,6 +144,9 @@ public:
QRect popupGeometry() const;
+ bool isProxy() const { return m_proxy; }
+ void setProxy(bool proxy) { if (m_proxy != proxy) { m_proxy = proxy; emit __proxyChanged(); } }
+
void prepareItemTrigger(QQuickMenuItem *);
void concludeItemTrigger(QQuickMenuItem *);
void destroyMenuPopup();
@@ -196,6 +201,7 @@ private:
qreal m_yOffset;
QFont m_font;
int m_triggerCount;
+ bool m_proxy;
};
QT_END_NAMESPACE
diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h
index 8c10f255..deb867b3 100644
--- a/src/controls/qquickmenupopupwindow_p.h
+++ b/src/controls/qquickmenupopupwindow_p.h
@@ -75,7 +75,7 @@ private:
QQuickItem *m_itemAt;
QPointF m_oldItemPos;
QPointF m_initialPos;
- QQuickWindow *m_logicalParentWindow;
+ QPointer<QQuickWindow> m_logicalParentWindow;
QQuickMenu *m_menu;
private:
diff --git a/src/controls/qquickpopupwindow.cpp b/src/controls/qquickpopupwindow.cpp
index 59cfe22b..cfab5bd5 100644
--- a/src/controls/qquickpopupwindow.cpp
+++ b/src/controls/qquickpopupwindow.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
QQuickPopupWindow::QQuickPopupWindow() :
QQuickWindow(), m_parentItem(0), m_contentItem(0),
m_mouseMoved(false), m_needsActivatedEvent(true),
- m_dismissed(false)
+ m_dismissed(false), m_pressed(false)
{
setFlags(Qt::Popup);
connect(qApp, SIGNAL(applicationStateChanged(Qt::ApplicationState)),
@@ -146,17 +146,22 @@ void QQuickPopupWindow::mouseMoveEvent(QMouseEvent *e)
{
QRect rect = QRect(QPoint(), size());
m_mouseMoved = true;
- if (rect.contains(e->pos()))
+ if (rect.contains(e->pos())) {
+ if (e->buttons() != Qt::NoButton)
+ m_pressed = true;
QQuickWindow::mouseMoveEvent(e);
+ }
else
forwardEventToTransientParent(e);
}
void QQuickPopupWindow::mousePressEvent(QMouseEvent *e)
{
+ m_pressed = true;
QRect rect = QRect(QPoint(), size());
- if (rect.contains(e->pos()))
+ if (rect.contains(e->pos())) {
QQuickWindow::mousePressEvent(e);
+ }
else
forwardEventToTransientParent(e);
}
@@ -173,8 +178,10 @@ void QQuickPopupWindow::mouseReleaseEvent(QMouseEvent *e)
}
m_mouseMoved = true; // Initial mouse release counts as move.
} else {
- forwardEventToTransientParent(e);
+ if (m_pressed)
+ forwardEventToTransientParent(e);
}
+ m_pressed = false;
}
void QQuickPopupWindow::forwardEventToTransientParent(QMouseEvent *e)
diff --git a/src/controls/qquickpopupwindow_p.h b/src/controls/qquickpopupwindow_p.h
index 617df53d..830ba382 100644
--- a/src/controls/qquickpopupwindow_p.h
+++ b/src/controls/qquickpopupwindow_p.h
@@ -88,6 +88,7 @@ private:
bool m_mouseMoved;
bool m_needsActivatedEvent;
bool m_dismissed;
+ bool m_pressed;
};
QT_END_NAMESPACE
View Lorry Controller Status