Hello community,
here is the log from the commit of package libqt5-qtquickcontrols for
openSUSE:Factory checked in at 2017-07-08 12:24:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtquickcontrols (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtquickcontrols"
Sat Jul 8 12:24:13 2017 rev:26 rq:507696 version:5.9.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtquickcontrols/libqt5-qtquickcontrols.changes
2017-06-13 16:02:51.811000098 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols.new/libqt5-qtquickcontrols.changes
2017-07-08 12:24:14.132474122 +0200
@@ -1,0 +2,7 @@
+Sat Jul 1 08:15:21 UTC 2017 - [email protected]
+
+- Update to 5.9.1
+ * For more details please see:
+ http://blog.qt.io/blog/2017/06/30/qt-5-9-1-released/
+
+-------------------------------------------------------------------
Old:
----
qtquickcontrols-opensource-src-5.9.0.tar.xz
New:
----
qtquickcontrols-opensource-src-5.9.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtquickcontrols.spec ++++++
--- /var/tmp/diff_new_pack.OqLli6/_old 2017-07-08 12:24:15.476284561 +0200
+++ /var/tmp/diff_new_pack.OqLli6/_new 2017-07-08 12:24:15.476284561 +0200
@@ -19,15 +19,15 @@
%define qt5_snapshot 0
Name: libqt5-qtquickcontrols
-Version: 5.9.0
+Version: 5.9.1
Release: 0
Summary: Qt 5 Quick Controls Addon
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: https://www.qt.io
%define base_name libqt5
-%define real_version 5.9.0
-%define so_version 5.9.0
+%define real_version 5.9.1
+%define so_version 5.9.1
%define tar_version qtquickcontrols-opensource-src-%{real_version}
Source:
https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/%{tar_version}.tar.xz
BuildRequires: fdupes
++++++ qtquickcontrols-opensource-src-5.9.0.tar.xz ->
qtquickcontrols-opensource-src-5.9.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtquickcontrols-opensource-src-5.9.0/.qmake.conf
new/qtquickcontrols-opensource-src-5.9.1/.qmake.conf
--- old/qtquickcontrols-opensource-src-5.9.0/.qmake.conf 2017-05-22
16:13:19.000000000 +0200
+++ new/qtquickcontrols-opensource-src-5.9.1/.qmake.conf 2017-06-23
11:34:43.000000000 +0200
@@ -2,4 +2,4 @@
CONFIG += warning_clean
android|ios|qnx|winrt|isEmpty(QT.widgets.name): CONFIG += no_desktop
-MODULE_VERSION = 5.9.0
+MODULE_VERSION = 5.9.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtquickcontrols-opensource-src-5.9.0/.tag
new/qtquickcontrols-opensource-src-5.9.1/.tag
--- old/qtquickcontrols-opensource-src-5.9.0/.tag 2017-05-22
16:13:19.000000000 +0200
+++ new/qtquickcontrols-opensource-src-5.9.1/.tag 2017-06-23
11:34:43.000000000 +0200
@@ -1 +1 @@
-dacb91916b202208681471ba764504c7c7d086f0
+5362d2d12970e435cc03dbd354fdd781ae666101
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/dist/changes-5.9.1
new/qtquickcontrols-opensource-src-5.9.1/dist/changes-5.9.1
--- old/qtquickcontrols-opensource-src-5.9.0/dist/changes-5.9.1 1970-01-01
01:00:00.000000000 +0100
+++ new/qtquickcontrols-opensource-src-5.9.1/dist/changes-5.9.1 2017-06-23
11:34:43.000000000 +0200
@@ -0,0 +1,35 @@
+Qt 5.9.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Controls *
+****************************************************************************
+
+ - Slider
+ * [QTBUG-47081] Fixed to not suppress updates by a drag threshold on
+ non-touch screens.
+
+****************************************************************************
+* Dialogs *
+****************************************************************************
+
+ - [QTBUG-60861] Fixed inclusion of QML files of the QtQuick Dialogs module
+ in static builds.
+ - [QTBUG-60991] Fixed support for using QtQuick Dialogs with the QML
+ compiler.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/examples/quickcontrols/controls/calendar/calendar.pro
new/qtquickcontrols-opensource-src-5.9.1/examples/quickcontrols/controls/calendar/calendar.pro
---
old/qtquickcontrols-opensource-src-5.9.0/examples/quickcontrols/controls/calendar/calendar.pro
2017-05-22 16:13:19.000000000 +0200
+++
new/qtquickcontrols-opensource-src-5.9.1/examples/quickcontrols/controls/calendar/calendar.pro
2017-06-23 11:34:43.000000000 +0200
@@ -1,8 +1,6 @@
QT += qml quick sql
TARGET = calendar
-!qtConfig(sql-sqlite): QTPLUGIN += qsqlite
-
include(src/src.pri)
include(../shared/shared.pri)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/src/controls/Private/qquickcontrolsettings.cpp
new/qtquickcontrols-opensource-src-5.9.1/src/controls/Private/qquickcontrolsettings.cpp
---
old/qtquickcontrols-opensource-src-5.9.0/src/controls/Private/qquickcontrolsettings.cpp
2017-05-22 16:13:19.000000000 +0200
+++
new/qtquickcontrols-opensource-src-5.9.1/src/controls/Private/qquickcontrolsettings.cpp
2017-06-23 11:34:43.000000000 +0200
@@ -50,7 +50,7 @@
#include <QTouchDevice>
#include <QGuiApplication>
#include <QStyleHints>
-#if defined(Q_OS_ANDROID)
+#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
#include <private/qjnihelpers_p.h>
#endif
@@ -62,7 +62,7 @@
#if defined(QT_WIDGETS_LIB) && !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID) &&
!defined(Q_OS_BLACKBERRY) && !defined(Q_OS_QNX) && !defined(Q_OS_WINRT)
if (QCoreApplication::instance()->inherits("QApplication"))
return QLatin1String("Desktop");
-#elif defined(Q_OS_ANDROID)
+#elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
if (QtAndroidPrivate::androidSdkVersion() >= 11)
return QLatin1String("Android");
#elif defined(Q_OS_IOS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/src/controls/Slider.qml
new/qtquickcontrols-opensource-src-5.9.1/src/controls/Slider.qml
--- old/qtquickcontrols-opensource-src-5.9.0/src/controls/Slider.qml
2017-05-22 16:13:19.000000000 +0200
+++ new/qtquickcontrols-opensource-src-5.9.1/src/controls/Slider.qml
2017-06-23 11:34:43.000000000 +0200
@@ -264,7 +264,7 @@
onPositionChanged: {
if (pressed)
- updateHandlePosition(mouse, preventStealing)
+ updateHandlePosition(mouse, !Settings.hasTouchScreen ||
preventStealing)
var point = mouseArea.mapToItem(fakeHandle, mouse.x, mouse.y)
handleHovered = fakeHandle.contains(Qt.point(point.x, point.y))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/src/controls/SpinBox.qml
new/qtquickcontrols-opensource-src-5.9.1/src/controls/SpinBox.qml
--- old/qtquickcontrols-opensource-src-5.9.0/src/controls/SpinBox.qml
2017-05-22 16:13:19.000000000 +0200
+++ new/qtquickcontrols-opensource-src-5.9.1/src/controls/SpinBox.qml
2017-06-23 11:34:43.000000000 +0200
@@ -273,6 +273,7 @@
Accessible.name: input.text
Accessible.role: Accessible.SpinBox
+ Accessible.editable: true
MouseArea {
id: mouseArea
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/src/controls/plugins.qmltypes
new/qtquickcontrols-opensource-src-5.9.1/src/controls/plugins.qmltypes
--- old/qtquickcontrols-opensource-src-5.9.0/src/controls/plugins.qmltypes
2017-05-22 16:13:19.000000000 +0200
+++ new/qtquickcontrols-opensource-src-5.9.1/src/controls/plugins.qmltypes
2017-06-23 11:34:43.000000000 +0200
@@ -9,7 +9,6 @@
Module {
dependencies: [
"QtGraphicalEffects 1.0",
- "QtGraphicalEffects.private 1.0",
"QtQml.Models 2.2",
"QtQuick 2.6",
"QtQuick.Controls.Styles 1.4",
@@ -19,16 +18,16 @@
"QtQuick.Window 2.2"
]
Component {
- name: "QQuickAbstractStyle"
+ name: "QQuickAbstractStyle1"
defaultProperty: "data"
prototype: "QObject"
exports: ["QtQuick.Controls.Private/AbstractStyle 1.0"]
exportMetaObjectRevisions: [0]
- Property { name: "padding"; type: "QQuickPadding"; isReadonly: true;
isPointer: true }
+ Property { name: "padding"; type: "QQuickPadding1"; isReadonly: true;
isPointer: true }
Property { name: "data"; type: "QObject"; isList: true; isReadonly:
true }
}
Component {
- name: "QQuickAction"
+ name: "QQuickAction1"
prototype: "QObject"
exports: ["QtQuick.Controls/Action 1.0"]
exportMetaObjectRevisions: [0]
@@ -40,7 +39,7 @@
Property { name: "enabled"; type: "bool" }
Property { name: "checkable"; type: "bool" }
Property { name: "checked"; type: "bool" }
- Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup";
isPointer: true }
+ Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1";
isPointer: true }
Property { name: "shortcut"; type: "QVariant" }
Signal {
name: "triggered"
@@ -67,7 +66,7 @@
Method { name: "trigger" }
}
Component {
- name: "QQuickCalendarModel"
+ name: "QQuickCalendarModel1"
prototype: "QAbstractListModel"
exports: ["QtQuick.Controls.Private/CalendarModel 1.0"]
exportMetaObjectRevisions: [0]
@@ -103,7 +102,7 @@
}
}
Component {
- name: "QQuickControlSettings"
+ name: "QQuickControlSettings1"
prototype: "QObject"
exports: ["QtQuick.Controls.Private/Settings 1.0"]
isCreatable: false
@@ -126,26 +125,26 @@
}
}
Component {
- name: "QQuickControlsPrivate"
+ name: "QQuickControlsPrivate1"
prototype: "QObject"
exports: ["QtQuick.Controls.Private/Controls 1.0"]
isCreatable: false
exportMetaObjectRevisions: [0]
- attachedType: "QQuickControlsPrivateAttached"
+ attachedType: "QQuickControlsPrivate1Attached"
}
Component {
- name: "QQuickControlsPrivateAttached"
+ name: "QQuickControlsPrivate1Attached"
prototype: "QObject"
Property { name: "window"; type: "QQuickWindow"; isReadonly: true;
isPointer: true }
}
Component {
- name: "QQuickExclusiveGroup"
+ name: "QQuickExclusiveGroup1"
defaultProperty: "__actions"
prototype: "QObject"
exports: ["QtQuick.Controls/ExclusiveGroup 1.0"]
exportMetaObjectRevisions: [0]
Property { name: "current"; type: "QObject"; isPointer: true }
- Property { name: "__actions"; type: "QQuickAction"; isList: true;
isReadonly: true }
+ Property { name: "__actions"; type: "QQuickAction1"; isList: true;
isReadonly: true }
Method {
name: "bindCheckable"
Parameter { name: "o"; type: "QObject"; isPointer: true }
@@ -156,9 +155,9 @@
}
}
Component {
- name: "QQuickMenu"
+ name: "QQuickMenu1"
defaultProperty: "items"
- prototype: "QQuickMenuText"
+ prototype: "QQuickMenuText1"
exports: ["QtQuick.Controls.Private/MenuPrivate 1.0"]
exportMetaObjectRevisions: [0]
Enum {
@@ -177,26 +176,28 @@
Property { name: "__font"; type: "QFont" }
Property { name: "__xOffset"; type: "double" }
Property { name: "__yOffset"; type: "double" }
- Property { name: "__action"; type: "QQuickAction"; isReadonly: true;
isPointer: true }
+ Property { name: "__action"; type: "QQuickAction1"; isReadonly: true;
isPointer: true }
Property { name: "__popupGeometry"; type: "QRect"; isReadonly: true }
+ Property { name: "__isProxy"; type: "bool" }
Signal { name: "aboutToShow" }
Signal { name: "aboutToHide" }
Signal { name: "popupVisibleChanged" }
Signal { name: "__menuPopupDestroyed" }
Signal { name: "menuContentItemChanged" }
Signal { name: "minimumWidthChanged" }
+ Signal { name: "__proxyChanged" }
Method { name: "__dismissMenu" }
Method { name: "__closeAndDestroy" }
Method { name: "__dismissAndDestroy" }
Method { name: "popup" }
Method {
name: "addItem"
- type: "QQuickMenuItem*"
+ type: "QQuickMenuItem1*"
Parameter { type: "string" }
}
Method {
name: "insertItem"
- type: "QQuickMenuItem*"
+ type: "QQuickMenuItem1*"
Parameter { type: "int" }
Parameter { type: "string" }
}
@@ -208,11 +209,11 @@
Method {
name: "insertItem"
Parameter { type: "int" }
- Parameter { type: "QQuickMenuBase"; isPointer: true }
+ Parameter { type: "QQuickMenuBase1"; isPointer: true }
}
Method {
name: "removeItem"
- Parameter { type: "QQuickMenuBase"; isPointer: true }
+ Parameter { type: "QQuickMenuBase1"; isPointer: true }
}
Method { name: "clear" }
Method {
@@ -232,12 +233,12 @@
}
}
Component {
- name: "QQuickMenuBar"
+ name: "QQuickMenuBar1"
defaultProperty: "menus"
prototype: "QObject"
exports: ["QtQuick.Controls.Private/MenuBarPrivate 1.0"]
exportMetaObjectRevisions: [0]
- Property { name: "menus"; type: "QQuickMenu"; isList: true;
isReadonly: true }
+ Property { name: "menus"; type: "QQuickMenu1"; isList: true;
isReadonly: true }
Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true }
Property { name: "__parentWindow"; type: "QQuickWindow"; isPointer:
true }
Property { name: "__isNative"; type: "bool" }
@@ -245,28 +246,28 @@
Signal { name: "contentItemChanged" }
}
Component {
- name: "QQuickMenuBase"
+ name: "QQuickMenuBase1"
prototype: "QObject"
exports: ["QtQuick.Controls/MenuBase 1.0"]
isCreatable: false
exportMetaObjectRevisions: [0]
Property { name: "visible"; type: "bool" }
- Property { name: "type"; type: "QQuickMenuItemType::MenuItemType";
isReadonly: true }
+ Property { name: "type"; type: "QQuickMenuItemType1::MenuItemType";
isReadonly: true }
Property { name: "__parentMenu"; type: "QObject"; isReadonly: true;
isPointer: true }
Property { name: "__isNative"; type: "bool"; isReadonly: true }
Property { name: "__visualItem"; type: "QQuickItem"; isPointer: true }
}
Component {
- name: "QQuickMenuItem"
- prototype: "QQuickMenuText"
+ name: "QQuickMenuItem1"
+ prototype: "QQuickMenuText1"
exports: ["QtQuick.Controls/MenuItem 1.0"]
exportMetaObjectRevisions: [0]
Property { name: "text"; type: "string" }
Property { name: "checkable"; type: "bool" }
Property { name: "checked"; type: "bool" }
- Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup";
isPointer: true }
+ Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1";
isPointer: true }
Property { name: "shortcut"; type: "QVariant" }
- Property { name: "action"; type: "QQuickAction"; isPointer: true }
+ Property { name: "action"; type: "QQuickAction1"; isPointer: true }
Signal { name: "triggered" }
Signal {
name: "toggled"
@@ -275,7 +276,7 @@
Method { name: "trigger" }
}
Component {
- name: "QQuickMenuItemType"
+ name: "QQuickMenuItemType1"
exports: ["QtQuick.Controls/MenuItemType 1.0"]
isCreatable: false
exportMetaObjectRevisions: [0]
@@ -290,14 +291,14 @@
}
}
Component {
- name: "QQuickMenuSeparator"
- prototype: "QQuickMenuBase"
+ name: "QQuickMenuSeparator1"
+ prototype: "QQuickMenuBase1"
exports: ["QtQuick.Controls/MenuSeparator 1.0"]
exportMetaObjectRevisions: [0]
}
Component {
- name: "QQuickMenuText"
- prototype: "QQuickMenuBase"
+ name: "QQuickMenuText1"
+ prototype: "QQuickMenuBase1"
Property { name: "enabled"; type: "bool" }
Property { name: "iconSource"; type: "QUrl" }
Property { name: "iconName"; type: "string" }
@@ -305,7 +306,7 @@
Signal { name: "__textChanged" }
}
Component {
- name: "QQuickPadding"
+ name: "QQuickPadding1"
prototype: "QObject"
exports: ["QtQuick.Controls.Private/Padding 1.0"]
exportMetaObjectRevisions: [0]
@@ -331,7 +332,7 @@
}
}
Component {
- name: "QQuickPopupWindow"
+ name: "QQuickPopupWindow1"
defaultProperty: "popupContentItem"
prototype: "QQuickWindow"
exports: ["QtQuick.Controls.Private/PopupWindow 1.0"]
@@ -344,7 +345,7 @@
Method { name: "dismissPopup" }
}
Component {
- name: "QQuickRangeModel"
+ name: "QQuickRangeModel1"
prototype: "QObject"
exports: ["QtQuick.Controls.Private/RangeModel 1.0"]
exportMetaObjectRevisions: [0]
@@ -412,7 +413,7 @@
}
}
Component {
- name: "QQuickRangedDate"
+ name: "QQuickRangedDate1"
prototype: "QObject"
exports: ["QtQuick.Controls.Private/RangedDate 1.0"]
exportMetaObjectRevisions: [0]
@@ -421,7 +422,7 @@
Property { name: "maximumDate"; type: "QDate" }
}
Component {
- name: "QQuickScenePosListener"
+ name: "QQuickScenePosListener1"
prototype: "QObject"
exports: ["QtQuick.Controls.Private/ScenePosListener 1.0"]
exportMetaObjectRevisions: [0]
@@ -430,7 +431,7 @@
Property { name: "enabled"; type: "bool" }
}
Component {
- name: "QQuickSelectionMode"
+ name: "QQuickSelectionMode1"
exports: ["QtQuick.Controls/SelectionMode 1.1"]
isCreatable: false
exportMetaObjectRevisions: [0]
@@ -446,7 +447,7 @@
}
}
Component {
- name: "QQuickSpinBoxValidator"
+ name: "QQuickSpinBoxValidator1"
prototype: "QValidator"
exports: ["QtQuick.Controls.Private/SpinBoxValidator 1.0"]
exportMetaObjectRevisions: [0]
@@ -462,7 +463,7 @@
Method { name: "decrement" }
}
Component {
- name: "QQuickStack"
+ name: "QQuickStack1"
prototype: "QObject"
exports: ["QtQuick.Controls/Stack 1.0"]
isCreatable: false
@@ -484,12 +485,12 @@
Property { name: "__view"; type: "QQuickItem"; isPointer: true }
}
Component {
- name: "QQuickStyleItem"
+ name: "QQuickStyleItem1"
defaultProperty: "data"
prototype: "QQuickItem"
exports: ["QtQuick.Controls.Private/StyleItem 1.0"]
exportMetaObjectRevisions: [0]
- Property { name: "border"; type: "QQuickPadding"; isReadonly: true;
isPointer: true }
+ Property { name: "border"; type: "QQuickPadding1"; isReadonly: true;
isPointer: true }
Property { name: "sunken"; type: "bool" }
Property { name: "raised"; type: "bool" }
Property { name: "active"; type: "bool" }
@@ -583,7 +584,7 @@
}
}
Component {
- name: "QQuickTooltip"
+ name: "QQuickTooltip1"
prototype: "QObject"
exports: ["QtQuick.Controls.Private/Tooltip 1.0"]
isCreatable: false
@@ -598,7 +599,7 @@
Method { name: "hideText" }
}
Component {
- name: "QQuickTreeModelAdaptor"
+ name: "QQuickTreeModelAdaptor1"
prototype: "QAbstractListModel"
exports: ["QtQuick.Controls.Private/TreeModelAdaptor 1.0"]
exportMetaObjectRevisions: [0]
@@ -646,7 +647,7 @@
}
}
Component {
- name: "QQuickWheelArea"
+ name: "QQuickWheelArea1"
defaultProperty: "data"
prototype: "QQuickItem"
exports: ["QtQuick.Controls.Private/WheelArea 1.0"]
@@ -661,6 +662,7 @@
Property { name: "verticalValue"; type: "double" }
Property { name: "scrollSpeed"; type: "double" }
Property { name: "active"; type: "bool" }
+ Property { name: "inverted"; type: "bool"; isReadonly: true }
Signal { name: "verticalWheelMoved" }
Signal { name: "horizontalWheelMoved" }
}
@@ -711,11 +713,11 @@
isComposite: true
defaultProperty: "data"
Property { name: "isDefault"; type: "bool" }
- Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true }
+ Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true }
Property { name: "checkable"; type: "bool" }
Property { name: "checked"; type: "bool" }
- Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup";
isPointer: true }
- Property { name: "action"; type: "QQuickAction"; isPointer: true }
+ Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1";
isPointer: true }
+ Property { name: "action"; type: "QQuickAction1"; isPointer: true }
Property { name: "activeFocusOnPress"; type: "bool" }
Property { name: "text"; type: "string" }
Property { name: "tooltip"; type: "string" }
@@ -723,8 +725,8 @@
Property { name: "iconName"; type: "string" }
Property { name: "__position"; type: "string" }
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: "__action"; type: "QQuickAction1"; isPointer: true }
+ Property { name: "__iconAction"; type: "QQuickAction1"; isReadonly:
true; isPointer: true }
Property { name: "__behavior"; type: "QVariant" }
Property { name: "__effectivePressed"; type: "bool" }
Property { name: "pressed"; type: "bool"; isReadonly: true }
@@ -751,7 +753,7 @@
Property { name: "navigationBarVisible"; type: "bool" }
Property { name: "dayOfWeekFormat"; type: "int" }
Property { name: "__locale"; type: "QVariant" }
- Property { name: "__model"; type: "QQuickCalendarModel"; isPointer:
true }
+ Property { name: "__model"; type: "QQuickCalendarModel1"; isPointer:
true }
Property { name: "selectedDate"; type: "QDate" }
Property { name: "minimumDate"; type: "QDate" }
Property { name: "maximumDate"; type: "QDate" }
@@ -811,8 +813,9 @@
Method { name: "__cycleCheckBoxStates"; type: "QVariant" }
Property { name: "checked"; type: "bool" }
Property { name: "activeFocusOnPress"; type: "bool" }
- Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup";
isPointer: true }
+ Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1";
isPointer: true }
Property { name: "text"; type: "string" }
+ Property { name: "tooltip"; type: "string" }
Property { name: "__cycleStatesHandler"; type: "QVariant" }
Property { name: "pressed"; type: "bool" }
Property { name: "hovered"; type: "bool"; isReadonly: true }
@@ -831,11 +834,11 @@
isComposite: true
defaultProperty: "data"
Property { name: "isDefault"; type: "bool" }
- Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true }
+ Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true }
Property { name: "checkable"; type: "bool" }
Property { name: "checked"; type: "bool" }
- Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup";
isPointer: true }
- Property { name: "action"; type: "QQuickAction"; isPointer: true }
+ Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1";
isPointer: true }
+ Property { name: "action"; type: "QQuickAction1"; isPointer: true }
Property { name: "activeFocusOnPress"; type: "bool" }
Property { name: "text"; type: "string" }
Property { name: "tooltip"; type: "string" }
@@ -843,8 +846,8 @@
Property { name: "iconName"; type: "string" }
Property { name: "__position"; type: "string" }
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: "__action"; type: "QQuickAction1"; isPointer: true }
+ Property { name: "__iconAction"; type: "QQuickAction1"; isReadonly:
true; isPointer: true }
Property { name: "__behavior"; type: "QVariant" }
Property { name: "__effectivePressed"; type: "bool" }
Property { name: "pressed"; type: "bool"; isReadonly: true }
@@ -1015,11 +1018,11 @@
Property { name: "progress"; type: "double"; isReadonly: true }
Signal { name: "activated" }
Property { name: "isDefault"; type: "bool" }
- Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true }
+ Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true }
Property { name: "checkable"; type: "bool" }
Property { name: "checked"; type: "bool" }
- Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup";
isPointer: true }
- Property { name: "action"; type: "QQuickAction"; isPointer: true }
+ Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1";
isPointer: true }
+ Property { name: "action"; type: "QQuickAction1"; isPointer: true }
Property { name: "activeFocusOnPress"; type: "bool" }
Property { name: "text"; type: "string" }
Property { name: "tooltip"; type: "string" }
@@ -1027,8 +1030,8 @@
Property { name: "iconName"; type: "string" }
Property { name: "__position"; type: "string" }
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: "__action"; type: "QQuickAction1"; isPointer: true }
+ Property { name: "__iconAction"; type: "QQuickAction1"; isReadonly:
true; isPointer: true }
Property { name: "__behavior"; type: "QVariant" }
Property { name: "__effectivePressed"; type: "bool" }
Property { name: "pressed"; type: "bool"; isReadonly: true }
@@ -1167,26 +1170,28 @@
Property { name: "__font"; type: "QFont" }
Property { name: "__xOffset"; type: "double" }
Property { name: "__yOffset"; type: "double" }
- Property { name: "__action"; type: "QQuickAction"; isReadonly: true;
isPointer: true }
+ Property { name: "__action"; type: "QQuickAction1"; isReadonly: true;
isPointer: true }
Property { name: "__popupGeometry"; type: "QRect"; isReadonly: true }
+ Property { name: "__isProxy"; type: "bool" }
Signal { name: "aboutToShow" }
Signal { name: "aboutToHide" }
Signal { name: "popupVisibleChanged" }
Signal { name: "__menuPopupDestroyed" }
Signal { name: "menuContentItemChanged" }
Signal { name: "minimumWidthChanged" }
+ Signal { name: "__proxyChanged" }
Method { name: "__dismissMenu" }
Method { name: "__closeAndDestroy" }
Method { name: "__dismissAndDestroy" }
Method { name: "popup" }
Method {
name: "addItem"
- type: "QQuickMenuItem*"
+ type: "QQuickMenuItem1*"
Parameter { type: "string" }
}
Method {
name: "insertItem"
- type: "QQuickMenuItem*"
+ type: "QQuickMenuItem1*"
Parameter { type: "int" }
Parameter { type: "string" }
}
@@ -1197,7 +1202,7 @@
}
Method {
name: "removeItem"
- Parameter { type: "QQuickMenuBase"; isPointer: true }
+ Parameter { type: "QQuickMenuBase1"; isPointer: true }
}
Method { name: "clear" }
Method {
@@ -1221,7 +1226,7 @@
Property { name: "__icon"; type: "QVariant"; isReadonly: true }
Signal { name: "__textChanged" }
Property { name: "visible"; type: "bool" }
- Property { name: "type"; type: "QQuickMenuItemType::MenuItemType";
isReadonly: true }
+ Property { name: "type"; type: "QQuickMenuItemType1::MenuItemType";
isReadonly: true }
Property { name: "__parentMenu"; type: "QObject"; isReadonly: true;
isPointer: true }
Property { name: "__isNative"; type: "bool"; isReadonly: true }
Property { name: "__visualItem"; type: "QQuickItem"; isPointer: true }
@@ -1236,7 +1241,7 @@
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: "menus"; type: "QQuickMenu1"; isList: true;
isReadonly: true }
Property { name: "__contentItem"; type: "QQuickItem"; isPointer: true }
Property { name: "__parentWindow"; type: "QQuickWindow"; isPointer:
true }
Property { name: "__isNative"; type: "bool" }
@@ -1256,9 +1261,9 @@
Property { name: "boundingItem"; type: "QQuickItem"; isPointer: true }
Property { name: "__protectedScope"; type: "QObject"; isPointer: true }
Property { name: "activationMode"; type: "int" }
- Property { name: "menuItems"; type: "QQuickMenuItem"; isList: true;
isReadonly: true }
+ Property { name: "menuItems"; type: "QQuickMenuItem1"; isList: true;
isReadonly: true }
Property { name: "currentIndex"; type: "int"; isReadonly: true }
- Property { name: "currentItem"; type: "QQuickMenuItem"; isReadonly:
true; isPointer: true }
+ Property { name: "currentItem"; type: "QQuickMenuItem1"; isReadonly:
true; isPointer: true }
Property { name: "__mouseThief"; type: "QQuickMouseThief"; isReadonly:
true; isPointer: true }
Method {
name: "popup"
@@ -1333,8 +1338,9 @@
defaultProperty: "data"
Property { name: "checked"; type: "bool" }
Property { name: "activeFocusOnPress"; type: "bool" }
- Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup";
isPointer: true }
+ Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1";
isPointer: true }
Property { name: "text"; type: "string" }
+ Property { name: "tooltip"; type: "string" }
Property { name: "__cycleStatesHandler"; type: "QVariant" }
Property { name: "pressed"; type: "bool" }
Property { name: "hovered"; type: "bool"; isReadonly: true }
@@ -1355,7 +1361,6 @@
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 }
@@ -1364,16 +1369,23 @@
Property { name: "verticalScrollBarPolicy"; type: "int" }
Property { name: "viewport"; type: "QQuickItem"; isReadonly: true;
isPointer: true }
Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly:
true; isPointer: true }
+ Property {
+ name: "__scroller"
+ type: "ScrollViewHelper_QMLTYPE_26"
+ isReadonly: true
+ isPointer: true
+ }
+ Property { name: "__verticalScrollbarOffset"; type: "int" }
Property { name: "__wheelAreaScrollSpeed"; type: "double" }
Property {
name: "__horizontalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
Property {
name: "__verticalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
@@ -1630,7 +1642,7 @@
defaultProperty: "data"
Property { name: "checked"; type: "bool" }
Property { name: "activeFocusOnPress"; type: "bool" }
- Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup";
isPointer: true }
+ Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1";
isPointer: true }
Property { name: "pressed"; type: "bool"; isReadonly: true }
Signal { name: "clicked" }
Property { name: "style"; type: "QQmlComponent"; isPointer: true }
@@ -1720,7 +1732,7 @@
Property { name: "currentRow"; type: "int" }
Property {
name: "selection"
- type: "TableViewSelection_QMLTYPE_281"
+ type: "TableViewSelection_QMLTYPE_257"
isReadonly: true
isPointer: true
}
@@ -1807,7 +1819,6 @@
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 }
@@ -1816,16 +1827,23 @@
Property { name: "verticalScrollBarPolicy"; type: "int" }
Property { name: "viewport"; type: "QQuickItem"; isReadonly: true;
isPointer: true }
Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly:
true; isPointer: true }
+ Property {
+ name: "__scroller"
+ type: "ScrollViewHelper_QMLTYPE_26"
+ isReadonly: true
+ isPointer: true
+ }
+ Property { name: "__verticalScrollbarOffset"; type: "int" }
Property { name: "__wheelAreaScrollSpeed"; type: "double" }
Property {
name: "__horizontalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
Property {
name: "__verticalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
@@ -1851,9 +1869,9 @@
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/TextArea 1.3"
- exports: ["QtQuick.Controls/TextArea 1.3"]
- exportMetaObjectRevisions: [3]
+ name: "QtQuick.Controls/TextArea 1.0"
+ exports: ["QtQuick.Controls/TextArea 1.0"]
+ exportMetaObjectRevisions: [0]
isComposite: true
defaultProperty: "data"
Property { name: "inputMethodComposing"; type: "bool"; isReadonly:
true }
@@ -1968,7 +1986,6 @@
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 }
@@ -1977,25 +1994,32 @@
Property { name: "verticalScrollBarPolicy"; type: "int" }
Property { name: "viewport"; type: "QQuickItem"; isReadonly: true;
isPointer: true }
Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly:
true; isPointer: true }
+ Property {
+ name: "__scroller"
+ type: "ScrollViewHelper_QMLTYPE_26"
+ isReadonly: true
+ isPointer: true
+ }
+ Property { name: "__verticalScrollbarOffset"; type: "int" }
Property { name: "__wheelAreaScrollSpeed"; type: "double" }
Property {
name: "__horizontalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
Property {
name: "__verticalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/TextArea 1.0"
- exports: ["QtQuick.Controls/TextArea 1.0"]
- exportMetaObjectRevisions: [0]
+ name: "QtQuick.Controls/TextArea 1.3"
+ exports: ["QtQuick.Controls/TextArea 1.3"]
+ exportMetaObjectRevisions: [3]
isComposite: true
defaultProperty: "data"
Property { name: "inputMethodComposing"; type: "bool"; isReadonly:
true }
@@ -2110,7 +2134,6 @@
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 }
@@ -2119,16 +2142,23 @@
Property { name: "verticalScrollBarPolicy"; type: "int" }
Property { name: "viewport"; type: "QQuickItem"; isReadonly: true;
isPointer: true }
Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly:
true; isPointer: true }
+ Property {
+ name: "__scroller"
+ type: "ScrollViewHelper_QMLTYPE_26"
+ isReadonly: true
+ isPointer: true
+ }
+ Property { name: "__verticalScrollbarOffset"; type: "int" }
Property { name: "__wheelAreaScrollSpeed"; type: "double" }
Property {
name: "__horizontalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
Property {
name: "__verticalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
@@ -2252,7 +2282,6 @@
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 }
@@ -2261,16 +2290,23 @@
Property { name: "verticalScrollBarPolicy"; type: "int" }
Property { name: "viewport"; type: "QQuickItem"; isReadonly: true;
isPointer: true }
Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly:
true; isPointer: true }
+ Property {
+ name: "__scroller"
+ type: "ScrollViewHelper_QMLTYPE_26"
+ isReadonly: true
+ isPointer: true
+ }
+ Property { name: "__verticalScrollbarOffset"; type: "int" }
Property { name: "__wheelAreaScrollSpeed"; type: "double" }
Property {
name: "__horizontalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
Property {
name: "__verticalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
@@ -2378,11 +2414,11 @@
isComposite: true
defaultProperty: "data"
Property { name: "isDefault"; type: "bool" }
- Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true }
+ Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true }
Property { name: "checkable"; type: "bool" }
Property { name: "checked"; type: "bool" }
- Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup";
isPointer: true }
- Property { name: "action"; type: "QQuickAction"; isPointer: true }
+ Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1";
isPointer: true }
+ Property { name: "action"; type: "QQuickAction1"; isPointer: true }
Property { name: "activeFocusOnPress"; type: "bool" }
Property { name: "text"; type: "string" }
Property { name: "tooltip"; type: "string" }
@@ -2390,8 +2426,8 @@
Property { name: "iconName"; type: "string" }
Property { name: "__position"; type: "string" }
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: "__action"; type: "QQuickAction1"; isPointer: true }
+ Property { name: "__iconAction"; type: "QQuickAction1"; isReadonly:
true; isPointer: true }
Property { name: "__behavior"; type: "QVariant" }
Property { name: "__effectivePressed"; type: "bool" }
Property { name: "pressed"; type: "bool"; isReadonly: true }
@@ -2426,11 +2462,11 @@
isComposite: true
defaultProperty: "data"
Property { name: "isDefault"; type: "bool" }
- Property { name: "menu"; type: "Menu_QMLTYPE_50"; isPointer: true }
+ Property { name: "menu"; type: "Menu_QMLTYPE_48"; isPointer: true }
Property { name: "checkable"; type: "bool" }
Property { name: "checked"; type: "bool" }
- Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup";
isPointer: true }
- Property { name: "action"; type: "QQuickAction"; isPointer: true }
+ Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1";
isPointer: true }
+ Property { name: "action"; type: "QQuickAction1"; isPointer: true }
Property { name: "activeFocusOnPress"; type: "bool" }
Property { name: "text"; type: "string" }
Property { name: "tooltip"; type: "string" }
@@ -2438,8 +2474,8 @@
Property { name: "iconName"; type: "string" }
Property { name: "__position"; type: "string" }
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: "__action"; type: "QQuickAction1"; isPointer: true }
+ Property { name: "__iconAction"; type: "QQuickAction1"; isReadonly:
true; isPointer: true }
Property { name: "__behavior"; type: "QVariant" }
Property { name: "__effectivePressed"; type: "bool" }
Property { name: "pressed"; type: "bool"; isReadonly: true }
@@ -2454,9 +2490,9 @@
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/TreeView 1.5"
- exports: ["QtQuick.Controls/TreeView 1.5"]
- exportMetaObjectRevisions: [5]
+ name: "QtQuick.Controls/TreeView 1.4"
+ exports: ["QtQuick.Controls/TreeView 1.4"]
+ exportMetaObjectRevisions: [4]
isComposite: true
defaultProperty: "__columns"
Property { name: "model"; type: "QVariant" }
@@ -2563,7 +2599,6 @@
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 }
@@ -2572,25 +2607,32 @@
Property { name: "verticalScrollBarPolicy"; type: "int" }
Property { name: "viewport"; type: "QQuickItem"; isReadonly: true;
isPointer: true }
Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly:
true; isPointer: true }
+ Property {
+ name: "__scroller"
+ type: "ScrollViewHelper_QMLTYPE_26"
+ isReadonly: true
+ isPointer: true
+ }
+ Property { name: "__verticalScrollbarOffset"; type: "int" }
Property { name: "__wheelAreaScrollSpeed"; type: "double" }
Property {
name: "__horizontalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
Property {
name: "__verticalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
}
Component {
prototype: "QQuickFocusScope"
- name: "QtQuick.Controls/TreeView 1.4"
- exports: ["QtQuick.Controls/TreeView 1.4"]
- exportMetaObjectRevisions: [4]
+ name: "QtQuick.Controls/TreeView 1.5"
+ exports: ["QtQuick.Controls/TreeView 1.5"]
+ exportMetaObjectRevisions: [5]
isComposite: true
defaultProperty: "__columns"
Property { name: "model"; type: "QVariant" }
@@ -2697,7 +2739,6 @@
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 }
@@ -2706,16 +2747,23 @@
Property { name: "verticalScrollBarPolicy"; type: "int" }
Property { name: "viewport"; type: "QQuickItem"; isReadonly: true;
isPointer: true }
Property { name: "flickableItem"; type: "QQuickFlickable"; isReadonly:
true; isPointer: true }
+ Property {
+ name: "__scroller"
+ type: "ScrollViewHelper_QMLTYPE_26"
+ isReadonly: true
+ isPointer: true
+ }
+ Property { name: "__verticalScrollbarOffset"; type: "int" }
Property { name: "__wheelAreaScrollSpeed"; type: "double" }
Property {
name: "__horizontalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
Property {
name: "__verticalScrollBar"
- type: "ScrollBar_QMLTYPE_24"
+ type: "ScrollBar_QMLTYPE_22"
isReadonly: true
isPointer: true
}
@@ -2752,6 +2800,7 @@
type: "QVariant"
Parameter { name: "columnIndex"; type: "QVariant" }
Parameter { name: "itemIndex"; type: "QVariant" }
+ Parameter { name: "interval"; type: "QVariant" }
}
Method {
name: "getColumn"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/src/dialogs/dialogs.pro
new/qtquickcontrols-opensource-src-5.9.1/src/dialogs/dialogs.pro
--- old/qtquickcontrols-opensource-src-5.9.0/src/dialogs/dialogs.pro
2017-05-22 16:13:19.000000000 +0200
+++ new/qtquickcontrols-opensource-src-5.9.1/src/dialogs/dialogs.pro
2017-06-23 11:34:43.000000000 +0200
@@ -7,12 +7,6 @@
QMAKE_DOCS = $$PWD/doc/qtquickdialogs.qdocconf
-qtquickcompiler {
- DEFINES += ALWAYS_LOAD_FROM_RESOURCES
-} else {
- !static: CONFIG += qmlcache
-}
-
SOURCES += \
qquickabstractmessagedialog.cpp \
qquickplatformmessagedialog.cpp \
@@ -86,4 +80,13 @@
QML_FILES += $$DIALOGS_QML_FILES
+qtquickcompiler {
+ DEFINES += ALWAYS_LOAD_FROM_RESOURCES
+ dialogs.files = $$QML_FILES
+ dialogs.prefix = /QtQuick/Dialogs
+ RESOURCES += dialogs
+} else {
+ !static: CONFIG += qmlcache
+}
+
load(qml_plugin)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/tests/auto/controls/data/tst_slider.qml
new/qtquickcontrols-opensource-src-5.9.1/tests/auto/controls/data/tst_slider.qml
---
old/qtquickcontrols-opensource-src-5.9.0/tests/auto/controls/data/tst_slider.qml
2017-05-22 16:13:19.000000000 +0200
+++
new/qtquickcontrols-opensource-src-5.9.1/tests/auto/controls/data/tst_slider.qml
2017-06-23 11:34:43.000000000 +0200
@@ -339,7 +339,7 @@
// drag less than the threshold distance
mouseMove(control, pt.x + Settings.dragThreshold - 1, pt.y)
- compare(control.value, 0.5)
+ verify(control.value > 0.5)
// drag over the threshold
mouseMove(control, pt.x + Settings.dragThreshold + 1, pt.y)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/benchmarks.pro
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/benchmarks.pro
--- old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/benchmarks.pro
2017-05-22 16:13:19.000000000 +0200
+++ new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/benchmarks.pro
2017-06-23 11:34:43.000000000 +0200
@@ -1,4 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = \
objectcount \
- statusindicator
+ statusindicator \
+ startup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/objectcount/objectcount.pro
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/objectcount/objectcount.pro
---
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/objectcount/objectcount.pro
2017-05-22 16:13:19.000000000 +0200
+++
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/objectcount/objectcount.pro
2017-06-23 11:34:43.000000000 +0200
@@ -2,7 +2,7 @@
TARGET = tst_objectcount
QT += quick testlib core-private
-CONFIG += testcase
+CONFIG += benchmark
osx:CONFIG -= app_bundle
SOURCES += \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/startup/gallery.qrc
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/startup/gallery.qrc
---
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/startup/gallery.qrc
1970-01-01 01:00:00.000000000 +0100
+++
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/startup/gallery.qrc
2017-06-23 11:34:43.000000000 +0200
@@ -0,0 +1,13 @@
+<RCC>
+ <qresource prefix="/">
+ <file>timer.qml</file>
+ <file
alias="main.qml">../../../examples/quickcontrols/controls/gallery/main.qml</file>
+ <file
alias="qml/ButtonPage.qml">../../../examples/quickcontrols/controls/gallery/qml/ButtonPage.qml</file>
+ <file
alias="qml/InputPage.qml">../../../examples/quickcontrols/controls/gallery/qml/InputPage.qml</file>
+ <file
alias="qml/ProgressPage.qml">../../../examples/quickcontrols/controls/gallery/qml/ProgressPage.qml</file>
+ <file
alias="qml/UI.js">../../../examples/quickcontrols/controls/gallery/qml/UI.js</file>
+ <file
alias="+android/UI.js">../../../examples/quickcontrols/controls/gallery/qml/+android/UI.js</file>
+ <file
alias="+ios/UI.js">../../../examples/quickcontrols/controls/gallery/qml/+ios/UI.js</file>
+ <file
alias="+osx/UI.js">../../../examples/quickcontrols/controls/gallery/qml/+osx/UI.js</file>
+ </qresource>
+</RCC>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/startup/startup.pro
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/startup/startup.pro
---
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/startup/startup.pro
1970-01-01 01:00:00.000000000 +0100
+++
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/startup/startup.pro
2017-06-23 11:34:43.000000000 +0200
@@ -0,0 +1,13 @@
+TEMPLATE = app
+TARGET = tst_startup
+
+CONFIG += console
+macos:CONFIG -= app_bundle
+
+SOURCES += \
+ startup_bench.cpp
+
+RESOURCES += \
+ gallery.qrc
+
+include(../../../examples/quickcontrols/controls/shared/shared.pri)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/startup/startup_bench.cpp
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/startup/startup_bench.cpp
---
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/startup/startup_bench.cpp
1970-01-01 01:00:00.000000000 +0100
+++
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/startup/startup_bench.cpp
2017-06-23 11:34:43.000000000 +0200
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtquickcontrolsapplication.h"
+#include <QtQml/QQmlApplicationEngine>
+#include <QtCore/QElapsedTimer>
+#include <functional>
+
+int runBenchmark(std::function<int()> f) {
+ {
+ QElapsedTimer t;
+ t.start();
+ int r = f();
+ if (r == 0)
+ printf("%d,", static_cast<int>(t.elapsed()));
+ else
+ return r;
+ }
+
+ {
+ QElapsedTimer t;
+ t.start();
+ int r = f();
+ if (r == 0)
+ printf("%d\n", static_cast<int>(t.elapsed()));
+ else
+ return r;
+ }
+
+ return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+ QtQuickControlsApplication app(argc, argv);
+
+ auto startup = [&app]() {
+ QQmlApplicationEngine engine(QUrl("qrc:/main.qml"));
+ QObject::connect(&engine, &QQmlApplicationEngine::quit,
+ QCoreApplication::instance(),
&QCoreApplication::quit);
+ engine.load(QUrl("qrc:/timer.qml"));
+ if (engine.rootObjects().size() != 2)
+ return -1;
+ return app.exec();
+ };
+
+ return runBenchmark(startup);
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/startup/timer.qml
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/startup/timer.qml
--- old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/startup/timer.qml
1970-01-01 01:00:00.000000000 +0100
+++ new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/startup/timer.qml
2017-06-23 11:34:43.000000000 +0200
@@ -0,0 +1,7 @@
+import QtQuick 2.2
+
+Timer {
+ running: true
+ interval: 0
+ onTriggered: Qt.quit();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/statusindicator/statusindicator.pro
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/statusindicator/statusindicator.pro
---
old/qtquickcontrols-opensource-src-5.9.0/tests/benchmarks/statusindicator/statusindicator.pro
2017-05-22 16:13:19.000000000 +0200
+++
new/qtquickcontrols-opensource-src-5.9.1/tests/benchmarks/statusindicator/statusindicator.pro
2017-06-23 11:34:43.000000000 +0200
@@ -1,6 +1,7 @@
TEMPLATE = app
TARGET = tst_bench_statusindicator
QT = core quick testlib
+CONFIG += benchmark
SOURCES += \
tst_statusindicator.cpp
