From edc24e3cd75eaf02a587f50b14dbd0288447179d Mon Sep 17 00:00:00 2001 From: Jason Erb Date: Wed, 30 Mar 2016 12:50:16 -0400 Subject: Fix "Unable to assign Object to QString" warning Change-Id: Ic219be7b90cbcde8fcc6a2e4d4a598a5d38b1d47 Task-number: QTBUG-47539 Reviewed-by: J-P Nurmi --- src/controls/Styles/Base/BasicTableViewStyle.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controls/Styles/Base/BasicTableViewStyle.qml b/src/controls/Styles/Base/BasicTableViewStyle.qml index 233d8efc..334ee665 100644 --- a/src/controls/Styles/Base/BasicTableViewStyle.qml +++ b/src/controls/Styles/Base/BasicTableViewStyle.qml @@ -146,7 +146,7 @@ ScrollViewStyle { anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: 1 elide: styleData.elideMode - text: styleData.value !== undefined ? styleData.value : "" + text: styleData.value !== undefined ? styleData.value.toString() : "" color: styleData.textColor renderType: Settings.isMobile ? Text.QtRendering : Text.NativeRendering } -- cgit v1.2.1 From 58bea5210dff23e0e125e91e94e1f933d8329521 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 3 Apr 2017 10:07:48 +0200 Subject: Remove spurious Q_INIT_RESOURCE calls These explicit resource initialization calls are only needed when linking statically. Change-Id: I5518e1b32d4fc7c1d03d35dd15bf3ce65d5eafcf Reviewed-by: Andy Shaw Reviewed-by: J-P Nurmi --- src/controls/plugin.cpp | 2 -- src/dialogs/plugin.cpp | 2 -- src/extras/plugin.cpp | 4 +--- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index 8a79cbe3..bac0d64d 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -75,8 +75,6 @@ static void initResources() { #ifdef QT_STATIC Q_INIT_RESOURCE(qmake_QtQuick_Controls); -#else - Q_INIT_RESOURCE(controls); #endif } diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 5a13bc9b..a2fb1099 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -66,8 +66,6 @@ static void initResources() { #ifdef QT_STATIC Q_INIT_RESOURCE(qmake_QtQuick_Dialogs); -#else - Q_INIT_RESOURCE(dialogs); #endif } diff --git a/src/extras/plugin.cpp b/src/extras/plugin.cpp index a9e23321..2f58510b 100644 --- a/src/extras/plugin.cpp +++ b/src/extras/plugin.cpp @@ -50,9 +50,7 @@ static void initResources() { -#ifndef QT_STATIC - Q_INIT_RESOURCE(extras); -#else +#ifdef QT_STATIC Q_INIT_RESOURCE(qmake_QtQuick_Extras); #endif } -- cgit v1.2.1 From da9183da38513d5531af3753d14d040991e04132 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 3 Apr 2017 11:41:33 +0200 Subject: Remove qrc based default qml distribution for QQC extras This is consistent with the other modules and prepares for the use of qml caching. Change-Id: Ifab9187ac60a52d0464c5afe46772a9da1489c73 Reviewed-by: J-P Nurmi --- src/extras/extras.pro | 5 +---- src/extras/extras.qrc | 19 ------------------- src/extras/plugin.cpp | 4 ++-- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 src/extras/extras.qrc diff --git a/src/extras/extras.pro b/src/extras/extras.pro index ab2f69cd..3604044d 100644 --- a/src/extras/extras.pro +++ b/src/extras/extras.pro @@ -8,7 +8,7 @@ QT += qml QMAKE_DOCS = $$PWD/doc/qtquickextras.qdocconf -CONTROLS_QML_FILES = \ +QML_FILES += \ CircularGauge.qml \ DelayButton.qml \ Dial.qml \ @@ -30,9 +30,6 @@ include(designer/designer.pri) OTHER_FILES += doc/src/* -!static:RESOURCES += extras.qrc -else: QML_FILES += $$CONTROLS_QML_FILES - TR_EXCLUDE += designer/* CONFIG += no_cxx_module diff --git a/src/extras/extras.qrc b/src/extras/extras.qrc deleted file mode 100644 index fcb8da57..00000000 --- a/src/extras/extras.qrc +++ /dev/null @@ -1,19 +0,0 @@ - - - StatusIndicator.qml - ToggleButton.qml - Tumbler.qml - PieMenu.qml - Gauge.qml - Dial.qml - CircularGauge.qml - TumblerColumn.qml - DelayButton.qml - Private/CircularButton.qml - Private/Handle.qml - Private/PieMenuIcon.qml - Private/CircularButtonStyleHelper.qml - Private/CircularTickmarkLabel.qml - Private/TextSingleton.qml - - diff --git a/src/extras/plugin.cpp b/src/extras/plugin.cpp index 2f58510b..5133a4ac 100644 --- a/src/extras/plugin.cpp +++ b/src/extras/plugin.cpp @@ -73,7 +73,7 @@ QtQuickExtrasPlugin::QtQuickExtrasPlugin(QObject *parent) : void QtQuickExtrasPlugin::registerTypes(const char *uri) { #ifndef QT_STATIC - const QString prefix = "qrc:///ExtrasImports/QtQuick/Extras"; + const QString prefix = baseUrl().toString(); #else const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Extras"; #endif @@ -111,7 +111,7 @@ void QtQuickExtrasPlugin::initializeEngine(QQmlEngine *engine, const char *uri) qmlRegisterSingletonType("QtQuick.Extras.Private.CppUtils", 1, 0, "MathUtils", registerMathUtilsSingleton); #ifndef QT_STATIC - const QString prefix = "qrc:///ExtrasImports/QtQuick/Extras"; + const QString prefix = baseUrl().toString(); #else const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Extras"; #endif -- cgit v1.2.1 From 378bd7b4454a5a049072ae1043981984f30e8329 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Tue, 21 Mar 2017 16:34:48 +0100 Subject: Add NOTIFY signals for WheelArea the private WheelArea component didn't have any notify signals in its horizontalValue/verticalValue or minimum/maximum values as well. this caused old values to be used in ScrollView.qml. If we want to have a listView that starts scrolled right when instanced, verticalMaximumValue won't be updated when the list is populated. Also, the wheelArea.verticalValue that's assigned at the beginning will be constrained by the wrong verticalMaximumValue, causing it to go out of sync with contentY. At this point the first time the mouse wheel is moved, the list will jump back at the top. Change-Id: I4605000636be7975ba9a58e2c79e8c2351e5a292 Task-number: QTBUG-59633 Reviewed-by: Frederik Gladhorn --- src/controls/Private/qquickwheelarea.cpp | 16 ++++++++++++++++ src/controls/Private/qquickwheelarea_p.h | 16 ++++++++++------ src/controls/ScrollView.qml | 12 ++++++++++++ 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/controls/Private/qquickwheelarea.cpp b/src/controls/Private/qquickwheelarea.cpp index 9c0a70a2..bd77ae24 100644 --- a/src/controls/Private/qquickwheelarea.cpp +++ b/src/controls/Private/qquickwheelarea.cpp @@ -141,7 +141,11 @@ void QQuickWheelArea1::wheelEvent(QWheelEvent *we) void QQuickWheelArea1::setHorizontalMinimumValue(qreal value) { + if (value == m_horizontalMinimumValue) + return; + m_horizontalMinimumValue = value; + emit horizontalMinimumValueChanged(); } qreal QQuickWheelArea1::horizontalMinimumValue() const @@ -151,7 +155,11 @@ qreal QQuickWheelArea1::horizontalMinimumValue() const void QQuickWheelArea1::setHorizontalMaximumValue(qreal value) { + if (value == m_horizontalMaximumValue) + return; + m_horizontalMaximumValue = value; + emit horizontalMaximumValueChanged(); } qreal QQuickWheelArea1::horizontalMaximumValue() const @@ -161,7 +169,11 @@ qreal QQuickWheelArea1::horizontalMaximumValue() const void QQuickWheelArea1::setVerticalMinimumValue(qreal value) { + if (value == m_verticalMinimumValue) + return; + m_verticalMinimumValue = value; + emit verticalMinimumValueChanged(); } qreal QQuickWheelArea1::verticalMinimumValue() const @@ -171,7 +183,11 @@ qreal QQuickWheelArea1::verticalMinimumValue() const void QQuickWheelArea1::setVerticalMaximumValue(qreal value) { + if (value == m_verticalMaximumValue) + return; + m_verticalMaximumValue = value; + emit verticalMaximumValueChanged(); } qreal QQuickWheelArea1::verticalMaximumValue() const diff --git a/src/controls/Private/qquickwheelarea_p.h b/src/controls/Private/qquickwheelarea_p.h index 676383bc..a11b78cf 100644 --- a/src/controls/Private/qquickwheelarea_p.h +++ b/src/controls/Private/qquickwheelarea_p.h @@ -50,12 +50,12 @@ class QQuickWheelArea1 : public QQuickItem Q_OBJECT Q_PROPERTY(qreal verticalDelta READ verticalDelta WRITE setVerticalDelta NOTIFY verticalWheelMoved) Q_PROPERTY(qreal horizontalDelta READ horizontalDelta WRITE setHorizontalDelta NOTIFY horizontalWheelMoved) - Q_PROPERTY(qreal horizontalMinimumValue READ horizontalMinimumValue WRITE setHorizontalMinimumValue) - Q_PROPERTY(qreal horizontalMaximumValue READ horizontalMaximumValue WRITE setHorizontalMaximumValue) - Q_PROPERTY(qreal verticalMinimumValue READ verticalMinimumValue WRITE setVerticalMinimumValue) - Q_PROPERTY(qreal verticalMaximumValue READ verticalMaximumValue WRITE setVerticalMaximumValue) - Q_PROPERTY(qreal horizontalValue READ horizontalValue WRITE setHorizontalValue) - Q_PROPERTY(qreal verticalValue READ verticalValue WRITE setVerticalValue) + Q_PROPERTY(qreal horizontalMinimumValue READ horizontalMinimumValue WRITE setHorizontalMinimumValue NOTIFY horizontalMinimumValueChanged) + Q_PROPERTY(qreal horizontalMaximumValue READ horizontalMaximumValue WRITE setHorizontalMaximumValue NOTIFY horizontalMaximumValueChanged) + Q_PROPERTY(qreal verticalMinimumValue READ verticalMinimumValue WRITE setVerticalMinimumValue NOTIFY verticalMinimumValueChanged) + Q_PROPERTY(qreal verticalMaximumValue READ verticalMaximumValue WRITE setVerticalMaximumValue NOTIFY verticalMaximumValueChanged) + Q_PROPERTY(qreal horizontalValue READ horizontalValue WRITE setHorizontalValue NOTIFY horizontalValueChanged) + Q_PROPERTY(qreal verticalValue READ verticalValue WRITE setVerticalValue NOTIFY verticalValueChanged) Q_PROPERTY(qreal scrollSpeed READ scrollSpeed WRITE setScrollSpeed NOTIFY scrollSpeedChanged) Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) Q_PROPERTY(bool inverted READ isInverted) @@ -106,7 +106,11 @@ public: Q_SIGNALS: void verticalValueChanged(); + void verticalMinimumValueChanged(); + void verticalMaximumValueChanged(); void horizontalValueChanged(); + void horizontalMinimumValueChanged(); + void horizontalMaximumValueChanged(); void verticalWheelMoved(); void horizontalWheelMoved(); void scrollSpeedChanged(); diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index 183991ac..3a7b031f 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -281,9 +281,21 @@ FocusScope { horizontalMinimumValue: 0 horizontalMaximumValue: flickableItem ? flickableItem.contentWidth - viewport.width : 0 + onHorizontalMaximumValueChanged: { + wheelArea.horizontalRecursionGuard = true + //if horizontalMaximumValue changed, horizontalValue may be actually synced with + wheelArea.horizontalValue = flickableItem.contentX - flickableItem.originX; + wheelArea.horizontalRecursionGuard = false + } verticalMinimumValue: 0 verticalMaximumValue: flickableItem ? flickableItem.contentHeight - viewport.height + __viewTopMargin : 0 + onVerticalMaximumValueChanged: { + wheelArea.verticalRecursionGuard = true + //if verticalMaximumValue changed, verticalValue may be actually synced with + wheelArea.verticalValue = flickableItem.contentY - flickableItem.originY; + wheelArea.verticalRecursionGuard = false + } // The default scroll speed for typical angle-based mouse wheels. The value // comes originally from QTextEdit, which sets 20px steps by default, as well as -- cgit v1.2.1 From 751f08cf46f505980b8ebe9a228a6c229b470152 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 7 Mar 2017 12:00:08 +0100 Subject: Enable the use of QML caching at build time Task-number: QTBUG-58571 Change-Id: I11c9dfb4e0fad93b2961db4213f934eca7d214df Reviewed-by: Mitch Curtis Reviewed-by: J-P Nurmi --- src/controls/controls.pro | 10 +++++++--- src/dialogs/dialogs.pro | 8 ++++++-- src/extras/extras.pro | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 63d055d6..5f40c0a3 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -40,8 +40,12 @@ CONTROLS_QML_FILES = \ ToolBar.qml \ ToolButton.qml -!qtquickcompiler: QML_FILES += $$CONTROLS_QML_FILES -qtquickcompiler: DEFINES += ALWAYS_LOAD_FROM_RESOURCES +qtquickcompiler { + DEFINES += ALWAYS_LOAD_FROM_RESOURCES +} else { + QML_FILES += $$CONTROLS_QML_FILES + !static: CONFIG += qmlcache +} SOURCES += $$PWD/plugin.cpp HEADERS += $$PWD/plugin.h @@ -55,7 +59,7 @@ include(Shaders/shaders.pri) osx: LIBS_PRIVATE += -framework Carbon -!static { +!qmlcache { # Create the resource file GENERATED_RESOURCE_FILE = $$OUT_PWD/controls.qrc diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro index f19283f2..e5cc7d79 100644 --- a/src/dialogs/dialogs.pro +++ b/src/dialogs/dialogs.pro @@ -7,7 +7,11 @@ IMPORT_VERSION = 1.2 QMAKE_DOCS = $$PWD/doc/qtquickdialogs.qdocconf -qtquickcompiler: DEFINES += ALWAYS_LOAD_FROM_RESOURCES +qtquickcompiler { + DEFINES += ALWAYS_LOAD_FROM_RESOURCES +} else { + !static: CONFIG += qmlcache +} SOURCES += \ qquickabstractmessagedialog.cpp \ @@ -80,7 +84,7 @@ ios|android|blackberry|winrt { QT += quick-private gui gui-private core core-private qml qml-private -!static { +!qmlcache { # Create the resource file GENERATED_RESOURCE_FILE = $$OUT_PWD/dialogs.qrc diff --git a/src/extras/extras.pro b/src/extras/extras.pro index 3604044d..d357f445 100644 --- a/src/extras/extras.pro +++ b/src/extras/extras.pro @@ -28,6 +28,8 @@ SOURCES += plugin.cpp \ include(Private/private.pri) include(designer/designer.pri) +!static: CONFIG += qmlcache + OTHER_FILES += doc/src/* TR_EXCLUDE += designer/* -- cgit v1.2.1 From 293dee361a8483aaa5bc3de49b896f012f1b337d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 10 Apr 2017 21:25:20 +0200 Subject: Connect to QQuickWindow::visibleChanged using QObject member syntax To disambiguate from QWindow::visibleChanged. Otherwise we get a warning at runtime: QMetaObject::indexOfSignal: signal visibleChanged(bool) from QQuickWindow redefined in QQuickWindowQmlImpl Change-Id: I95f984cface59cd7ec5710235959a1054b26275a Reviewed-by: Shawn Rutledge --- src/dialogs/qquickabstractdialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dialogs/qquickabstractdialog.cpp b/src/dialogs/qquickabstractdialog.cpp index 65237652..ce87d56c 100644 --- a/src/dialogs/qquickabstractdialog.cpp +++ b/src/dialogs/qquickabstractdialog.cpp @@ -187,7 +187,7 @@ void QQuickAbstractDialog::setVisible(bool v) connect(m_contentItem, SIGNAL(implicitHeightChanged()), this, SLOT(implicitHeightChanged())); } if (!m_visibleChangedConnected) { - connect(m_dialogWindow, SIGNAL(visibleChanged(bool)), this, SLOT(visibleChanged(bool))); + connect(m_dialogWindow, &QQuickWindow::visibleChanged, this, &QQuickAbstractDialog::visibleChanged); m_visibleChangedConnected = true; } } @@ -328,7 +328,7 @@ void QQuickAbstractDialog::setContentItem(QQuickItem *obj) m_contentItem = obj; qCDebug(lcWindow) << obj; if (m_dialogWindow) { - disconnect(this, SLOT(visibleChanged(bool))); + disconnect(m_dialogWindow, &QQuickWindow::visibleChanged, this, &QQuickAbstractDialog::visibleChanged); // Can't necessarily delete because m_dialogWindow might have been provided by the QML. m_dialogWindow = 0; } -- cgit v1.2.1 From 3ba11cf93820610273e2a16b13ab1d8c57a41d36 Mon Sep 17 00:00:00 2001 From: Joni Poikelin Date: Mon, 24 Apr 2017 09:45:25 +0300 Subject: Fix packaging of shaders when qmlcache is used Task-number: QTBUG-60320 Change-Id: Iac74b469e971d28218fd35eadefb3c3b4bca4e51 Reviewed-by: Simon Hausmann Reviewed-by: J-P Nurmi --- src/controls/controls.pro | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 5f40c0a3..6f78443e 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -60,33 +60,11 @@ include(Shaders/shaders.pri) osx: LIBS_PRIVATE += -framework Carbon !qmlcache { - # Create the resource file - GENERATED_RESOURCE_FILE = $$OUT_PWD/controls.qrc - INCLUDED_RESOURCE_FILES = \ $$CONTROLS_QML_FILES \ $$PRIVATE_QML_FILES \ - $$STYLES_QML_FILES \ - $$SHADER_FILES - - RESOURCE_CONTENT = \ - "" \ - "" - - for(resourcefile, INCLUDED_RESOURCE_FILES) { - resourcefileabsolutepath = $$absolute_path($$resourcefile) - relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) - relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) - RESOURCE_CONTENT += "$$relativepath_out" - } - - RESOURCE_CONTENT += \ - "" \ - "" + $$STYLES_QML_FILES - write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") - - RESOURCES += $$GENERATED_RESOURCE_FILE } else { QML_FILES *= $$CONTROLS_QML_FILES \ $$PRIVATE_QML_FILES \ @@ -95,5 +73,11 @@ osx: LIBS_PRIVATE += -framework Carbon OTHER_FILES += $$QML_FILES } +INCLUDED_RESOURCE_FILES += $$SHADER_FILES + +controls.files = $$INCLUDED_RESOURCE_FILES +controls.prefix = /QtQuick/Controls +RESOURCES += controls + CONFIG += no_cxx_module load(qml_plugin) -- cgit v1.2.1 From ffc1cab21ade6fc4b0ab574dbb5507c677d32841 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 24 Apr 2017 15:10:16 +0200 Subject: tst_dialogs: make QML errors visible Change-Id: Ib466b1c42e232d75a022588e99e9e204a8c7bad9 Reviewed-by: Qt CI Bot Reviewed-by: Shawn Rutledge --- tests/auto/dialogs/tst_dialogs.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/dialogs/tst_dialogs.cpp b/tests/auto/dialogs/tst_dialogs.cpp index 1f139966..20da6e43 100644 --- a/tests/auto/dialogs/tst_dialogs.cpp +++ b/tests/auto/dialogs/tst_dialogs.cpp @@ -87,7 +87,7 @@ void tst_dialogs::dialogImplicitWidth() component.loadUrl(testFileUrl("DialogImplicitSize.qml")); QObject *created = component.create(); QScopedPointer cleanup(created); - QVERIFY(created); + QVERIFY2(created, qPrintable(component.errorString())); QTRY_VERIFY(created->property("width").toInt() >= 400); QTRY_VERIFY(created->property("height").toInt() >= minimumHeight + heightMargins); @@ -100,7 +100,7 @@ void tst_dialogs::dialogContentResize() component.loadUrl(testFileUrl("DialogMinimumSize.qml")); QObject *created = component.create(); QScopedPointer cleanup(created); - QVERIFY(created); + QVERIFY2(created, qPrintable(component.errorString())); QTRY_COMPARE(created->property("width").toInt(), 400); QTRY_COMPARE(created->property("height").toInt(), 300); @@ -121,7 +121,7 @@ void tst_dialogs::fileDialogDefaultModality() window->setGeometry(240,240,1024,320); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window)); - QVERIFY(window->rootObject()); + QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString())); // Click to show QObject *dlg = qvariant_cast(window->rootObject()->property("fileDialog")); @@ -167,7 +167,7 @@ void tst_dialogs::fileDialogNonModal() window->setGeometry(240,240,1024,320); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window)); - QVERIFY(window->rootObject()); + QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString())); // Click to toggle visibility QObject *dlg = qvariant_cast(window->rootObject()->property("fileDialog")); @@ -196,7 +196,7 @@ void tst_dialogs::fileDialogNameFilters() window->setGeometry(240,240,1024,320); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window)); - QVERIFY(window->rootObject()); + QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString())); QObject *dlg = qvariant_cast(window->rootObject()->property("fileDialog")); QStringList filters; -- cgit v1.2.1 From b70d45d3f3e8096fb88c5cee1cf1f0b6e7c15f34 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 26 Apr 2017 09:09:52 +0200 Subject: Fix non-prefix builds on Windows After commit 3ba11cf93820610273e2a16b13ab1d8c57a41d36 the shaders do not belong into QML_FILES anymore (and also don't need to be copied via COPIES consequently). Task-number: QTBUG-60214 Change-Id: I8d68fe76810c2d2d8945ef410a377aa2ce0068c1 Reviewed-by: Friedemann Kleint --- src/controls/controls.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 6f78443e..07e8e002 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -68,9 +68,9 @@ osx: LIBS_PRIVATE += -framework Carbon } else { QML_FILES *= $$CONTROLS_QML_FILES \ $$PRIVATE_QML_FILES \ - $$STYLES_QML_FILES \ + $$STYLES_QML_FILES + OTHER_FILES += $$QML_FILES \ $$SHADER_FILES - OTHER_FILES += $$QML_FILES } INCLUDED_RESOURCE_FILES += $$SHADER_FILES -- cgit v1.2.1 From 555750221ee3850ba70169a2b6854041b434c592 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Fri, 28 Apr 2017 15:17:33 +0300 Subject: Disable/blacklist failing tests for boot2qt Currently boot2qt is tested with QEMU and some tests fail. Disabling them for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: Ifabc4c4b93beda1990fc4f4d6e254dcd704f93fc Reviewed-by: J-P Nurmi --- tests/auto/auto.pro | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 14860dc0..f3b76771 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -2,3 +2,6 @@ TEMPLATE = subdirs SUBDIRS += testplugin controls activeFocusOnTab applicationwindow dialogs \ extras qquicktreemodeladaptor customcontrolsstyle controls.depends = testplugin + +# QTBUG-60268 +boot2qt: SUBDIRS -= controls activeFocusOnTab applicationwindow dialogs extras customcontrolsstyle -- cgit v1.2.1 From a218356f838c4be8aad8f447e8d6187a8af639ff Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 21 Apr 2017 10:53:50 +0200 Subject: texteditor example: Fix path to editpaste icon Drop prefix so that it can be found from either resources or files. Change-Id: Ib9dcab86f22bff0f8a3d7f0f22aa35d717b3569f Reviewed-by: Simon Hausmann Reviewed-by: J-P Nurmi --- examples/quickcontrols/controls/texteditor/qml/main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/quickcontrols/controls/texteditor/qml/main.qml b/examples/quickcontrols/controls/texteditor/qml/main.qml index 8aa9ee7b..1544ebc9 100644 --- a/examples/quickcontrols/controls/texteditor/qml/main.qml +++ b/examples/quickcontrols/controls/texteditor/qml/main.qml @@ -93,7 +93,7 @@ ApplicationWindow { id: pasteAction text: "Paste" shortcut: "ctrl+v" - iconSource: "qrc:images/editpaste.png" + iconSource: "images/editpaste.png" iconName: "edit-paste" onTriggered: textArea.paste() } -- cgit v1.2.1 From dfc74f42d339e94617900447437d15cbaf08b08e Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 21 Mar 2017 19:01:01 +0100 Subject: Slider: Don't suppress updates by dragThreshold on non-touchscreens When using a mouse, you want a slider to react immediately to input, not only if you move beyond a certain threshold. With the threshold it is very hard to accurately position the slider. On touchscreens, the threshold is necessary to allow for unrelated events, like flicking views, to not interfere with the value. Change-Id: I6cb8252338f20de559e062e738118593ffc1e099 Task-number: QTBUG-47081 Reviewed-by: J-P Nurmi --- src/controls/Slider.qml | 2 +- tests/auto/controls/data/tst_slider.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index bf54e93e..a90bc022 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -264,7 +264,7 @@ Control { 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 --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 1d7e92d2..0eec7e34 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -339,7 +339,7 @@ Item { // 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) -- cgit v1.2.1 From 64ac56376f20024b7bafd97d0e4ed62707ed88fd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 10 May 2017 19:06:35 +0200 Subject: Bump version Change-Id: I0c6bfc205526ccdb6f80695b0d1dfdf7c7397afa --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index a7b7ec16..061f0bbb 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean android|ios|qnx|winrt|isEmpty(QT.widgets.name): CONFIG += no_desktop -MODULE_VERSION = 5.9.0 +MODULE_VERSION = 5.9.1 -- cgit v1.2.1 From e6208de2d0877d9025365ae7e89a6bf2caeda8fa Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Fri, 5 May 2017 09:57:55 +0300 Subject: Add changes file for 5.9.0 Listing important changes and bug-fixes. Change-Id: I03a78d6777d3a3a9cec345baf41b095134bdd126 Reviewed-by: Mitch Curtis Reviewed-by: Shawn Rutledge Reviewed-by: J-P Nurmi --- dist/changes-5.9.0 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 dist/changes-5.9.0 diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0 new file mode 100644 index 00000000..60ab2e88 --- /dev/null +++ b/dist/changes-5.9.0 @@ -0,0 +1,60 @@ +Qt 5.9 introduces many new features and improvements as well as bugfixes +over the 5.8.x series. 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. + +**************************************************************************** +* Important Behavior Changes * +**************************************************************************** + + - Enabled QML caching. + - Removed the WinRT style. + +**************************************************************************** +* Controls * +**************************************************************************** + + - Button: + * [QTBUG-57853] Fixed to accept space key press and release events to + avoid leaking/propagating them to the parent item. + + - GroupBox: + * Removed a hard-coded texture size from the Desktop style to avoid + skewed groupboxes in Plasma's config dialogs when using larger fonts. + + - MenuBar: + * [QTBUG-59335] Fixed styling of disabled entries. + + - ScrollView: + * Added a maximum scroll bar size limit to avoid scroll bars overflowing + the container when e.g. contentWidth/height becomes zero. + * [QTBUG-59633] Fixed jumps to the top with mouse wheel events. + + - Slider: + * [QTBUG-42273] Prevented wheel events from escaping. + +**************************************************************************** +* Dialogs * +**************************************************************************** + + - FileDialog: + * Fixed to remember the folder only when the dialog is accepted. + +**************************************************************************** +* Extras * +**************************************************************************** + + - TumblerStyle: + * [QTBUG-55289] Deprecated unused spacing property. -- cgit v1.2.1 From 74aa26528d4f56e4891d4d92eef7da8425242a5a Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Fri, 12 May 2017 13:19:14 +0200 Subject: Mark both benchmarks as such in the pro files This enables them to be run with "make benchmark" Change-Id: I13ecd96087dd6586a47fb2abab269982f04803db Reviewed-by: Mitch Curtis Reviewed-by: J-P Nurmi --- tests/benchmarks/objectcount/objectcount.pro | 2 +- tests/benchmarks/statusindicator/statusindicator.pro | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/benchmarks/objectcount/objectcount.pro b/tests/benchmarks/objectcount/objectcount.pro index f54d72d6..3e7f77e8 100644 --- a/tests/benchmarks/objectcount/objectcount.pro +++ b/tests/benchmarks/objectcount/objectcount.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_objectcount QT += quick testlib core-private -CONFIG += testcase +CONFIG += benchmark osx:CONFIG -= app_bundle SOURCES += \ diff --git a/tests/benchmarks/statusindicator/statusindicator.pro b/tests/benchmarks/statusindicator/statusindicator.pro index d66b5515..3770784a 100644 --- a/tests/benchmarks/statusindicator/statusindicator.pro +++ b/tests/benchmarks/statusindicator/statusindicator.pro @@ -1,6 +1,7 @@ TEMPLATE = app TARGET = tst_bench_statusindicator QT = core quick testlib +CONFIG += benchmark SOURCES += \ tst_statusindicator.cpp -- cgit v1.2.1 From dacb91916b202208681471ba764504c7c7d086f0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 22 May 2017 11:39:31 +0200 Subject: Fix inclusion of QML files of the Dialogs module in static builds This is a regression introduce by commit 751f08cf46f505980b8ebe9a228a6c229b470152. For a build with QML Ahead-of-Time cache creation, we need the qml files in QML_FILES and qml_module.prf takes care of installing them correctly into the file system (caches and sources). For a static build we also need the sources in QML_FILES, in order for their automatic inclusion in the resource system (also by qml_module.prf). Task-number: QTBUG-60861 Change-Id: Id9125530d8b385101994600c1224dbcb2a5333f9 Reviewed-by: Andy Shaw --- src/dialogs/dialogs.pro | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro index e5cc7d79..69b64e00 100644 --- a/src/dialogs/dialogs.pro +++ b/src/dialogs/dialogs.pro @@ -84,32 +84,6 @@ ios|android|blackberry|winrt { QT += quick-private gui gui-private core core-private qml qml-private -!qmlcache { - # Create the resource file - GENERATED_RESOURCE_FILE = $$OUT_PWD/dialogs.qrc - - RESOURCE_CONTENT = \ - "" \ - "" - - for(resourcefile, DIALOGS_QML_FILES) { - resourcefileabsolutepath = $$absolute_path($$resourcefile) - relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) - relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) - RESOURCE_CONTENT += "$$relativepath_out" - } - - RESOURCE_CONTENT += \ - "" \ - "" - - write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") - - RESOURCES += $$GENERATED_RESOURCE_FILE - # In case of a debug build, deploy the QML files too - !qtquickcompiler:CONFIG(debug, debug|release): QML_FILES += $$DIALOGS_QML_FILES -} else { - QML_FILES += $$DIALOGS_QML_FILES -} +QML_FILES += $$DIALOGS_QML_FILES load(qml_plugin) -- cgit v1.2.1 From c65bde25f04304bdcc995191f5f076e5f7532678 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 20 May 2017 15:24:15 +0200 Subject: SpinBox: set "editable" accessible property Because we want to make QQuickItemPrivate::canAcceptTabFocus() respect non-editable SpinBoxes (available in QQC2). Change-Id: If2bc2707c448203a2105ddc4de10ac1566818e00 Reviewed-by: Mitch Curtis Reviewed-by: Frederik Gladhorn --- src/controls/SpinBox.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index 999649b0..a742abd6 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -273,6 +273,7 @@ Control { Accessible.name: input.text Accessible.role: Accessible.SpinBox + Accessible.editable: true MouseArea { id: mouseArea -- cgit v1.2.1 From 97a0a64bf90687be72369532494e485caec10815 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Fri, 12 May 2017 13:18:15 +0200 Subject: Add benchmark to measure start-up time of complex QML application This is not an automated benchmark, it is meant to be run manually or by a script. Change-Id: I72a4c15120ff4a650fb4bd2f90c6db1907dba994 Reviewed-by: J-P Nurmi --- tests/benchmarks/benchmarks.pro | 3 +- tests/benchmarks/startup/gallery.qrc | 13 ++++ tests/benchmarks/startup/startup.pro | 13 ++++ tests/benchmarks/startup/startup_bench.cpp | 96 ++++++++++++++++++++++++++++++ tests/benchmarks/startup/timer.qml | 7 +++ 5 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 tests/benchmarks/startup/gallery.qrc create mode 100644 tests/benchmarks/startup/startup.pro create mode 100644 tests/benchmarks/startup/startup_bench.cpp create mode 100644 tests/benchmarks/startup/timer.qml diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro index e9bb857b..0c4a064d 100644 --- a/tests/benchmarks/benchmarks.pro +++ b/tests/benchmarks/benchmarks.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs SUBDIRS = \ objectcount \ - statusindicator + statusindicator \ + startup diff --git a/tests/benchmarks/startup/gallery.qrc b/tests/benchmarks/startup/gallery.qrc new file mode 100644 index 00000000..2cabf889 --- /dev/null +++ b/tests/benchmarks/startup/gallery.qrc @@ -0,0 +1,13 @@ + + + timer.qml + ../../../examples/quickcontrols/controls/gallery/main.qml + ../../../examples/quickcontrols/controls/gallery/qml/ButtonPage.qml + ../../../examples/quickcontrols/controls/gallery/qml/InputPage.qml + ../../../examples/quickcontrols/controls/gallery/qml/ProgressPage.qml + ../../../examples/quickcontrols/controls/gallery/qml/UI.js + ../../../examples/quickcontrols/controls/gallery/qml/+android/UI.js + ../../../examples/quickcontrols/controls/gallery/qml/+ios/UI.js + ../../../examples/quickcontrols/controls/gallery/qml/+osx/UI.js + + diff --git a/tests/benchmarks/startup/startup.pro b/tests/benchmarks/startup/startup.pro new file mode 100644 index 00000000..755fcc8e --- /dev/null +++ b/tests/benchmarks/startup/startup.pro @@ -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 --git a/tests/benchmarks/startup/startup_bench.cpp b/tests/benchmarks/startup/startup_bench.cpp new file mode 100644 index 00000000..4127f8d0 --- /dev/null +++ b/tests/benchmarks/startup/startup_bench.cpp @@ -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 +#include +#include + +int runBenchmark(std::function f) { + { + QElapsedTimer t; + t.start(); + int r = f(); + if (r == 0) + printf("%d,", static_cast(t.elapsed())); + else + return r; + } + + { + QElapsedTimer t; + t.start(); + int r = f(); + if (r == 0) + printf("%d\n", static_cast(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 --git a/tests/benchmarks/startup/timer.qml b/tests/benchmarks/startup/timer.qml new file mode 100644 index 00000000..a0e9f1c1 --- /dev/null +++ b/tests/benchmarks/startup/timer.qml @@ -0,0 +1,7 @@ +import QtQuick 2.2 + +Timer { + running: true + interval: 0 + onTriggered: Qt.quit(); +} -- cgit v1.2.1 From 57c3f422b4f97a844d9301b9a288dbf2cb7d76ec Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 29 May 2017 14:43:40 +0200 Subject: Update plugins.qmltypes Change-Id: I90f9118e7e9a9b5ffcc9cba8909ff2cf3dd1e166 Reviewed-by: J-P Nurmi --- src/controls/plugins.qmltypes | 281 +++++++++++++++++++++++++----------------- 1 file changed, 165 insertions(+), 116 deletions(-) diff --git a/src/controls/plugins.qmltypes b/src/controls/plugins.qmltypes index 11994894..cb509bcb 100644 --- a/src/controls/plugins.qmltypes +++ b/src/controls/plugins.qmltypes @@ -9,7 +9,6 @@ import QtQuick.tooling 1.2 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 @@ Module { "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 @@ Module { 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 @@ Module { Method { name: "trigger" } } Component { - name: "QQuickCalendarModel" + name: "QQuickCalendarModel1" prototype: "QAbstractListModel" exports: ["QtQuick.Controls.Private/CalendarModel 1.0"] exportMetaObjectRevisions: [0] @@ -103,7 +102,7 @@ Module { } } Component { - name: "QQuickControlSettings" + name: "QQuickControlSettings1" prototype: "QObject" exports: ["QtQuick.Controls.Private/Settings 1.0"] isCreatable: false @@ -126,26 +125,26 @@ Module { } } 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 @@ Module { } } 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 @@ Module { 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 @@ Module { 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 @@ Module { } } 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 @@ Module { 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 @@ Module { Method { name: "trigger" } } Component { - name: "QQuickMenuItemType" + name: "QQuickMenuItemType1" exports: ["QtQuick.Controls/MenuItemType 1.0"] isCreatable: false exportMetaObjectRevisions: [0] @@ -290,14 +291,14 @@ Module { } } 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 @@ Module { Signal { name: "__textChanged" } } Component { - name: "QQuickPadding" + name: "QQuickPadding1" prototype: "QObject" exports: ["QtQuick.Controls.Private/Padding 1.0"] exportMetaObjectRevisions: [0] @@ -331,7 +332,7 @@ Module { } } Component { - name: "QQuickPopupWindow" + name: "QQuickPopupWindow1" defaultProperty: "popupContentItem" prototype: "QQuickWindow" exports: ["QtQuick.Controls.Private/PopupWindow 1.0"] @@ -344,7 +345,7 @@ Module { Method { name: "dismissPopup" } } Component { - name: "QQuickRangeModel" + name: "QQuickRangeModel1" prototype: "QObject" exports: ["QtQuick.Controls.Private/RangeModel 1.0"] exportMetaObjectRevisions: [0] @@ -412,7 +413,7 @@ Module { } } Component { - name: "QQuickRangedDate" + name: "QQuickRangedDate1" prototype: "QObject" exports: ["QtQuick.Controls.Private/RangedDate 1.0"] exportMetaObjectRevisions: [0] @@ -421,7 +422,7 @@ Module { 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 @@ Module { Property { name: "enabled"; type: "bool" } } Component { - name: "QQuickSelectionMode" + name: "QQuickSelectionMode1" exports: ["QtQuick.Controls/SelectionMode 1.1"] isCreatable: false exportMetaObjectRevisions: [0] @@ -446,7 +447,7 @@ Module { } } Component { - name: "QQuickSpinBoxValidator" + name: "QQuickSpinBoxValidator1" prototype: "QValidator" exports: ["QtQuick.Controls.Private/SpinBoxValidator 1.0"] exportMetaObjectRevisions: [0] @@ -462,7 +463,7 @@ Module { Method { name: "decrement" } } Component { - name: "QQuickStack" + name: "QQuickStack1" prototype: "QObject" exports: ["QtQuick.Controls/Stack 1.0"] isCreatable: false @@ -484,12 +485,12 @@ Module { 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 @@ Module { } } Component { - name: "QQuickTooltip" + name: "QQuickTooltip1" prototype: "QObject" exports: ["QtQuick.Controls.Private/Tooltip 1.0"] isCreatable: false @@ -598,7 +599,7 @@ Module { Method { name: "hideText" } } Component { - name: "QQuickTreeModelAdaptor" + name: "QQuickTreeModelAdaptor1" prototype: "QAbstractListModel" exports: ["QtQuick.Controls.Private/TreeModelAdaptor 1.0"] exportMetaObjectRevisions: [0] @@ -646,7 +647,7 @@ Module { } } Component { - name: "QQuickWheelArea" + name: "QQuickWheelArea1" defaultProperty: "data" prototype: "QQuickItem" exports: ["QtQuick.Controls.Private/WheelArea 1.0"] @@ -661,6 +662,7 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { } Method { name: "removeItem" - Parameter { type: "QQuickMenuBase"; isPointer: true } + Parameter { type: "QQuickMenuBase1"; isPointer: true } } Method { name: "clear" } Method { @@ -1221,7 +1226,7 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { Property { name: "currentRow"; type: "int" } Property { name: "selection" - type: "TableViewSelection_QMLTYPE_281" + type: "TableViewSelection_QMLTYPE_257" isReadonly: true isPointer: true } @@ -1807,7 +1819,6 @@ Module { 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 @@ Module { 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 @@ Module { } 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { } 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { 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 @@ Module { type: "QVariant" Parameter { name: "columnIndex"; type: "QVariant" } Parameter { name: "itemIndex"; type: "QVariant" } + Parameter { name: "interval"; type: "QVariant" } } Method { name: "getColumn" -- cgit v1.2.1 From e5f457a51d6ff38a1a4298cbad797a12ee378139 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 15 May 2017 17:32:52 +0200 Subject: remove bogus QTPLUGIN+=qsqlite magic the code was originally meant to link the plugin if it's not built into qtsql. this logic did not survive the various build system refactorings, but it's also entirely pointless, because available static plugins are now automatically linked. Change-Id: I85039dbb123ab4fa1089b898041ab6d3ddb2e44c Reviewed-by: Simon Hausmann --- examples/quickcontrols/controls/calendar/calendar.pro | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/quickcontrols/controls/calendar/calendar.pro b/examples/quickcontrols/controls/calendar/calendar.pro index 0c79fb40..37fef288 100644 --- a/examples/quickcontrols/controls/calendar/calendar.pro +++ b/examples/quickcontrols/controls/calendar/calendar.pro @@ -1,8 +1,6 @@ QT += qml quick sql TARGET = calendar -!qtConfig(sql-sqlite): QTPLUGIN += qsqlite - include(src/src.pri) include(../shared/shared.pri) -- cgit v1.2.1 From 1b09866db77cd532ff1858f3f98ee1e928174961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Ryyn=C3=A4nen?= Date: Fri, 21 Apr 2017 12:44:43 +0300 Subject: Support for Q_OS_ANDROID_EMBEDDED and android-embedded builds The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: Ic825e034f8d4b39c45e03b9f0a965f126559991e Reviewed-by: J-P Nurmi --- src/controls/Private/qquickcontrolsettings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index e6345082..c7f641cc 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -50,7 +50,7 @@ #include #include #include -#if defined(Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) #include #endif @@ -62,7 +62,7 @@ static QString defaultStyleName() #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) -- cgit v1.2.1 From ae688459bc845ab919ce256f315843d97ba9ff32 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 23 May 2017 15:38:16 +0200 Subject: Fix support for using QtQuick Dialogs with the QML compiler This is a regression from commit dacb91916b202208681471ba764504c7c7d086f0. Make sure to include the dialogs sources in the resource system when using the compiler. Task-number: QTBUG-60991 Change-Id: I35c3e2e677e4f44ec56fe02b086ce08a8b765d37 Reviewed-by: J-P Nurmi --- src/dialogs/dialogs.pro | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro index 69b64e00..ca5f408e 100644 --- a/src/dialogs/dialogs.pro +++ b/src/dialogs/dialogs.pro @@ -7,12 +7,6 @@ IMPORT_VERSION = 1.2 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 @@ QT += quick-private gui gui-private core core-private qml qml-private 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) -- cgit v1.2.1 From f19b1bf1bfee79178bf5cd75df86863be49c21f0 Mon Sep 17 00:00:00 2001 From: Jussi Witick Date: Fri, 17 Feb 2017 10:27:12 +0200 Subject: Increase QtQuick import from 2.2 to 2.6 for QML Label Increase QtQuick import version to 2.6 to enable the properties of underlying QML Text type to be usable in the QML Label type too. Task-number: QTBUG-57895 Change-Id: I7a2b641a56c90ab91b4e6c973278d8943fa6903a Reviewed-by: J-P Nurmi --- src/controls/Label.qml | 2 +- tests/auto/controls/data/tst_label.qml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/controls/Label.qml b/src/controls/Label.qml index f9bc8cdd..ea3f27b3 100644 --- a/src/controls/Label.qml +++ b/src/controls/Label.qml @@ -37,7 +37,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.6 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index e5c53a52..145c7f14 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -69,6 +69,17 @@ TestCase { label.destroy() } + function test_textPaddings() { + var label = Qt.createQmlObject('import QtQuick.Controls 1.2; Label { leftPadding: 2; rightPadding: 2; topPadding: 2; bottomPadding: 2 }', testCase, ''); + + compare(label.leftPadding, 2) + compare(label.rightPadding, 2) + compare(label.topPadding, 2) + compare(label.bottomPadding, 2) + + label.destroy() + } + function test_activeFocusOnTab() { if (Qt.styleHints.tabFocusBehavior != Qt.TabFocusAllControls) skip("This function doesn't support NOT iterating all.") -- cgit v1.2.1