diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/changelog qtquickcontrols2-opensource-src-5.9.5/debian/changelog --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/changelog 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/changelog 2019-11-18 04:28:53.000000000 +0000 @@ -1,142 +1,35 @@ -qtquickcontrols2-opensource-src (5.12.5+dfsg-2) unstable; urgency=medium +qtquickcontrols2-opensource-src (5.9.5-0ubuntu2~16.04.sav0) xenial; urgency=medium - * Update debian/libqt5quicktemplates2-5.symbols from buildds’ logs. - * Bump Standards-Version to 4.4.1, no changes needed. - * Upload to unstable. + * Backport to Xenial + * Build against ppa:savoury1/build-tools for debhelper 11.1.6 (qttools needs + debhelper >= 10.9.2) and ninja-build 1.9.0 (required for qtwebkit build) - -- Dmitry Shachnev Sun, 20 Oct 2019 23:49:39 +0300 + -- Rob Savoury Sun, 17 Nov 2019 20:28:53 -0800 -qtquickcontrols2-opensource-src (5.12.5+dfsg-1) experimental; urgency=medium +qtquickcontrols2-opensource-src (5.9.5-0ubuntu2) bionic; urgency=medium - * New upstream release. - * Bump Qt build-dependencies to 5.12.5. - * Update Homepage URL. - * Update debian/libqt5quicktemplates2-5.symbols from the current build log. - * Add Build-Depends-Package field to the symbols files. - * Bump Standards-Version to 4.4.0, no changes needed. - * Build-depend on qtgraphicaleffects5-doc-html for linking docs. - - -- Dmitry Shachnev Mon, 23 Sep 2019 13:41:16 +0300 - -qtquickcontrols2-opensource-src (5.12.4+dfsg-1) experimental; urgency=medium - - [ Scarlett Moore ] - * Update packaging to use doc-base as per policy 9.10. - - [ Dmitry Shachnev ] - * Update debian/libqt5quicktemplates2-5.symbols from buildds’ logs. - * New upstream release. - * Bump Qt build-dependencies to 5.12.4. - * Simplify debian/rules by using a debian/not-installed file. - * Add support for nocheck build profile. - * Add support for nodoc build profile. - * Do not use ${qmlc:Depends} variable for qml-module-qtquick-controls2. - It is undefined there, as qmlcache is only used in calendar.pro. - - -- Dmitry Shachnev Thu, 27 Jun 2019 23:26:59 +0300 - -qtquickcontrols2-opensource-src (5.12.3+dfsg-1) experimental; urgency=medium - - * New upstream release. - * Update debian/libqt5quicktemplates2-5.symbols from buildds’ logs. - * Bump Qt build-dependencies to 5.12.3. - * Add some new files to qtquickcontrols2-5-dev package. - * Update debian/libqt5quicktemplates2-5.symbols from the current build log. - - -- Dmitry Shachnev Mon, 29 Apr 2019 23:00:08 +0300 - -qtquickcontrols2-opensource-src (5.12.2+dfsg-1) experimental; urgency=medium - - * New upstream release. - * Update debian/libqt5quicktemplates2-5.symbols from buildds’ logs. - * Bump Qt build-dependencies to 5.12.2. - * Update debian/copyright. - * Remove empty fonts directory from the repacked tarball. - * Upstream has renamed the documentation module from qtquickcontrols2 to - qtquickcontrols. Adjust the .install files accordingly and add Breaks / - Replaces against qtquickcontrols5-doc{,-html} < 5.12. - * Update symbols files from the current build log. - * Bump pkg-kde-tools build-dependency to 0.15.29 (closes: #905738). - - -- Dmitry Shachnev Sun, 24 Mar 2019 20:48:34 +0300 - -qtquickcontrols2-opensource-src (5.11.3+dfsg-2) unstable; urgency=medium - - [ Simon Quigley ] - * Change my email to tsimonq2@debian.org now that I am a Debian Developer. - * Bump Standards-version to 4.3.0, no changes needed. - - [ Lisandro Damián Nicanor Pérez Meyer ] - * Upload to unstable. - - -- Lisandro Damián Nicanor Pérez Meyer Wed, 26 Dec 2018 16:52:23 -0300 + * Update symbols from build logs. -qtquickcontrols2-opensource-src (5.11.3+dfsg-1) experimental; urgency=medium + -- Simon Quigley Sat, 14 Apr 2018 15:50:41 -0500 - * New upstream release. - - Bump Qt build dependencies. - - -- Lisandro Damián Nicanor Pérez Meyer Tue, 18 Dec 2018 09:08:03 -0300 - -qtquickcontrols2-opensource-src (5.11.2+dfsg-1) unstable; urgency=medium - - * Remove sourceless fontello fonts (Closes: #900855). - - Repack tarball as +dfsg. - - Drop fonts by using uscan and debian/copyright. - - Disable building the affected examples by applying - disable_fontless_examples_build.patch - - -- Lisandro Damián Nicanor Pérez Meyer Sat, 17 Nov 2018 12:44:09 -0300 - -qtquickcontrols2-opensource-src (5.11.2-2) unstable; urgency=medium - - * Upload to unstable. - - -- Dmitry Shachnev Tue, 16 Oct 2018 18:46:47 +0300 - -qtquickcontrols2-opensource-src (5.11.2-1) experimental; urgency=medium +qtquickcontrols2-opensource-src (5.9.5-0ubuntu1) bionic; urgency=medium * New upstream release. - * Bump Qt build-dependencies to 5.11.2. - * Update debian/copyright. - * Update libqt5quicktemplates2-5.symbols from the current build log. - * Bump Standards-Version to 4.2.1, no changes needed. - - -- Dmitry Shachnev Wed, 26 Sep 2018 13:59:45 +0300 - -qtquickcontrols2-opensource-src (5.11.1-2) unstable; urgency=medium - - * Upload to Sid. - -- Simon Quigley Wed, 25 Jul 2018 04:49:31 -0500 + -- Simon Quigley Sat, 14 Apr 2018 15:04:47 -0500 -qtquickcontrols2-opensource-src (5.11.1-1) experimental; urgency=medium +qtquickcontrols2-opensource-src (5.9.4-0ubuntu1) bionic; urgency=medium * New upstream release. - * Bump Standards-version to 4.1.4, no changes needed. - * Bump debhelper compat to 11, no changes needed. - * Bump build dependencies to 5.11.1. - * Update symbols from amd64 build logs. - - -- Simon Quigley Tue, 26 Jun 2018 12:12:02 -0500 - -qtquickcontrols2-opensource-src (5.10.1-2) unstable; urgency=medium - - * Release to unstable. - -- Lisandro Damián Nicanor Pérez Meyer Sat, 07 Apr 2018 17:48:08 -0300 + -- Simon Quigley Sun, 25 Feb 2018 19:35:04 -0600 -qtquickcontrols2-opensource-src (5.10.1-1) experimental; urgency=medium +qtquickcontrols2-opensource-src (5.9.3-0ubuntu1) bionic; urgency=medium * New upstream release. - * Update debian/watch for the new upstream tarball names. - * Bump Qt build-dependencies to 5.10.1. - * Use dh_auto_configure provided by debhelper (closes: #883943). - * Update Vcs fields for migration to salsa.debian.org. - * Update symbols files from the current build log. - * Bump Standards-Version to 4.1.3, no changes needed. + * Update symbols from build logs. - -- Dmitry Shachnev Tue, 06 Mar 2018 20:29:10 +0300 + -- Simon Quigley Sat, 09 Dec 2017 17:54:20 -0600 qtquickcontrols2-opensource-src (5.9.2-2) unstable; urgency=medium diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/compat qtquickcontrols2-opensource-src-5.9.5/debian/compat --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/compat 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/compat 2018-04-14 20:00:09.000000000 +0000 @@ -1 +1 @@ -11 +10 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/control qtquickcontrols2-opensource-src-5.9.5/debian/control --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/control 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/control 2018-04-14 20:04:22.000000000 +0000 @@ -1,34 +1,34 @@ Source: qtquickcontrols2-opensource-src Section: libs Priority: optional -Maintainer: Debian Qt/KDE Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Sune Vuorela , Pino Toscano , Lisandro Damián Nicanor Pérez Meyer , Timo Jyrinki , Dmitry Shachnev , - Simon Quigley -Build-Depends: debhelper (>= 11), + Simon Quigley +Build-Depends: debhelper (>= 10.3), dpkg-dev (>= 1.16.1), - pkg-kde-tools (>= 0.15.29~), - qml-module-qtgraphicaleffects (>= 5.12.5~), - qml-module-qtquick-layouts (>= 5.12.5~), - qml-module-qtquick-window2 (>= 5.12.5~), - qml-module-qttest (>= 5.12.5~), - qtbase5-dev (>= 5.12.5+dfsg~), - qtbase5-private-dev (>= 5.12.5+dfsg~), - qtdeclarative5-dev-tools (>= 5.12.5~), - qtdeclarative5-private-dev (>= 5.12.5~), - xauth , - xvfb -Build-Depends-Indep: qtbase5-doc-html (>= 5.12.5+dfsg~) , - qtdeclarative5-doc-html (>= 5.12.5~) , - qtgraphicaleffects5-doc-html (>= 5.12.5~) , - qttools5-dev-tools (>= 5.12.5~) -Standards-Version: 4.4.1 -Homepage: https://doc.qt.io/qt-5/qtquickcontrols-index.html -Vcs-Git: https://salsa.debian.org/qt-kde-team/qt/qtquickcontrols2.git -Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt/qtquickcontrols2 + pkg-kde-tools (>= 0.15.26~), + qml-module-qtgraphicaleffects (>= 5.9.5~), + qml-module-qtquick-layouts (>= 5.9.5~), + qml-module-qtquick-window2 (>= 5.9.5~), + qml-module-qttest (>= 5.9.5~), + qtbase5-private-dev (>= 5.9.5+dfsg~), + qtdeclarative5-dev-tools (>= 5.9.5~), + qtdeclarative5-private-dev (>= 5.9.5~), + xauth, + xvfb +Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.5+dfsg~), + qtbase5-doc-html (>= 5.9.5+dfsg~), + qtdeclarative5-doc-html (>= 5.9.5~), + qttools5-dev-tools (>= 5.9.5~) +Standards-Version: 4.1.1 +Homepage: https://code.qt.io/cgit/qt/qtquickcontrols2.git +Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtquickcontrols2.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtquickcontrols2.git Package: libqt5quickcontrols2-5 Architecture: any @@ -76,7 +76,10 @@ Package: qml-module-qtquick-controls2 Architecture: any Multi-Arch: same -Depends: qml-module-qtquick-templates2, ${misc:Depends}, ${shlibs:Depends} +Depends: qml-module-qtquick-templates2, + ${misc:Depends}, + ${qmlc:Depends}, + ${shlibs:Depends} Description: Qt 5 Qt Quick Controls 2 QML module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -107,12 +110,9 @@ This package contains the Qt Quick Controls 2 development files. Package: qtquickcontrols2-5-doc -Build-Profiles: Architecture: all Section: doc Depends: ${misc:Depends} -Breaks: qtquickcontrols5-doc (<< 5.12) -Replaces: qtquickcontrols5-doc (<< 5.12) Description: Qt 5 Quick Controls 2 documentation Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -120,12 +120,9 @@ This package contains the Qt Quick Controls 2 documentation in qch format. Package: qtquickcontrols2-5-doc-html -Build-Profiles: Architecture: all Section: doc Depends: ${misc:Depends} -Breaks: qtquickcontrols5-doc-html (<< 5.12) -Replaces: qtquickcontrols5-doc-html (<< 5.12) Description: Qt 5 Quick Controls 2 HTML documentation Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/copyright qtquickcontrols2-opensource-src-5.9.5/debian/copyright --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/copyright 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/copyright 2018-04-14 20:00:09.000000000 +0000 @@ -1,45 +1,34 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: qtquickcontrols2-everywhere-src +Upstream-Name: qtquickcontrols2-opensource-src Source: https://download.qt.io/official_releases/qt/*/submodules/ -Files-Excluded: examples/quickcontrols2/texteditor/fonts - examples/quickcontrols2/swipetoremove/fonts -# Removed sourceless files: -# Fontello fonts. Files: * -Copyright: 2017-2018 The Qt Company Ltd. +Copyright: 2015-2016 The Qt Company Ltd. License: LGPL-3 or GPL-2 Files: examples/* tests/auto/*/data/*.qml tests/manual/* -Copyright: 2017-2019 The Qt Company Ltd. +Copyright: 2015-2016 The Qt Company Ltd. License: BSD-3-clause Files: src/imports/controls/material/ElevationEffect.qml -Copyright: 2017 The Qt Company Ltd. +Copyright: 2016 The Qt Company Ltd. 2014-2016 Google, Inc. License: LGPL-3 or GPL-2, and Expat -Files: src/imports/controls/material/qquickmaterialstyle.cpp -Copyright: 2017 The Qt Company Ltd. - 2015 Mikel Bitson -License: LGPL-3 or GPL-2, and Expat - Files: src/quickcontrols2/qquickstyleselector* Copyright: 2013 BlackBerry Limited. All rights reserved. - 2017 The Qt Company Ltd. -License: LGPL-3 or GPL-2 - -Files: tests/auto/qquickiconimage/tst_qquickiconimage.cpp - tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp - tests/auto/qquickninepatchimage/tst_qquickninepatchimage.cpp -Copyright: 2017 The Qt Company Ltd. -License: GPL-3 with Qt-1.0 exception + 2015 The Qt Company Ltd. +License: LGPL-2.1-or-3 with Qt-1.1 exception Files: tests/manual/shared/FontAwesome.otf - tests/manual/testbench/fonts/fontawesome.ttf -Copyright: 2015-2016 Dave Gandy +Copyright: 2015 Dave Gandy +License: OFL-1.1 + +Files: examples/quickcontrols2/swipetoremove/fonts/fontello.ttf + examples/quickcontrols2/texteditor/fonts/fontello.ttf +Copyright: 2013 Aristeides Stathopoulos License: OFL-1.1 Files: *.qdoc @@ -47,7 +36,7 @@ License: GFDL-NIV-1.3 Files: debian/* -Copyright: 2015-2019 Dmitry Shachnev +Copyright: 2015-2016 Dmitry Shachnev License: LGPL-3 or GPL-2 License: LGPL-3 @@ -64,40 +53,6 @@ On Debian systems, the complete text of the GNU General Public License version 2 can be found in /usr/share/common-licenses/GPL-2. -License: GPL-3 with Qt-1.0 exception - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License version 3 as - published by the Free Software Foundation. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - On Debian systems, the complete text of the GNU General Public License - version 3 can be found in /usr/share/common-licenses/GPL-3. - . - The Qt Company GPL Exception 1.0 - Exception 1: - . - As a special exception you may create a larger work which contains the - output of this application and distribute that work under terms of your - choice, so long as the work is not otherwise derived from or based on - this application and so long as the work does not in itself generate - output that contains the output from this application in its original - or modified form. - . - Exception 2: - . - As a special exception, you have permission to combine this application - with Plugins licensed under the terms of your choice, to produce an - executable, and to copy and distribute the resulting executable under - the terms of your choice. However, the executable must be accompanied - by a prominent notice offering all users of the executable the entire - source code to this application, excluding the source code of the - independent modules, but including any changes you have made to this - application, under the terms of this license. - License: GFDL-NIV-1.3 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 @@ -134,6 +89,43 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +License: LGPL-2.1-or-3 with Qt-1.1 exception + This file may be used under the terms of the GNU Lesser General Public + License version 2.1 or version 3 as published by the Free Software + Foundation. + . + In addition, as a special exception, The Qt Company gives you certain + additional rights. These rights are described in The Qt Company Qt LGPL + Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this + package. + . + On Debian systems, the complete text of the GNU Lesser General Public + License version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1. + The complete text of the GNU Lesser General Public License version 3 can be + found in /usr/share/common-licenses/LGPL-3. + . + The Qt Company LGPL Exception version 1.1: + As an additional permission to the GNU Lesser General Public License version + 2.1, the object code form of a "work that uses the Library" may incorporate + material from a header file that is part of the Library. You may distribute + such object code under terms of your choice, provided that: + (i) the header files of the Library have not been modified; and + (ii) the incorporated material is limited to numerical parameters, data + structure layouts, accessors, macros, inline functions and + templates; and + (iii) you comply with the terms of Section 6 of the GNU Lesser General + Public License version 2.1. + . + Moreover, you may apply this exception to a modified version of the Library, + provided that such modification does not involve copying material from the + Library into the modified Library's header files unless such material is + limited to (i) numerical parameters; (ii) data structure layouts; + (iii) accessors; and (iv) small macros, templates and inline functions of + five lines or less in length. + . + Furthermore, you are not required to apply this additional permission to a + modified version of the Library. + License: OFL-1.1 PREAMBLE The goals of the Open Font License (OFL) are to stimulate worldwide diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/libqt5quickcontrols2-5.symbols qtquickcontrols2-opensource-src-5.9.5/debian/libqt5quickcontrols2-5.symbols --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/libqt5quickcontrols2-5.symbols 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/libqt5quickcontrols2-5.symbols 2018-04-14 20:49:40.000000000 +0000 @@ -1,10 +1,6 @@ -# SymbolsHelper-Confirmed: 5.12.2 amd64 +# SymbolsHelper-Confirmed: 5.9.5 amd64 arm64 armhf i386 ppc64el s390x libQt5QuickControls2.so.5 libqt5quickcontrols2-5 #MINVER# -* Build-Depends-Package: qtquickcontrols2-5-dev Qt_5.0@Qt_5.0 5.7.1 - Qt_5.10@Qt_5.10 5.10.1 - Qt_5.11@Qt_5.11 5.11.1 - Qt_5.12@Qt_5.12 5.12.0 Qt_5.1@Qt_5.1 5.7.1 Qt_5.2@Qt_5.2 5.7.1 Qt_5.3@Qt_5.3 5.7.1 @@ -16,103 +12,47 @@ Qt_5.9@Qt_5.9 5.9.0~rc Qt_5@Qt_5 5.7.1 Qt_5_PRIVATE_API@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickColor11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN11QQuickColor11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN11QQuickColor16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN11QQuickColorC1EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN11QQuickColorC2EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN11QQuickStyle12addStylePathERK7QString@Qt_5 5.12.2 - _ZN11QQuickStyle13stylePathListEv@Qt_5 5.12.2 + _Z23qt_is_dark_system_themev@Qt_5 5.9.0~rc _ZN11QQuickStyle15availableStylesEv@Qt_5 5.9.0~rc _ZN11QQuickStyle16setFallbackStyleERK7QString@Qt_5 5.9.0~rc _ZN11QQuickStyle4nameEv@Qt_5 5.7.1 _ZN11QQuickStyle4pathEv@Qt_5 5.7.1 _ZN11QQuickStyle8setStyleERK7QString@Qt_5 5.7.1 - _ZN15QQuickIconImage10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImage11nameChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImage11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImage11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImage12colorChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImage12pixmapChangeEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImage15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImage16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImage17componentCompleteEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImage7setNameERK7QString@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImage8setColorERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImage9setSourceERK4QUrl@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImageC1EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconImageC2EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel10setDisplayENS_7DisplayE@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel10setSpacingEd@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel11setMirroredEb@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel12setAlignmentE6QFlagsIN2Qt13AlignmentFlagEE@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel13setTopPaddingEd@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel14setLeftPaddingEd@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel15resetTopPaddingEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel15setRightPaddingEd@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel16resetLeftPaddingEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel16setBottomPaddingEd@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel17componentCompleteEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel17resetRightPaddingEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel18resetBottomPaddingEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel7setFontERK5QFont@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel7setIconERK10QQuickIcon@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel7setTextE7QString@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabel8setColorERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabelC1EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabelC2EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabelD0Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabelD1Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickIconLabelD2Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroup10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroup11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroup11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroup15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroup16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroup18updateImplicitSizeEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroup24itemImplicitWidthChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroup25itemImplicitHeightChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroup5watchEP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroup7unwatchEP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroupC1EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroupC2EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroupD0Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroupD1Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickItemGroupD2Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickCheckLabel11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickCheckLabel11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickCheckLabel16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickCheckLabelC1EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickCheckLabelC2EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImage10resetColorEv@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImage11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImage11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImage12colorChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImage12pixmapChangeEv@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImage15setDefaultColorERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImage16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImage17resetDefaultColorEv@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImage19defaultColorChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImage8setColorERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImageC1EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN16QQuickColorImageC2EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickClippedText11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickClippedText11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickClippedText12setClipWidthEd@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickClippedText13markClipDirtyEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickClippedText13setClipHeightEd@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickClippedText16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickClippedText8setClipXEd@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickClippedText8setClipYEd@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickClippedTextC1EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickClippedTextC2EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 + _ZN15QQuickItemGroup10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroup11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroup11qt_metacastEPKc@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroup15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroup16staticMetaObjectE@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroup18updateImplicitSizeEv@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroup24itemImplicitWidthChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroup25itemImplicitHeightChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroup5watchEP10QQuickItem@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroup7unwatchEP10QQuickItem@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroupC1EP10QQuickItem@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroupC2EP10QQuickItem@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroupD0Ev@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroupD1Ev@Qt_5_PRIVATE_API 5.9.5 + _ZN15QQuickItemGroupD2Ev@Qt_5_PRIVATE_API 5.9.5 + _ZN16QQuickProxyTheme19showPlatformMenuBarEv@Qt_5_PRIVATE_API 5.7.1 + _ZN16QQuickProxyThemeC1EP14QPlatformTheme@Qt_5_PRIVATE_API 5.7.1 + _ZN16QQuickProxyThemeC2EP14QPlatformTheme@Qt_5_PRIVATE_API 5.7.1 + _ZN16QQuickProxyThemeD0Ev@Qt_5_PRIVATE_API 5.7.1 + _ZN16QQuickProxyThemeD1Ev@Qt_5_PRIVATE_API 5.7.1 + _ZN16QQuickProxyThemeD2Ev@Qt_5_PRIVATE_API 5.7.1 + _ZN17QQuickClippedText11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.9.5 + _ZN17QQuickClippedText11qt_metacastEPKc@Qt_5_PRIVATE_API 5.9.5 + _ZN17QQuickClippedText12setClipWidthEd@Qt_5_PRIVATE_API 5.9.5 + _ZN17QQuickClippedText13markClipDirtyEv@Qt_5_PRIVATE_API 5.9.5 + _ZN17QQuickClippedText13setClipHeightEd@Qt_5_PRIVATE_API 5.9.5 + _ZN17QQuickClippedText16staticMetaObjectE@Qt_5_PRIVATE_API 5.9.5 + _ZN17QQuickClippedText8setClipXEd@Qt_5_PRIVATE_API 5.9.5 + _ZN17QQuickClippedText8setClipYEd@Qt_5_PRIVATE_API 5.9.5 + _ZN17QQuickClippedTextC1EP10QQuickItem@Qt_5_PRIVATE_API 5.9.5 + _ZN17QQuickClippedTextC2EP10QQuickItem@Qt_5_PRIVATE_API 5.9.5 _ZN17QQuickStylePlugin11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.7.1 _ZN17QQuickStylePlugin11qt_metacastEPKc@Qt_5_PRIVATE_API 5.7.1 - _ZN17QQuickStylePlugin15initializeThemeEP11QQuickTheme@Qt_5_PRIVATE_API 5.12.2 + _ZN17QQuickStylePlugin13registerTypesEPKc@Qt_5_PRIVATE_API 5.7.1 + _ZN17QQuickStylePlugin16initializeEngineEP10QQmlEnginePKc@Qt_5_PRIVATE_API 5.7.1 _ZN17QQuickStylePlugin16staticMetaObjectE@Qt_5_PRIVATE_API 5.7.1 _ZN17QQuickStylePluginC1EP7QObject@Qt_5_PRIVATE_API 5.7.1 _ZN17QQuickStylePluginC2EP7QObject@Qt_5_PRIVATE_API 5.7.1 @@ -154,41 +94,31 @@ _ZN18QQuickAnimatedNode7stoppedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN18QQuickAnimatedNodeC1EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN18QQuickAnimatedNodeC2EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc - _ZN18QQuickStylePrivate10stylePathsEb@Qt_5_PRIVATE_API 5.12.2 - _ZN18QQuickStylePrivate11readPaletteERK14QSharedPointerI9QSettingsE@Qt_5_PRIVATE_API 5.12.2 + _ZN18QQuickStylePrivate10stylePathsEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN18QQuickStylePrivate13fallbackStyleEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN18QQuickStylePrivate13isCustomStyleEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN18QQuickStylePrivate14configFilePathEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN18QQuickStylePrivate17isDarkSystemThemeEv@Qt_5_PRIVATE_API 5.10.1 _ZN18QQuickStylePrivate4initERK4QUrl@Qt_5_PRIVATE_API 5.9.0~rc _ZN18QQuickStylePrivate5resetEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN18QQuickStylePrivate8readFontERK14QSharedPointerI9QSettingsE@Qt_5_PRIVATE_API 5.12.2 - _ZN18QQuickStylePrivate8settingsERK7QString@Qt_5_PRIVATE_API 5.10.1 - _ZN19QQuickMnemonicLabel11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN19QQuickMnemonicLabel11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN19QQuickMnemonicLabel14updateMnemonicEv@Qt_5_PRIVATE_API 5.10.1 - _ZN19QQuickMnemonicLabel16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN19QQuickMnemonicLabel18setMnemonicVisibleEb@Qt_5_PRIVATE_API 5.10.1 - _ZN19QQuickMnemonicLabel7setTextERK7QString@Qt_5_PRIVATE_API 5.10.1 - _ZN19QQuickMnemonicLabelC1EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN19QQuickMnemonicLabelC2EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN19QQuickStyleSelector11addSelectorERK7QString@Qt_5_PRIVATE_API 5.12.2 - _ZN19QQuickStyleSelector8setPathsERK11QStringList@Qt_5_PRIVATE_API 5.12.2 + _ZN19QQuickStyleAttached11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttached11qt_metacastEPKc@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttached14setParentStyleEPS_@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttached16staticMetaObjectE@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttached17itemParentChangedEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttached17itemWindowChangedEP12QQuickWindow@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttached17parentStyleChangeEPS_S0_@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttached4initEv@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttached8settingsERK7QString@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttachedC1EP7QObject@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttachedC2EP7QObject@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttachedD0Ev@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttachedD1Ev@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleAttachedD2Ev@Qt_5_PRIVATE_API 5.7.1 + _ZN19QQuickStyleSelector10setBaseUrlERK4QUrl@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickStyleSelectorC1Ev@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickStyleSelectorC2Ev@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickStyleSelectorD1Ev@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickStyleSelectorD2Ev@Qt_5_PRIVATE_API 5.7.1 - _ZN20QQuickAttachedObject11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAttachedObject11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAttachedObject16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAttachedObject17setAttachedParentEPS_@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAttachedObject20attachedParentChangeEPS_S0_@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAttachedObject4initEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAttachedObjectC1EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAttachedObjectC2EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAttachedObjectD0Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAttachedObjectD1Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAttachedObjectD2Ev@Qt_5_PRIVATE_API 5.10.1 _ZN21QQuickPaddedRectangle10setPaddingEd@Qt_5_PRIVATE_API 5.7.1 _ZN21QQuickPaddedRectangle11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.7.1 _ZN21QQuickPaddedRectangle11qt_metacastEPKc@Qt_5_PRIVATE_API 5.7.1 @@ -221,43 +151,36 @@ _ZN21QQuickPlaceholderText17componentCompleteEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickPlaceholderTextC1EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickPlaceholderTextC2EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc - _ZN22QQuickIconImagePrivate10updateIconEv@Qt_5_PRIVATE_API 5.10.1 - _ZN22QQuickIconImagePrivate14updateFillModeEv@Qt_5_PRIVATE_API 5.10.1 - _ZN22QQuickIconImagePrivate22updateDevicePixelRatioEd@Qt_5_PRIVATE_API 5.10.1 - _ZNK11QQuickColor10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK11QQuickColor11transparentERK6QColord@Qt_5_PRIVATE_API 5.10.1 - _ZNK11QQuickColor5blendERK6QColorS2_d@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconImage10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconImage4nameEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconImage5colorEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel10isMirroredEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel10topPaddingEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel11leftPaddingEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel12rightPaddingEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel13bottomPaddingEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel4fontEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel4iconEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel4textEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel5colorEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel7displayEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel7spacingEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickIconLabel9alignmentEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickItemGroup10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickItemGroup21calculateImplicitSizeEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK16QQuickCheckLabel10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK16QQuickColorImage10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK16QQuickColorImage12defaultColorEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK16QQuickColorImage5colorEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickClippedText10clipHeightEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickClippedText10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickClippedText5clipXEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickClippedText5clipYEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickClippedText8clipRectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickClippedText9clipWidthEv@Qt_5_PRIVATE_API 5.10.1 + _ZN24QQuickColorImageProvider12requestImageERK7QStringP5QSizeRKS3_@Qt_5_PRIVATE_API 5.7.1 + _ZN24QQuickColorImageProviderC1ERK7QString@Qt_5_PRIVATE_API 5.7.1 + _ZN24QQuickColorImageProviderC2ERK7QString@Qt_5_PRIVATE_API 5.7.1 + _ZNK15QQuickItemGroup10metaObjectEv@Qt_5_PRIVATE_API 5.9.5 + _ZNK15QQuickItemGroup21calculateImplicitSizeEv@Qt_5_PRIVATE_API 5.9.5 + _ZNK16QQuickProxyTheme11keyBindingsEN12QKeySequence11StandardKeyE@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme14standardPixmapEN14QPlatformTheme14StandardPixmapERK6QSizeF@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme16createIconEngineERK7QString@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme18createPlatformMenuEv@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme18standardButtonTextEi@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme21createPlatformMenuBarEv@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme22createPlatformMenuItemEv@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme23usePlatformNativeDialogEN14QPlatformTheme10DialogTypeE@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme26createPlatformDialogHelperEN14QPlatformTheme10DialogTypeE@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme28createPlatformSystemTrayIconEv@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme4fontEN14QPlatformTheme4FontE@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme5themeEv@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme7paletteEN14QPlatformTheme7PaletteE@Qt_5_PRIVATE_API 5.7.1 + _ZNK16QQuickProxyTheme8fileIconERK9QFileInfo6QFlagsIN14QPlatformTheme10IconOptionEE@Qt_5_PRIVATE_API 5.9.0~rc + _ZNK16QQuickProxyTheme9themeHintEN14QPlatformTheme9ThemeHintE@Qt_5_PRIVATE_API 5.7.1 + _ZNK17QQuickClippedText10clipHeightEv@Qt_5_PRIVATE_API 5.9.5 + _ZNK17QQuickClippedText10metaObjectEv@Qt_5_PRIVATE_API 5.9.5 + _ZNK17QQuickClippedText5clipXEv@Qt_5_PRIVATE_API 5.9.5 + _ZNK17QQuickClippedText5clipYEv@Qt_5_PRIVATE_API 5.9.5 + _ZNK17QQuickClippedText8clipRectEv@Qt_5_PRIVATE_API 5.9.5 + _ZNK17QQuickClippedText9clipWidthEv@Qt_5_PRIVATE_API 5.9.5 _ZNK17QQuickStylePlugin10metaObjectEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK17QQuickStylePlugin11resolvedUrlERK7QString@Qt_5_PRIVATE_API 5.12.2 + _ZNK17QQuickStylePlugin11createThemeEv@Qt_5_PRIVATE_API 5.7.1 _ZNK17QQuickStylePlugin4nameEv@Qt_5_PRIVATE_API 5.7.1 + _ZNK17QQuickStylePlugin7typeUrlERK7QString@Qt_5_PRIVATE_API 5.7.1 _ZNK17QQuickTumblerView10metaObjectEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK17QQuickTumblerView4pathEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK17QQuickTumblerView5modelEv@Qt_5_PRIVATE_API 5.9.0~rc @@ -268,15 +191,11 @@ _ZNK18QQuickAnimatedNode8durationEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK18QQuickAnimatedNode9isRunningEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK18QQuickAnimatedNode9loopCountEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK19QQuickMnemonicLabel10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK19QQuickMnemonicLabel17isMnemonicVisibleEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK19QQuickMnemonicLabel4textEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK19QQuickStyleSelector5pathsEv@Qt_5_PRIVATE_API 5.12.2 + _ZNK19QQuickStyleAttached10metaObjectEv@Qt_5_PRIVATE_API 5.7.1 + _ZNK19QQuickStyleAttached11childStylesEv@Qt_5_PRIVATE_API 5.7.1 + _ZNK19QQuickStyleAttached11parentStyleEv@Qt_5_PRIVATE_API 5.7.1 _ZNK19QQuickStyleSelector6selectERK7QString@Qt_5_PRIVATE_API 5.7.1 - _ZNK19QQuickStyleSelector9selectorsEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK20QQuickAttachedObject10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK20QQuickAttachedObject14attachedParentEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK20QQuickAttachedObject16attachedChildrenEv@Qt_5_PRIVATE_API 5.10.1 + _ZNK19QQuickStyleSelector7baseUrlEv@Qt_5_PRIVATE_API 5.7.1 _ZNK21QQuickPaddedRectangle10metaObjectEv@Qt_5_PRIVATE_API 5.7.1 _ZNK21QQuickPaddedRectangle10topPaddingEv@Qt_5_PRIVATE_API 5.7.1 _ZNK21QQuickPaddedRectangle11leftPaddingEv@Qt_5_PRIVATE_API 5.7.1 @@ -284,63 +203,43 @@ _ZNK21QQuickPaddedRectangle13bottomPaddingEv@Qt_5_PRIVATE_API 5.7.1 _ZNK21QQuickPaddedRectangle7paddingEv@Qt_5_PRIVATE_API 5.7.1 _ZNK21QQuickPlaceholderText10metaObjectEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK22QQuickIconImagePrivate25calculateDevicePixelRatioEv@Qt_5_PRIVATE_API 5.10.1 - _ZTI11QQuickColor@Qt_5_PRIVATE_API 5.10.1 - _ZTI15QQuickIconImage@Qt_5_PRIVATE_API 5.10.1 - _ZTI15QQuickIconLabel@Qt_5_PRIVATE_API 5.10.1 - _ZTI15QQuickItemGroup@Qt_5_PRIVATE_API 5.10.1 - _ZTI16QQuickCheckLabel@Qt_5_PRIVATE_API 5.10.1 - _ZTI16QQuickColorImage@Qt_5_PRIVATE_API 5.10.1 - _ZTI17QQuickClippedText@Qt_5_PRIVATE_API 5.10.1 + _ZTI15QQuickItemGroup@Qt_5_PRIVATE_API 5.9.5 + _ZTI16QQuickProxyTheme@Qt_5_PRIVATE_API 5.7.1 + _ZTI17QQuickClippedText@Qt_5_PRIVATE_API 5.9.5 _ZTI17QQuickStylePlugin@Qt_5_PRIVATE_API 5.7.1 _ZTI17QQuickTumblerView@Qt_5_PRIVATE_API 5.9.0~rc _ZTI18QQuickAnimatedNode@Qt_5_PRIVATE_API 5.9.0~rc - _ZTI18QQuickImagePrivate@Qt_5 5.10.1 - _ZTI19QQuickMnemonicLabel@Qt_5_PRIVATE_API 5.10.1 - _ZTI20QQuickAttachedObject@Qt_5_PRIVATE_API 5.10.1 + _ZTI19QQuickStyleAttached@Qt_5_PRIVATE_API 5.7.1 _ZTI21QQuickPaddedRectangle@Qt_5_PRIVATE_API 5.7.1 _ZTI21QQuickPlaceholderText@Qt_5_PRIVATE_API 5.9.0~rc - _ZTI22QQuickIconImagePrivate@Qt_5_PRIVATE_API 5.10.1 - _ZTI29QQuickImplicitSizeItemPrivate@Qt_5 5.10.1 - _ZTS11QQuickColor@Qt_5_PRIVATE_API 5.10.1 - _ZTS15QQuickIconImage@Qt_5_PRIVATE_API 5.10.1 - _ZTS15QQuickIconLabel@Qt_5_PRIVATE_API 5.10.1 - _ZTS15QQuickItemGroup@Qt_5_PRIVATE_API 5.10.1 - _ZTS16QQuickCheckLabel@Qt_5_PRIVATE_API 5.10.1 - _ZTS16QQuickColorImage@Qt_5_PRIVATE_API 5.10.1 - _ZTS17QQuickClippedText@Qt_5_PRIVATE_API 5.10.1 + _ZTI24QQuickColorImageProvider@Qt_5_PRIVATE_API 5.7.1 + _ZTS15QQuickItemGroup@Qt_5_PRIVATE_API 5.9.5 + _ZTS16QQuickProxyTheme@Qt_5_PRIVATE_API 5.7.1 + _ZTS17QQuickClippedText@Qt_5_PRIVATE_API 5.9.5 _ZTS17QQuickStylePlugin@Qt_5_PRIVATE_API 5.7.1 _ZTS17QQuickTumblerView@Qt_5_PRIVATE_API 5.9.0~rc _ZTS18QQuickAnimatedNode@Qt_5_PRIVATE_API 5.9.0~rc - _ZTS18QQuickImagePrivate@Qt_5 5.10.1 - _ZTS19QQuickMnemonicLabel@Qt_5_PRIVATE_API 5.10.1 - _ZTS20QQuickAttachedObject@Qt_5_PRIVATE_API 5.10.1 + _ZTS19QQuickStyleAttached@Qt_5_PRIVATE_API 5.7.1 _ZTS21QQuickPaddedRectangle@Qt_5_PRIVATE_API 5.7.1 _ZTS21QQuickPlaceholderText@Qt_5_PRIVATE_API 5.9.0~rc - _ZTS22QQuickIconImagePrivate@Qt_5_PRIVATE_API 5.10.1 - _ZTS29QQuickImplicitSizeItemPrivate@Qt_5 5.10.1 - _ZTV11QQuickColor@Qt_5_PRIVATE_API 5.10.1 - _ZTV15QQuickIconImage@Qt_5_PRIVATE_API 5.10.1 - _ZTV15QQuickIconLabel@Qt_5_PRIVATE_API 5.10.1 - _ZTV15QQuickItemGroup@Qt_5_PRIVATE_API 5.10.1 - _ZTV16QQuickCheckLabel@Qt_5_PRIVATE_API 5.10.1 - _ZTV16QQuickColorImage@Qt_5_PRIVATE_API 5.10.1 - _ZTV17QQuickClippedText@Qt_5_PRIVATE_API 5.10.1 + _ZTS24QQuickColorImageProvider@Qt_5_PRIVATE_API 5.7.1 + _ZTV15QQuickItemGroup@Qt_5_PRIVATE_API 5.9.5 + _ZTV16QQuickProxyTheme@Qt_5_PRIVATE_API 5.7.1 + _ZTV17QQuickClippedText@Qt_5_PRIVATE_API 5.9.5 _ZTV17QQuickStylePlugin@Qt_5_PRIVATE_API 5.7.1 _ZTV17QQuickTumblerView@Qt_5_PRIVATE_API 5.9.0~rc _ZTV18QQuickAnimatedNode@Qt_5_PRIVATE_API 5.9.0~rc - _ZTV19QQuickMnemonicLabel@Qt_5_PRIVATE_API 5.10.1 - _ZTV20QQuickAttachedObject@Qt_5_PRIVATE_API 5.10.1 + _ZTV19QQuickStyleAttached@Qt_5_PRIVATE_API 5.7.1 _ZTV21QQuickPaddedRectangle@Qt_5_PRIVATE_API 5.7.1 _ZTV21QQuickPlaceholderText@Qt_5_PRIVATE_API 5.9.0~rc - _ZTV22QQuickIconImagePrivate@Qt_5_PRIVATE_API 5.10.1 - _ZTV29QQuickImplicitSizeItemPrivate@Qt_5 5.10.1 - (c++)"non-virtual thunk to QQuickIconImage::componentComplete()@Qt_5_PRIVATE_API" 5.10.1 - (c++)"non-virtual thunk to QQuickIconLabel::componentComplete()@Qt_5_PRIVATE_API" 5.10.1 - (c++)"non-virtual thunk to QQuickIconLabel::~QQuickIconLabel()@Qt_5_PRIVATE_API" 5.10.1 - (c++)"non-virtual thunk to QQuickItemGroup::itemImplicitHeightChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.10.1 - (c++)"non-virtual thunk to QQuickItemGroup::itemImplicitWidthChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.10.1 - (c++)"non-virtual thunk to QQuickItemGroup::~QQuickItemGroup()@Qt_5_PRIVATE_API" 5.10.1 + _ZTV24QQuickColorImageProvider@Qt_5_PRIVATE_API 5.7.1 + (c++)"non-virtual thunk to QQuickItemGroup::itemImplicitHeightChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.9.5 + (c++)"non-virtual thunk to QQuickItemGroup::itemImplicitWidthChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.9.5 + (c++)"non-virtual thunk to QQuickItemGroup::~QQuickItemGroup()@Qt_5_PRIVATE_API" 5.9.5 (c++)"non-virtual thunk to QQuickPlaceholderText::componentComplete()@Qt_5_PRIVATE_API" 5.9.0~rc + (c++)"non-virtual thunk to QQuickStyleAttached::itemParentChanged(QQuickItem*, QQuickItem*)@Qt_5_PRIVATE_API" 5.7.1 + (c++)"non-virtual thunk to QQuickStyleAttached::~QQuickStyleAttached()@Qt_5_PRIVATE_API" 5.7.1 + (c++)"non-virtual thunk to QQuickStylePlugin::initializeEngine(QQmlEngine*, char const*)@Qt_5_PRIVATE_API" 5.7.1 + (c++)"non-virtual thunk to QQuickStylePlugin::registerTypes(char const*)@Qt_5_PRIVATE_API" 5.7.1 (c++)"non-virtual thunk to QQuickStylePlugin::~QQuickStylePlugin()@Qt_5_PRIVATE_API" 5.7.1 (c++)"non-virtual thunk to QQuickTumblerView::componentComplete()@Qt_5_PRIVATE_API" 5.9.0~rc diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/libqt5quicktemplates2-5.symbols qtquickcontrols2-opensource-src-5.9.5/debian/libqt5quicktemplates2-5.symbols --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/libqt5quicktemplates2-5.symbols 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/libqt5quicktemplates2-5.symbols 2018-04-14 20:50:00.000000000 +0000 @@ -1,20 +1,5 @@ -# SymbolsHelper-Confirmed: 5.12.5 amd64 i386 m68k mips64el mipsel powerpc ppc64 ppc64el s390x +# SymbolsHelper-Confirmed: 5.9.5 amd64 arm64 armhf i386 ppc64el s390x libQt5QuickTemplates2.so.5 libqt5quicktemplates2-5 #MINVER# -* Build-Depends-Package: qtquickcontrols2-5-dev - Qt_5.0@Qt_5.0 5.12.3 - Qt_5.10@Qt_5.10 5.12.3 - Qt_5.11@Qt_5.11 5.12.3 - Qt_5.12@Qt_5.12 5.12.3 - Qt_5.1@Qt_5.1 5.12.3 - Qt_5.2@Qt_5.2 5.12.3 - Qt_5.3@Qt_5.3 5.12.3 - Qt_5.4@Qt_5.4 5.12.3 - Qt_5.5@Qt_5.5 5.12.3 - Qt_5.6@Qt_5.6 5.12.3 - Qt_5.7@Qt_5.7 5.12.3 - Qt_5.8@Qt_5.8 5.12.3 - Qt_5.9@Qt_5.9 5.12.3 - Qt_5@Qt_5 5.12.3 Qt_5_PRIVATE_API@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial10setPressedEb@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial10touchEventEP11QTouchEvent@Qt_5_PRIVATE_API 5.9.0~rc @@ -28,17 +13,16 @@ _ZN10QQuickDial11wrapChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickDial12angleChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial12mirrorChangeEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN10QQuickDial12setInputModeENS_9InputModeE@Qt_5_PRIVATE_API 5.12.2 _ZN10QQuickDial12valueChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial13handleChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial13keyPressEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.6.0~beta + _ZN10QQuickDial14mouseMoveEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial14pressedChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial15keyReleaseEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial15mousePressEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial15positionChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial15snapModeChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial15stepSizeChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN10QQuickDial16inputModeChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN10QQuickDial16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial17componentCompleteEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDial26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.6.0~beta @@ -54,98 +38,54 @@ _ZN10QQuickDial9toChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDialC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickDialC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN10QQuickIcon10resetColorEv@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIcon10resetWidthEv@Qt_5_PRIVATE_API 5.11.1 - _ZN10QQuickIcon11resetHeightEv@Qt_5_PRIVATE_API 5.11.1 - _ZN10QQuickIcon11resetSourceEv@Qt_5_PRIVATE_API 5.11.1 - _ZN10QQuickIcon16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIcon7setNameERK7QString@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIcon8setColorERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIcon8setWidthEi@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIcon9resetNameEv@Qt_5_PRIVATE_API 5.11.1 - _ZN10QQuickIcon9setHeightEi@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIcon9setSourceERK4QUrl@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIconC1ERKS_@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIconC1Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIconC2ERKS_@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIconC2Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIconD1Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIconD2Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickIconaSERKS_@Qt_5_PRIVATE_API 5.10.1 _ZN10QQuickMenu10insertItemEiP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN10QQuickMenu10insertMenuEiPS_@Qt_5_PRIVATE_API 5.10.1 _ZN10QQuickMenu10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.7.1 - _ZN10QQuickMenu10removeItemEP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu10removeItemERK8QVariant@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu10removeMenuEPS_@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu10setCascadeEb@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu10setOverlapEd@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu10takeActionEi@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu10timerEventEP11QTimerEvent@Qt_5_PRIVATE_API 5.10.1 + _ZN10QQuickMenu10removeItemEi@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickMenu11contentDataEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickMenu11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickMenu11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta - _ZN10QQuickMenu11setDelegateEP13QQmlComponent@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu12countChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu12insertActionEiP12QQuickAction@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu12removeActionEP12QQuickAction@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu12resetCascadeEv@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu12titleChangedERK7QString@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu13keyPressEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu14cascadeChangedEb@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu14overlapChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu15delegateChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu15setCurrentIndexEi@Qt_5_PRIVATE_API 5.10.1 + _ZN10QQuickMenu12titleChangedEv@Qt_5_PRIVATE_API 5.7.1 + _ZN10QQuickMenu15keyReleaseEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickMenu16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickMenu17componentCompleteEv@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickMenu17contentItemChangeEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.7.1 - _ZN10QQuickMenu19currentIndexChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu5popupEP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu5popupEP14QQmlV4Function@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu5popupERK7QPointFP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 _ZN10QQuickMenu7addItemEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN10QQuickMenu7addMenuEPS_@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu7dismissEv@Qt_5_PRIVATE_API 5.10.1 _ZN10QQuickMenu8moveItemEii@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickMenu8setTitleER7QString@Qt_5_PRIVATE_API 5.7.1 - _ZN10QQuickMenu8takeItemEi@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu8takeMenuEi@Qt_5_PRIVATE_API 5.10.1 - _ZN10QQuickMenu9addActionEP12QQuickAction@Qt_5_PRIVATE_API 5.10.1 _ZN10QQuickMenuC1EP7QObject@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickMenuC2EP7QObject@Qt_5_PRIVATE_API 5.6.0~beta + _ZN10QQuickPage11contentDataEv@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickPage11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickPage11qt_metacastEPKc@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickPage12titleChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickPage13footerChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickPage13headerChangedEv@Qt_5_PRIVATE_API 5.7.1 + _ZN10QQuickPage13paddingChangeERK9QMarginsFS2_@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickPage13spacingChangeEdd@Qt_5_PRIVATE_API 5.9.0~rc + _ZN10QQuickPage15contentChildrenEv@Qt_5_PRIVATE_API 5.7.1 + _ZN10QQuickPage15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.7.1 + _ZN10QQuickPage15setContentWidthEd@Qt_5_PRIVATE_API 5.9.0~rc + _ZN10QQuickPage16setContentHeightEd@Qt_5_PRIVATE_API 5.9.0~rc _ZN10QQuickPage16staticMetaObjectE@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickPage17componentCompleteEv@Qt_5_PRIVATE_API 5.9.1 + _ZN10QQuickPage17contentItemChangeEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.7.1 + _ZN10QQuickPage19contentWidthChangedEv@Qt_5_PRIVATE_API 5.9.0~rc + _ZN10QQuickPage20contentHeightChangedEv@Qt_5_PRIVATE_API 5.9.0~rc + _ZN10QQuickPage22contentChildrenChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickPage26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN10QQuickPage26implicitFooterWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN10QQuickPage26implicitHeaderWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN10QQuickPage27implicitFooterHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN10QQuickPage27implicitHeaderHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN10QQuickPage8setTitleERK7QString@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickPage9setFooterEP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickPage9setHeaderEP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 _ZN10QQuickPageC1EP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 - _ZN10QQuickPageC1ER17QQuickPagePrivateP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 _ZN10QQuickPageC2EP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 - _ZN10QQuickPageC2ER17QQuickPagePrivateP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN10QQuickPageD0Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN10QQuickPageD1Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN10QQuickPageD2Ev@Qt_5_PRIVATE_API 5.12.2 + _ZN10QQuickPane11contentDataEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickPane11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickPane11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta + _ZN10QQuickPane15contentChildrenEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickPane15setContentWidthEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickPane16setContentHeightEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickPane16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN10QQuickPane17componentCompleteEv@Qt_5_PRIVATE_API 5.12.2 _ZN10QQuickPane17contentItemChangeEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.6.0~beta - _ZN10QQuickPane17contentSizeChangeERK6QSizeFS2_@Qt_5_PRIVATE_API 5.12.2 - _ZN10QQuickPane17resetContentWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZN10QQuickPane18resetContentHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZN10QQuickPane19contentWidthChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickPane20contentHeightChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickPane22contentChildrenChangedEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -153,9 +93,6 @@ _ZN10QQuickPaneC1ER17QQuickPanePrivateP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickPaneC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN10QQuickPaneC2ER17QQuickPanePrivateP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN10QQuickPaneD0Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN10QQuickPaneD1Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN10QQuickPaneD2Ev@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickFrame11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickFrame11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickFrame16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta @@ -165,48 +102,25 @@ _ZN11QQuickFrameC2ER18QQuickFramePrivateP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickLabel10classBeginEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickLabel10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN11QQuickLabel10setPaletteERK8QPalette@Qt_5_PRIVATE_API 5.10.1 _ZN11QQuickLabel11fontChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN11QQuickLabel11insetChangeERK9QMarginsFS2_@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickLabel11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickLabel11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta - _ZN11QQuickLabel11setTopInsetEd@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabel12resetPaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZN11QQuickLabel12setLeftInsetEd@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabel13resetTopInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickLabel13setBackgroundEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN11QQuickLabel13setRightInsetEd@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabel14paletteChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN11QQuickLabel14resetLeftInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabel14setBottomInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickLabel15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.6.0~beta - _ZN11QQuickLabel15resetRightInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabel15topInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabel16leftInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabel16resetBottomInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickLabel16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickLabel17backgroundChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickLabel17componentCompleteEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickLabel17rightInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabel18bottomInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabel30implicitBackgroundWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabel31implicitBackgroundHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickLabel7setFontERK5QFont@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickLabelC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickLabelC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN11QQuickLabelD0Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabelD1Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickLabelD2Ev@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup10classBeginEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup10dimChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup10fontChangeERK5QFontS2_@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup10resetWidthEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup10setEnabledEb@Qt_5_PRIVATE_API 5.10.1 _ZN11QQuickPopup10setMarginsEd@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup10setOpacityEd@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup10setPaddingEd@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup10setPaletteERK8QPalette@Qt_5_PRIVATE_API 5.10.1 _ZN11QQuickPopup10setSpacingEd@Qt_5_PRIVATE_API 5.9.0~rc _ZN11QQuickPopup10setVisibleEb@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup10touchEventEP11QTouchEvent@Qt_5_PRIVATE_API 5.9.0~rc @@ -214,15 +128,14 @@ _ZN11QQuickPopup11aboutToHideEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickPopup11aboutToShowEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickPopup11clipChangedEv@Qt_5_PRIVATE_API 5.7.1 + _ZN11QQuickPopup11contentDataEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup11exitChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup11fontChangedEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup11insetChangeERK9QMarginsFS2_@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickPopup11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickPopup11resetHeightEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup11resetLocaleEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup11setPositionERK7QPointF@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup11setTopInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup12enterChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup12focusChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickPopup12focusInEventEP11QFocusEvent@Qt_5_PRIVATE_API 5.7.1 @@ -231,10 +144,8 @@ _ZN11QQuickPopup12overlayEventEP10QQuickItemP6QEvent@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup12resetMarginsEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup12resetPaddingEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup12resetPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZN11QQuickPopup12resetSpacingEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN11QQuickPopup12scaleChangedEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup12setLeftInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup12setTopMarginEd@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup12widthChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup13focusOutEventEP11QFocusEvent@Qt_5_PRIVATE_API 5.7.1 @@ -242,50 +153,36 @@ _ZN11QQuickPopup13keyPressEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup13localeChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup13marginsChangeERK9QMarginsFS2_@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup13openedChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN11QQuickPopup13paddingChangeERK9QMarginsFS2_@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup13paletteChangeERK8QPaletteS2_@Qt_5_PRIVATE_API 5.10.1 _ZN11QQuickPopup13parentChangedEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup13resetTopInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup13setBackgroundEP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup13setLeftMarginEd@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup13setParentItemEP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup13setRightInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup13setTopPaddingEd@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup13spacingChangeEdd@Qt_5_PRIVATE_API 5.9.0~rc _ZN11QQuickPopup13windowChangedEP12QQuickWindow@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup14enabledChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN11QQuickPopup14marginsChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup14mouseMoveEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup14opacityChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup14paddingChangedEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup14paletteChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN11QQuickPopup14resetLeftInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup14resetTopMarginEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup14setBottomInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup14setClosePolicyE6QFlagsINS_15ClosePolicyFlagEE@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup14setContentItemEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickPopup14setLeftPaddingEd@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup14setRightMarginEd@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup14spacingChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN11QQuickPopup14visibleChangedEv@Qt_5_PRIVATE_API 5.6.0~beta + _ZN11QQuickPopup15contentChildrenEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup15keyReleaseEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup15mirroredChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN11QQuickPopup15mousePressEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup15resetLeftMarginEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup15resetParentItemEv@Qt_5_PRIVATE_API 5.10.1 - _ZN11QQuickPopup15resetRightInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup15resetTopPaddingEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup15setBottomMarginEd@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup15setContentWidthEd@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup15setRightPaddingEd@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup15topInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup16forceActiveFocusEN2Qt11FocusReasonE@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup16leftInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup16mouseUngrabEventEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup16resetBottomInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickPopup16resetClosePolicyEv@Qt_5_PRIVATE_API 5.10.1 _ZN11QQuickPopup16resetLeftPaddingEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup16resetRightMarginEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup16setBottomPaddingEd@Qt_5_PRIVATE_API 5.7.1 @@ -297,33 +194,27 @@ _ZN11QQuickPopup17backgroundChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup17componentCompleteEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup17contentItemChangeEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup17contentSizeChangeERK6QSizeFS2_@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup17leftMarginChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup17mouseReleaseEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup17resetBottomMarginEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup17resetRightPaddingEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup17rightInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup17setAccessibleNameERK7QString@Qt_5_PRIVATE_API 5.9.0~rc _ZN11QQuickPopup17setImplicitHeightEd@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup17topPaddingChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup18accessiblePropertyEPKc@Qt_5_PRIVATE_API 5.9.0~rc _ZN11QQuickPopup18activeFocusChangedEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup18bottomInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup18closePolicyChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup18contentItemChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickPopup18leftPaddingChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup18resetBottomPaddingEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup18rightMarginChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup18setTransformOriginENS_15TransformOriginE@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup18setVerticalPaddingEd@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup19bottomMarginChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup19contentWidthChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup19rightPaddingChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup20bottomPaddingChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup20contentHeightChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup20implicitWidthChangedEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup20resetVerticalPaddingEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickPopup20setHorizontalPaddingEd@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup21availableWidthChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup21childMouseEventFilterEP10QQuickItemP6QEvent@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup21implicitHeightChangedEv@Qt_5_PRIVATE_API 5.7.1 @@ -331,15 +222,8 @@ _ZN11QQuickPopup21setAccessiblePropertyEPKcRK8QVariant@Qt_5_PRIVATE_API 5.9.0~rc _ZN11QQuickPopup22availableHeightChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup22contentChildrenChangedEv@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup22resetHorizontalPaddingEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickPopup22verticalPaddingChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickPopup24horizontalPaddingChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.9.0~rc _ZN11QQuickPopup26setFiltersChildMouseEventsEb@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickPopup27implicitContentWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickPopup28implicitContentHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickPopup30implicitBackgroundWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickPopup31implicitBackgroundHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN11QQuickPopup4openEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN11QQuickPopup4setXEd@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickPopup4setYEd@Qt_5_PRIVATE_API 5.7.1 @@ -400,47 +284,13 @@ _ZN11QQuickSwipe9setBehindEP13QQmlComponent@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickSwipeC1EP19QQuickSwipeDelegate@Qt_5_PRIVATE_API 5.7.1 _ZN11QQuickSwipeC2EP19QQuickSwipeDelegate@Qt_5_PRIVATE_API 5.7.1 - _ZN11QQuickTheme10setPaletteENS_5ScopeERK8QPalette@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickTheme4fontENS_5ScopeE@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickTheme7paletteENS_5ScopeE@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickTheme7setFontENS_5ScopeERK5QFont@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickTheme8instanceEv@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickThemeC1Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickThemeC2Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickThemeD1Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN11QQuickThemeD2Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN12QQuickAction10setCheckedEb@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction10setEnabledEb@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction11eventFilterEP7QObjectP6QEvent@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction11iconChangedERK10QQuickIcon@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction11setShortcutERK12QKeySequence@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction11textChangedERK7QString@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction12resetEnabledEv@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction12setCheckableEb@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction14checkedChangedEb@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction14enabledChangedEb@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction15shortcutChangedERK12QKeySequence@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction16checkableChangedEb@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction5eventEP6QEvent@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction6toggleEP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction7setIconERK10QQuickIcon@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction7setTextERK7QString@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction7toggledEP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction7triggerEP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickAction9triggeredEP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickActionC1EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickActionC2EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickActionD0Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickActionD1Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickActionD2Ev@Qt_5_PRIVATE_API 5.10.1 _ZN12QQuickButton11flatChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN12QQuickButton11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickButton11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta + _ZN12QQuickButton12buttonChangeEN20QQuickAbstractButton12ButtonChangeE@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickButton14setHighlightedEb@Qt_5_PRIVATE_API 5.7.1 _ZN12QQuickButton16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta + _ZN12QQuickButton17autoRepeatChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN12QQuickButton18highlightedChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN12QQuickButton7setFlatEb@Qt_5_PRIVATE_API 5.7.1 _ZN12QQuickButtonC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta @@ -452,28 +302,20 @@ _ZN12QQuickDialog12titleChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDialog13footerChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDialog13headerChangedEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN12QQuickDialog13helpRequestedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickDialog13resultChangedEv@Qt_5_PRIVATE_API 5.10.1 + _ZN12QQuickDialog13paddingChangeERK9QMarginsFS2_@Qt_5_PRIVATE_API 5.9.0~rc + _ZN12QQuickDialog13spacingChangeEdd@Qt_5_PRIVATE_API 5.9.0~rc + _ZN12QQuickDialog15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDialog16staticMetaObjectE@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDialog18setStandardButtonsE6QFlagsIN21QPlatformDialogHelper14StandardButtonEE@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDialog22standardButtonsChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDialog26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN12QQuickDialog26implicitFooterWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN12QQuickDialog26implicitHeaderWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN12QQuickDialog27implicitFooterHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN12QQuickDialog27implicitHeaderHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN12QQuickDialog4doneEi@Qt_5_PRIVATE_API 5.10.1 - _ZN12QQuickDialog5resetEv@Qt_5_PRIVATE_API 5.10.1 _ZN12QQuickDialog6acceptEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDialog6rejectEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN12QQuickDialog7appliedEv@Qt_5_PRIVATE_API 5.10.1 _ZN12QQuickDialog8acceptedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDialog8rejectedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDialog8setTitleERK7QString@Qt_5_PRIVATE_API 5.9.0~rc - _ZN12QQuickDialog9discardedEv@Qt_5_PRIVATE_API 5.10.1 _ZN12QQuickDialog9setFooterEP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDialog9setHeaderEP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc - _ZN12QQuickDialog9setResultEi@Qt_5_PRIVATE_API 5.10.1 _ZN12QQuickDialogC1EP7QObject@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDialogC2EP7QObject@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickDrawer10touchEventEP11QTouchEvent@Qt_5_PRIVATE_API 5.9.0~rc @@ -508,6 +350,7 @@ _ZN12QQuickSlider12valueChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickSlider13handleChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickSlider13keyPressEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.6.0~beta + _ZN12QQuickSlider14mouseMoveEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickSlider14pressedChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickSlider14setOrientationEN2Qt11OrientationE@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickSlider15keyReleaseEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.6.0~beta @@ -518,13 +361,8 @@ _ZN12QQuickSlider16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickSlider17componentCompleteEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickSlider18orientationChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN12QQuickSlider21setTouchDragThresholdEd@Qt_5_PRIVATE_API 5.12.2 _ZN12QQuickSlider21visualPositionChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN12QQuickSlider23resetTouchDragThresholdEv@Qt_5_PRIVATE_API 5.12.2 - _ZN12QQuickSlider25touchDragThresholdChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN12QQuickSlider26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.6.0~beta - _ZN12QQuickSlider26implicitHandleWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN12QQuickSlider27implicitHandleHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN12QQuickSlider5movedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickSlider5setToEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickSlider7setFromEd@Qt_5_PRIVATE_API 5.6.0~beta @@ -536,9 +374,6 @@ _ZN12QQuickSlider9toChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickSliderC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickSliderC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN12QQuickSliderD0Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN12QQuickSliderD1Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN12QQuickSliderD2Ev@Qt_5_PRIVATE_API 5.12.2 _ZN12QQuickSwitch10touchEventEP11QTouchEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickSwitch11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickSwitch11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta @@ -559,11 +394,15 @@ _ZN12QQuickTabBar12updatePolishEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickTabBar15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickTabBar15positionChangedEv@Qt_5_PRIVATE_API 5.7.1 + _ZN12QQuickTabBar15setContentWidthEd@Qt_5_PRIVATE_API 5.9.0~rc + _ZN12QQuickTabBar16setContentHeightEd@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickTabBar16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickTabBar17componentCompleteEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN12QQuickTabBar21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.10.1 + _ZN12QQuickTabBar17resetContentWidthEv@Qt_5_PRIVATE_API 5.9.0~rc + _ZN12QQuickTabBar18resetContentHeightEv@Qt_5_PRIVATE_API 5.9.0~rc + _ZN12QQuickTabBar19contentWidthChangedEv@Qt_5_PRIVATE_API 5.9.0~rc + _ZN12QQuickTabBar20contentHeightChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN12QQuickTabBar9itemAddedEiP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN12QQuickTabBar9itemMovedEiP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 _ZN12QQuickTabBarC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN12QQuickTabBarC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl10classBeginEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -571,41 +410,29 @@ _ZN13QQuickControl10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl10setHoveredEb@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickControl10setPaddingEd@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl10setPaletteERK8QPalette@Qt_5_PRIVATE_API 5.10.1 _ZN13QQuickControl10setSpacingEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl10touchEventEP11QTouchEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN13QQuickControl10wheelEventEP11QWheelEvent@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickControl11fontChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl11hoverChangeEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN13QQuickControl11insetChangeERK9QMarginsFS2_@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl11resetLocaleEv@Qt_5_PRIVATE_API 5.7.1 - _ZN13QQuickControl11setTopInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl12focusInEventEP11QFocusEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl12localeChangeERK7QLocaleS2_@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl12mirrorChangeEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl12resetPaddingEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl12resetPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZN13QQuickControl12resetSpacingEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl12setLeftInsetEd@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickControl13enabledChangeEv@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl13focusOutEventEP11QFocusEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl13localeChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl13paddingChangeERK9QMarginsFS2_@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl13paletteChangeERK8QPaletteS2_@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickControl13resetTopInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl13setBackgroundEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl13setRightInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl13setTopPaddingEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl13spacingChangeEdd@Qt_5_PRIVATE_API 5.9.0~rc _ZN13QQuickControl14hoverMoveEventEP11QHoverEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN13QQuickControl14hoveredChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickControl14mouseMoveEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl14paddingChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl14paletteChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickControl14resetLeftInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickControl14setBottomInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl14setContentItemEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl14setFocusPolicyEN2Qt11FocusPolicyE@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickControl14setFocusReasonEN2Qt11FocusReasonE@Qt_5_PRIVATE_API 5.6.0~beta @@ -616,15 +443,11 @@ _ZN13QQuickControl15hoverLeaveEventEP11QHoverEvent@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickControl15mirroredChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl15mousePressEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl15resetRightInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl15resetTopPaddingEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl15setHoverEnabledEb@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickControl15setRightPaddingEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl15setWheelEnabledEb@Qt_5_PRIVATE_API 5.7.1 - _ZN13QQuickControl15topInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickControl16leftInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl16mouseUngrabEventEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN13QQuickControl16resetBottomInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl16resetLeftPaddingEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl16setBottomPaddingEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta @@ -635,38 +458,23 @@ _ZN13QQuickControl17mouseReleaseEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl17resetHoverEnabledEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN13QQuickControl17resetRightPaddingEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl17rightInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl17setAccessibleNameERK7QString@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl17setBaselineOffsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl17topPaddingChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl18accessiblePropertyEPKc@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl18bottomInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl18contentItemChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl18focusPolicyChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickControl18focusReasonChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl18leftPaddingChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl18resetBottomPaddingEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl18setVerticalPaddingEd@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl18visualFocusChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickControl19hoverEnabledChangedEv@Qt_5_PRIVATE_API 5.7.1 - _ZN13QQuickControl19resetBaselineOffsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl19rightPaddingChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl19wheelEnabledChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickControl20bottomPaddingChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl20resetVerticalPaddingEv@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickControl20setHorizontalPaddingEd@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl21availableWidthChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl21baselineOffsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl21setAccessiblePropertyEPKcRK8QVariant@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl22availableHeightChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl22resetHorizontalPaddingEv@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickControl22verticalPaddingChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickControl24horizontalPaddingChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControl27implicitContentWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickControl28implicitContentHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickControl30implicitBackgroundWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickControl31implicitBackgroundHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickControl7setFontERK5QFont@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl9resetFontEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControl9setLocaleERK7QLocale@Qt_5_PRIVATE_API 5.6.0~beta @@ -674,28 +482,6 @@ _ZN13QQuickControlC1ER20QQuickControlPrivateP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControlC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickControlC2ER20QQuickControlPrivateP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickControlD0Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickControlD1Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickControlD2Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickMenuBar10insertMenuEiP10QQuickMenu@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar10removeMenuEP10QQuickMenu@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar11eventFilterEP7QObjectP6QEvent@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar11itemRemovedEiP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar11setDelegateEP13QQmlComponent@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar12menusChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar13keyPressEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar15delegateChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar15hoverLeaveEventEP11QHoverEvent@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar15keyReleaseEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar7addMenuEP10QQuickMenu@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar8takeMenuEi@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar9itemAddedEiP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBar9itemMovedEiP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBarC1EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickMenuBarC2EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 _ZN13QQuickOverlay10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickOverlay10touchEventEP11QTouchEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN13QQuickOverlay10wheelEventEP11QWheelEvent@Qt_5_PRIVATE_API 5.7.1 @@ -711,7 +497,6 @@ _ZN13QQuickOverlay16staticMetaObjectE@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickOverlay17mouseReleaseEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickOverlay21childMouseEventFilterEP10QQuickItemP6QEvent@Qt_5_PRIVATE_API 5.7.1 - _ZN13QQuickOverlay21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.10.1 _ZN13QQuickOverlay7overlayEP12QQuickWindow@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickOverlay7pressedEv@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickOverlay8releasedEv@Qt_5_PRIVATE_API 5.7.1 @@ -721,46 +506,7 @@ _ZN13QQuickOverlayD0Ev@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickOverlayD1Ev@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickOverlayD2Ev@Qt_5_PRIVATE_API 5.7.1 - _ZN13QQuickPalette10resetLightEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette11resetButtonEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette11resetShadowEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette11resetWindowEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette11setMidlightERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette12setHighlightERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette13resetMidlightEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette13setBrightTextERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette13setButtonTextERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette13setWindowTextERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette14resetHighlightEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette14setLinkVisitedERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette14setToolTipBaseERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette14setToolTipTextERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette15resetBrightTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette15resetButtonTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette15resetWindowTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette16resetLinkVisitedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette16resetToolTipBaseEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette16resetToolTipTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette16setAlternateBaseERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette18resetAlternateBaseEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette18setHighlightedTextERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette20resetHighlightedTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette6setMidERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette7setBaseERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette7setDarkERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette7setLinkERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette7setTextERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette8resetMidEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette8setLightERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette9resetBaseEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette9resetDarkEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette9resetLinkEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette9resetTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette9setButtonERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette9setShadowERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickPalette9setWindowERK6QColor@Qt_5_PRIVATE_API 5.10.1 - _ZN13QQuickSpinBox10classBeginEv@Qt_5_PRIVATE_API 5.10.1 + _ZN13QQuickSpinBox10classBeginEv@Qt_5_PRIVATE_API 5.9.5 _ZN13QQuickSpinBox10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox10timerEventEP11QTimerEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox10wheelEventEP11QWheelEvent@Qt_5_PRIVATE_API 5.7.1 @@ -769,9 +515,7 @@ _ZN13QQuickSpinBox11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox11setEditableEb@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickSpinBox11setStepSizeEi@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickSpinBox11wrapChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN13QQuickSpinBox12focusInEventEP11QFocusEvent@Qt_5_PRIVATE_API 5.9.0~rc - _ZN13QQuickSpinBox12localeChangeERK7QLocaleS2_@Qt_5_PRIVATE_API 5.11.1 _ZN13QQuickSpinBox12setValidatorEP10QValidator@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox12valueChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox13keyPressEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.6.0~beta @@ -788,7 +532,6 @@ _ZN13QQuickSpinBox16validatorChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox17componentCompleteEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox17contentItemChangeEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickSpinBox18displayTextChangedEv@Qt_5_PRIVATE_API 5.11.1 _ZN13QQuickSpinBox19setInputMethodHintsE6QFlagsIN2Qt15InputMethodHintEE@Qt_5_PRIVATE_API 5.9.0~rc _ZN13QQuickSpinBox20textFromValueChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox20valueFromTextChangedEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -797,16 +540,12 @@ _ZN13QQuickSpinBox27inputMethodComposingChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN13QQuickSpinBox5setToEi@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox7setFromEi@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickSpinBox7setWrapEb@Qt_5_PRIVATE_API 5.10.1 _ZN13QQuickSpinBox8decreaseEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox8increaseEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox8setValueEi@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBox9toChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBoxC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickSpinBoxC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickSpinBoxD0Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickSpinBoxD1Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickSpinBoxD2Ev@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickToolBar11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickToolBar11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickToolBar11setPositionENS_8PositionE@Qt_5_PRIVATE_API 5.7.1 @@ -826,8 +565,6 @@ _ZN13QQuickToolTip16staticMetaObjectE@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickToolTip21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickToolTip26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN13QQuickToolTip4hideEv@Qt_5_PRIVATE_API 5.12.2 - _ZN13QQuickToolTip4showERK7QStringi@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickToolTip7setTextERK7QString@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickToolTip8setDelayEi@Qt_5_PRIVATE_API 5.7.1 _ZN13QQuickToolTipC1EP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 @@ -849,7 +586,6 @@ _ZN13QQuickTumbler17contentItemChangeEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickTumbler18currentItemChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickTumbler19currentIndexChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN13QQuickTumbler19positionViewAtIndexEiNS_12PositionModeE@Qt_5_PRIVATE_API 5.12.2 _ZN13QQuickTumbler19setVisibleItemCountEi@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickTumbler21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.6.0~beta _ZN13QQuickTumbler23visibleItemCountChangedEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -870,10 +606,8 @@ _ZN14QQuickCheckBox15tristateChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickCheckBox16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickCheckBox17checkStateChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickCheckBox21nextCheckStateChangedEv@Qt_5_PRIVATE_API 5.11.1 _ZN14QQuickCheckBoxC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickCheckBoxC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickComboBox10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.11.1 _ZN14QQuickComboBox10setPressedEb@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickComboBox10wheelEventEP11QWheelEvent@Qt_5_PRIVATE_API 5.7.1 _ZN14QQuickComboBox11downChangedEv@Qt_5_PRIVATE_API 5.9.0~rc @@ -923,8 +657,6 @@ _ZN14QQuickComboBox23inputMethodHintsChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN14QQuickComboBox26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.9.0~rc _ZN14QQuickComboBox27inputMethodComposingChangedEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN14QQuickComboBox29implicitIndicatorWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN14QQuickComboBox30implicitIndicatorHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickComboBox7setDownEb@Qt_5_PRIVATE_API 5.9.0~rc _ZN14QQuickComboBox7setFlatEb@Qt_5_PRIVATE_API 5.9.0~rc _ZN14QQuickComboBox8acceptedEv@Qt_5_PRIVATE_API 5.9.0~rc @@ -943,71 +675,45 @@ _ZN14QQuickGroupBox12labelChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickGroupBox12titleChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickGroupBox16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickGroupBox17componentCompleteEv@Qt_5_PRIVATE_API 5.10.1 - _ZN14QQuickGroupBox25implicitLabelWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 + _ZN14QQuickGroupBox17componentCompleteEv@Qt_5_PRIVATE_API 5.9.5 _ZN14QQuickGroupBox26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN14QQuickGroupBox26implicitLabelHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickGroupBox8setLabelEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickGroupBox8setTitleERK7QString@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickGroupBoxC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickGroupBoxC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickGroupBoxD0Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN14QQuickGroupBoxD1Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN14QQuickGroupBoxD2Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN14QQuickMenuItem11menuChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN14QQuickMenuItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickMenuItem11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickMenuItem12arrowChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN14QQuickMenuItem14setHighlightedEb@Qt_5_PRIVATE_API 5.7.1 - _ZN14QQuickMenuItem14subMenuChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN14QQuickMenuItem16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickMenuItem17componentCompleteEv@Qt_5_PRIVATE_API 5.10.1 _ZN14QQuickMenuItem18highlightedChangedEv@Qt_5_PRIVATE_API 5.7.1 - _ZN14QQuickMenuItem8setArrowEP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 _ZN14QQuickMenuItem9triggeredEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickMenuItemC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickMenuItemC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea10classBeginEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea10setHoveredEb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN14QQuickTextArea10setPaletteERK8QPalette@Qt_5_PRIVATE_API 5.10.1 _ZN14QQuickTextArea10timerEventEP11QTimerEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea11fontChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickTextArea11insetChangeERK9QMarginsFS2_@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickTextArea11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickTextArea11setTopInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickTextArea12focusInEventEP11QFocusEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea12pressAndHoldEP16QQuickMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickTextArea12resetPaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZN14QQuickTextArea12setLeftInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickTextArea13focusOutEventEP11QFocusEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickTextArea13resetTopInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickTextArea13setBackgroundEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickTextArea13setRightInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickTextArea14hoveredChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN14QQuickTextArea14mouseMoveEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickTextArea14paletteChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN14QQuickTextArea14resetLeftInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZN14QQuickTextArea14setBottomInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickTextArea14setFocusReasonEN2Qt11FocusReasonE@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea15hoverEnterEventEP11QHoverEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN14QQuickTextArea15hoverLeaveEventEP11QHoverEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN14QQuickTextArea15mousePressEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickTextArea15resetRightInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickTextArea15setHoverEnabledEb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN14QQuickTextArea15topInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickTextArea15updatePaintNodeEP7QSGNodePN10QQuickItem19UpdatePaintNodeDataE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickTextArea16leftInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN14QQuickTextArea16resetBottomInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickTextArea16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea17backgroundChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea17componentCompleteEv@Qt_5_PRIVATE_API 5.7.1 _ZN14QQuickTextArea17mouseReleaseEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea17resetHoverEnabledEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN14QQuickTextArea17rightInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN14QQuickTextArea18bottomInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickTextArea18focusReasonChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea18setPlaceholderTextERK7QString@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea19hoverEnabledChangedEv@Qt_5_PRIVATE_API 5.9.0~rc @@ -1016,10 +722,6 @@ _ZN14QQuickTextArea21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.7.1 _ZN14QQuickTextArea22implicitHeightChanged3Ev@Qt_5_PRIVATE_API 5.7.1 _ZN14QQuickTextArea22placeholderTextChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN14QQuickTextArea23setPlaceholderTextColorERK6QColor@Qt_5_PRIVATE_API 5.12.2 - _ZN14QQuickTextArea27placeholderTextColorChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN14QQuickTextArea30implicitBackgroundWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN14QQuickTextArea31implicitBackgroundHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN14QQuickTextArea7pressedEP16QQuickMouseEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN14QQuickTextArea7setFontERK5QFont@Qt_5_PRIVATE_API 5.6.0~beta _ZN14QQuickTextArea8releasedEP16QQuickMouseEvent@Qt_5_PRIVATE_API 5.9.0~rc @@ -1030,34 +732,25 @@ _ZN14QQuickTextAreaD2Ev@Qt_5_PRIVATE_API 5.9.2 _ZN15QQuickContainer10insertItemEiP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickContainer10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickContainer10removeItemEP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickContainer10removeItemERK8QVariant@Qt_5_PRIVATE_API 5.10.1 + _ZN15QQuickContainer10removeItemEi@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickContainer11contentDataEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickContainer11itemRemovedEiP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickContainer11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickContainer11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickContainer12countChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickContainer15contentChildrenEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickContainer15setContentWidthEd@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickContainer15setCurrentIndexEi@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickContainer16setContentHeightEd@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickContainer16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickContainer17componentCompleteEv@Qt_5_PRIVATE_API 5.10.1 + _ZN15QQuickContainer17componentCompleteEv@Qt_5_PRIVATE_API 5.9.3 _ZN15QQuickContainer17contentItemChangeEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickContainer17resetContentWidthEv@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickContainer18currentItemChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickContainer18resetContentHeightEv@Qt_5_PRIVATE_API 5.12.2 - _ZN15QQuickContainer19contentWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickContainer19currentIndexChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickContainer20contentHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickContainer21decrementCurrentIndexEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN15QQuickContainer21incrementCurrentIndexEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN15QQuickContainer22contentChildrenChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickContainer7addItemEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickContainer8moveItemEii@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickContainer8takeItemEi@Qt_5_PRIVATE_API 5.10.1 _ZN15QQuickContainer9itemAddedEiP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickContainer9itemMovedEiP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 _ZN15QQuickContainerC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickContainerC1ER22QQuickContainerPrivateP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickContainerC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta @@ -1077,7 +770,6 @@ _ZN15QQuickScrollBar13policyChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN15QQuickScrollBar14pressedChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickScrollBar14setInteractiveEb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN15QQuickScrollBar14setMinimumSizeEd@Qt_5_PRIVATE_API 5.11.1 _ZN15QQuickScrollBar14setOrientationEN2Qt11OrientationE@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickScrollBar15mousePressEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickScrollBar15positionChangedEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -1085,12 +777,9 @@ _ZN15QQuickScrollBar15stepSizeChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN15QQuickScrollBar16resetInteractiveEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN15QQuickScrollBar16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickScrollBar17visualSizeChangedEv@Qt_5_PRIVATE_API 5.11.1 _ZN15QQuickScrollBar18interactiveChangedEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN15QQuickScrollBar18minimumSizeChangedEv@Qt_5_PRIVATE_API 5.11.1 _ZN15QQuickScrollBar18orientationChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickScrollBar21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickScrollBar21visualPositionChangedEv@Qt_5_PRIVATE_API 5.11.1 _ZN15QQuickScrollBar26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickScrollBar7setSizeEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickScrollBar8decreaseEv@Qt_5_PRIVATE_API 5.7.1 @@ -1100,17 +789,16 @@ _ZN15QQuickScrollBarC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickScrollBarC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView10setPopExitEP16QQuickTransition@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickStackView10touchEventEP11QTouchEvent@Qt_5_PRIVATE_API 5.10.1 + _ZN15QQuickStackView10touchEventEP11QTouchEvent@Qt_5_PRIVATE_API 5.9.5 _ZN15QQuickStackView11busyChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView11setPopEnterEP16QQuickTransition@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView11setPushExitEP16QQuickTransition@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView12depthChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickStackView12emptyChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN15QQuickStackView12setPushEnterEP16QQuickTransition@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView14popExitChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickStackView14setInitialItemERK8QJSValue@Qt_5_PRIVATE_API 5.11.1 + _ZN15QQuickStackView14setInitialItemERK8QVariant@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView14setReplaceExitEP16QQuickTransition@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView15popEnterChangedEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -1128,14 +816,13 @@ _ZN15QQuickStackView3popEP14QQmlV4Function@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView4findERK8QJSValueNS_12LoadBehaviorE@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView4pushEP14QQmlV4Function@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickStackView5clearENS_9OperationE@Qt_5_PRIVATE_API 5.10.1 + _ZN15QQuickStackView5clearEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackView7replaceEP14QQmlV4Function@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackViewC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackViewC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackViewD0Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackViewD1Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickStackViewD2Ev@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickSwipeView11itemRemovedEiP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 _ZN15QQuickSwipeView11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickSwipeView11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickSwipeView14setInteractiveEb@Qt_5_PRIVATE_API 5.9.0~rc @@ -1146,7 +833,6 @@ _ZN15QQuickSwipeView18orientationChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN15QQuickSwipeView21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickSwipeView9itemAddedEiP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickSwipeView9itemMovedEiP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 _ZN15QQuickSwipeViewC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickSwipeViewC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTabButton11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta @@ -1157,44 +843,28 @@ _ZN15QQuickTextField10classBeginEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField10setHoveredEb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN15QQuickTextField10setPaletteERK8QPalette@Qt_5_PRIVATE_API 5.10.1 _ZN15QQuickTextField10timerEventEP11QTimerEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField11fontChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickTextField11insetChangeERK9QMarginsFS2_@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickTextField11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickTextField11setTopInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickTextField12focusInEventEP11QFocusEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField12pressAndHoldEP16QQuickMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickTextField12resetPaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickTextField12setLeftInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickTextField13focusOutEventEP11QFocusEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickTextField13resetTopInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickTextField13setBackgroundEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickTextField13setRightInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickTextField14hoveredChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN15QQuickTextField14mouseMoveEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickTextField14paletteChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN15QQuickTextField14resetLeftInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZN15QQuickTextField14setBottomInsetEd@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickTextField14setFocusReasonEN2Qt11FocusReasonE@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField15hoverEnterEventEP11QHoverEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN15QQuickTextField15hoverLeaveEventEP11QHoverEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN15QQuickTextField15mousePressEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickTextField15resetRightInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickTextField15setHoverEnabledEb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN15QQuickTextField15topInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickTextField15updatePaintNodeEP7QSGNodePN10QQuickItem19UpdatePaintNodeDataE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickTextField16leftInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN15QQuickTextField16resetBottomInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickTextField16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField17backgroundChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField17componentCompleteEv@Qt_5_PRIVATE_API 5.7.1 _ZN15QQuickTextField17mouseReleaseEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField17resetHoverEnabledEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN15QQuickTextField17rightInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN15QQuickTextField18bottomInsetChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickTextField18focusReasonChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField18setPlaceholderTextERK7QString@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField19hoverEnabledChangedEv@Qt_5_PRIVATE_API 5.9.0~rc @@ -1202,27 +872,26 @@ _ZN15QQuickTextField21mouseDoubleClickEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.7.1 _ZN15QQuickTextField22implicitHeightChanged3Ev@Qt_5_PRIVATE_API 5.7.1 _ZN15QQuickTextField22placeholderTextChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickTextField23setPlaceholderTextColorERK6QColor@Qt_5_PRIVATE_API 5.12.2 - _ZN15QQuickTextField27placeholderTextColorChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN15QQuickTextField30implicitBackgroundWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN15QQuickTextField31implicitBackgroundHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN15QQuickTextField7pressedEP16QQuickMouseEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN15QQuickTextField7setFontERK5QFont@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextField8releasedEP16QQuickMouseEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN15QQuickTextFieldC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN15QQuickTextFieldC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN15QQuickTextFieldD0Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN15QQuickTextFieldD1Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN15QQuickTextFieldD2Ev@Qt_5_PRIVATE_API 5.12.2 + _ZN16QQuickScrollView11contentDataEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN16QQuickScrollView11eventFilterEP7QObjectP6QEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN16QQuickScrollView11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.9.0~rc _ZN16QQuickScrollView11qt_metacastEPKc@Qt_5_PRIVATE_API 5.9.0~rc _ZN16QQuickScrollView13keyPressEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.9.0~rc + _ZN16QQuickScrollView15contentChildrenEv@Qt_5_PRIVATE_API 5.9.0~rc + _ZN16QQuickScrollView15setContentWidthEd@Qt_5_PRIVATE_API 5.9.0~rc + _ZN16QQuickScrollView16setContentHeightEd@Qt_5_PRIVATE_API 5.9.0~rc _ZN16QQuickScrollView16staticMetaObjectE@Qt_5_PRIVATE_API 5.9.0~rc _ZN16QQuickScrollView17componentCompleteEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN16QQuickScrollView17contentItemChangeEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.9.0~rc - _ZN16QQuickScrollView17contentSizeChangeERK6QSizeFS2_@Qt_5_PRIVATE_API 5.12.2 + _ZN16QQuickScrollView19contentWidthChangedEv@Qt_5_PRIVATE_API 5.9.0~rc + _ZN16QQuickScrollView20contentHeightChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN16QQuickScrollView21childMouseEventFilterEP10QQuickItemP6QEvent@Qt_5_PRIVATE_API 5.9.0~rc + _ZN16QQuickScrollView22contentChildrenChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN16QQuickScrollViewC1EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN16QQuickScrollViewC2EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN16QQuickSpinButton10setHoveredEb@Qt_5_PRIVATE_API 5.9.0~rc @@ -1234,8 +903,6 @@ _ZN16QQuickSpinButton14pressedChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN16QQuickSpinButton16indicatorChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN16QQuickSpinButton16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN16QQuickSpinButton29implicitIndicatorWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN16QQuickSpinButton30implicitIndicatorHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN16QQuickSpinButtonC1EP13QQuickSpinBox@Qt_5_PRIVATE_API 5.6.0~beta _ZN16QQuickSpinButtonC2EP13QQuickSpinBox@Qt_5_PRIVATE_API 5.6.0~beta _ZN16QQuickToolButton11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta @@ -1243,38 +910,12 @@ _ZN16QQuickToolButton16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN16QQuickToolButtonC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN16QQuickToolButtonC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickActionGroup10setEnabledEb@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup12removeActionEP12QQuickAction@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup12setExclusiveEb@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup14actionsChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup14enabledChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup16exclusiveChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup16setCheckedActionEP12QQuickAction@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup20checkedActionChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup7actionsEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup9addActionEP12QQuickAction@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroup9triggeredEP12QQuickAction@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroupC1EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroupC2EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroupD0Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroupD1Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickActionGroupD2Ev@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickButtonGroup10classBeginEv@Qt_5_PRIVATE_API 5.11.1 _ZN17QQuickButtonGroup11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickButtonGroup11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickButtonGroup12removeButtonEP20QQuickAbstractButton@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickButtonGroup12setExclusiveEb@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickButtonGroup13setCheckStateEN2Qt10CheckStateE@Qt_5_PRIVATE_API 5.11.1 _ZN17QQuickButtonGroup14buttonsChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickButtonGroup16exclusiveChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN17QQuickButtonGroup16setCheckedButtonEP20QQuickAbstractButton@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickButtonGroup16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickButtonGroup17checkStateChangedEv@Qt_5_PRIVATE_API 5.11.1 - _ZN17QQuickButtonGroup17componentCompleteEv@Qt_5_PRIVATE_API 5.11.1 _ZN17QQuickButtonGroup20checkedButtonChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickButtonGroup21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickButtonGroup7buttonsEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -1285,13 +926,6 @@ _ZN17QQuickButtonGroupD0Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickButtonGroupD1Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickButtonGroupD2Ev@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickContentItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickContentItem11qt_metacastEPKc@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickContentItem16staticMetaObjectE@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickContentItemC1EP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickContentItemC1EPK7QObjectP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickContentItemC2EP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickContentItemC2EPK7QObjectP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 _ZN17QQuickDelayButton11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.9.0~rc _ZN17QQuickDelayButton11qt_metacastEPKc@Qt_5_PRIVATE_API 5.9.0~rc _ZN17QQuickDelayButton11setProgressEd@Qt_5_PRIVATE_API 5.9.0~rc @@ -1306,61 +940,30 @@ _ZN17QQuickDelayButton9activatedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN17QQuickDelayButtonC1EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN17QQuickDelayButtonC2EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc - _ZN17QQuickMenuBarItem11menuChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuBarItem11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuBarItem11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuBarItem14menuBarChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuBarItem14setHighlightedEb@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuBarItem15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuBarItem16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuBarItem18highlightedChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuBarItem7setMenuEP10QQuickMenu@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuBarItem9triggeredEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuBarItemC1EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuBarItemC2EP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuPrivate10createItemEP10QQuickMenu@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuPrivate10createItemEP12QQuickAction@Qt_5_PRIVATE_API 5.10.1 _ZN17QQuickMenuPrivate10insertItemEiP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickMenuPrivate10removeItemEiP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickMenuPrivate10resizeItemEP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 _ZN17QQuickMenuPrivate11resizeItemsEv@Qt_5_PRIVATE_API 5.7.1 - _ZN17QQuickMenuPrivate13getPositionerEv@Qt_5_PRIVATE_API 5.12.2 _ZN17QQuickMenuPrivate13itemDestroyedEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickMenuPrivate13onItemHoveredEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuPrivate13setParentMenuEP10QQuickMenu@Qt_5_PRIVATE_API 5.10.1 + _ZN17QQuickMenuPrivate13onItemPressedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickMenuPrivate14contentData_atEP16QQmlListPropertyI7QObjectEi@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickMenuPrivate14itemChildAddedEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickMenuPrivate14stopHoverTimerEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuPrivate15beginCreateItemEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuPrivate15onItemTriggeredEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuPrivate15setCurrentIndexEiN2Qt11FocusReasonE@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuPrivate15startHoverTimerEv@Qt_5_PRIVATE_API 5.10.1 + _ZN17QQuickMenuPrivate15setCurrentIndexEi@Qt_5_PRIVATE_API 5.7.1 _ZN17QQuickMenuPrivate16activateNextItemEv@Qt_5_PRIVATE_API 5.9.1 _ZN17QQuickMenuPrivate17contentData_clearEP16QQmlListPropertyI7QObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickMenuPrivate17contentData_countEP16QQmlListPropertyI7QObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickMenuPrivate17itemParentChangedEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickMenuPrivate17propagateKeyEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuPrivate17resolveParentItemEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuPrivate18completeCreateItemEv@Qt_5_PRIVATE_API 5.10.1 _ZN17QQuickMenuPrivate18contentData_appendEP16QQmlListPropertyI7QObjectEPS1_@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickMenuPrivate19itemGeometryChangedEP10QQuickItem20QQuickGeometryChangeRK6QRectF@Qt_5_PRIVATE_API 5.9.0~rc _ZN17QQuickMenuPrivate20activatePreviousItemEv@Qt_5_PRIVATE_API 5.9.1 - _ZN17QQuickMenuPrivate21prepareExitTransitionEv@Qt_5_PRIVATE_API 5.10.1 - _ZN17QQuickMenuPrivate22prepareEnterTransitionEv@Qt_5_PRIVATE_API 5.10.1 _ZN17QQuickMenuPrivate23itemSiblingOrderChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickMenuPrivate24onItemActiveFocusChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickMenuPrivate8moveItemEii@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickMenuPrivateC1Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickMenuPrivateC2Ev@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickPanePrivate11contentDataEv@Qt_5_PRIVATE_API 5.12.2 _ZN17QQuickPanePrivate14getContentItemEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN17QQuickPanePrivate15contentChildrenEv@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickPanePrivate18updateContentWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickPanePrivate19updateContentHeightEv@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickPanePrivate21contentChildrenChangeEv@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickPanePrivate24itemImplicitWidthChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickPanePrivate25itemImplicitHeightChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickPanePrivate4initEv@Qt_5_PRIVATE_API 5.12.2 + _ZN17QQuickPanePrivateC1Ev@Qt_5_PRIVATE_API 5.6.0~beta + _ZN17QQuickPanePrivateC2Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickProgressBar11fromChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickProgressBar11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickProgressBar11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta @@ -1383,7 +986,7 @@ _ZN17QQuickRadioButton16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRadioButtonC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRadioButtonC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickRangeSlider10classBeginEv@Qt_5_PRIVATE_API 5.10.1 + _ZN17QQuickRangeSlider10classBeginEv@Qt_5_PRIVATE_API 5.9.5 _ZN17QQuickRangeSlider10touchEventEP11QTouchEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN17QQuickRangeSlider11fromChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRangeSlider11liveChangedEv@Qt_5_PRIVATE_API 5.9.0~rc @@ -1395,6 +998,7 @@ _ZN17QQuickRangeSlider12mirrorChangeEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRangeSlider13keyPressEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRangeSlider14hoverMoveEventEP11QHoverEvent@Qt_5_PRIVATE_API 5.9.0~rc + _ZN17QQuickRangeSlider14mouseMoveEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRangeSlider14setOrientationEN2Qt11OrientationE@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRangeSlider15hoverEnterEventEP11QHoverEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN17QQuickRangeSlider15hoverLeaveEventEP11QHoverEvent@Qt_5_PRIVATE_API 5.9.0~rc @@ -1405,9 +1009,6 @@ _ZN17QQuickRangeSlider16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRangeSlider17componentCompleteEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRangeSlider18orientationChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickRangeSlider21setTouchDragThresholdEd@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickRangeSlider23resetTouchDragThresholdEv@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickRangeSlider25touchDragThresholdChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN17QQuickRangeSlider5setToEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRangeSlider7setFromEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRangeSlider7setLiveEb@Qt_5_PRIVATE_API 5.9.0~rc @@ -1415,9 +1016,6 @@ _ZN17QQuickRangeSlider9toChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRangeSliderC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN17QQuickRangeSliderC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN17QQuickRangeSliderD0Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickRangeSliderD1Ev@Qt_5_PRIVATE_API 5.12.2 - _ZN17QQuickRangeSliderD2Ev@Qt_5_PRIVATE_API 5.12.2 _ZN17QQuickRoundButton11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.9.0~rc _ZN17QQuickRoundButton11qt_metacastEPKc@Qt_5_PRIVATE_API 5.9.0~rc _ZN17QQuickRoundButton11resetRadiusEv@Qt_5_PRIVATE_API 5.9.0~rc @@ -1436,15 +1034,6 @@ _ZN18QQuickItemDelegateC1ER25QQuickItemDelegatePrivateP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 _ZN18QQuickItemDelegateC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN18QQuickItemDelegateC2ER25QQuickItemDelegatePrivateP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 - _ZN18QQuickPopupAnchors11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.12.2 - _ZN18QQuickPopupAnchors11qt_metacastEPKc@Qt_5_PRIVATE_API 5.12.2 - _ZN18QQuickPopupAnchors11setCenterInEP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN18QQuickPopupAnchors13resetCenterInEv@Qt_5_PRIVATE_API 5.12.2 - _ZN18QQuickPopupAnchors15centerInChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN18QQuickPopupAnchors16staticMetaObjectE@Qt_5_PRIVATE_API 5.12.2 - _ZN18QQuickPopupAnchorsC1EP11QQuickPopup@Qt_5_PRIVATE_API 5.12.2 - _ZN18QQuickPopupAnchorsC2EP11QQuickPopup@Qt_5_PRIVATE_API 5.12.2 - _ZN18QQuickThemePrivate8instanceE@Qt_5_PRIVATE_API 5.12.2 _ZN19QQuickBusyIndicator10setRunningEb@Qt_5_PRIVATE_API 5.6.0~beta _ZN19QQuickBusyIndicator10touchEventEP11QTouchEvent@Qt_5_PRIVATE_API 5.9.2 _ZN19QQuickBusyIndicator11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta @@ -1462,7 +1051,6 @@ _ZN19QQuickCheckDelegate15tristateChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickCheckDelegate16staticMetaObjectE@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickCheckDelegate17checkStateChangedEv@Qt_5_PRIVATE_API 5.7.1 - _ZN19QQuickCheckDelegate21nextCheckStateChangedEv@Qt_5_PRIVATE_API 5.11.1 _ZN19QQuickCheckDelegateC1EP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickCheckDelegateC2EP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickMenuSeparator11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.9.0~rc @@ -1497,7 +1085,6 @@ _ZN19QQuickSwipeDelegate15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickSwipeDelegate15mousePressEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickSwipeDelegate16staticMetaObjectE@Qt_5_PRIVATE_API 5.7.1 - _ZN19QQuickSwipeDelegate17componentCompleteEv@Qt_5_PRIVATE_API 5.12.2 _ZN19QQuickSwipeDelegate17mouseReleaseEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickSwipeDelegate21childMouseEventFilterEP10QQuickItemP6QEvent@Qt_5_PRIVATE_API 5.7.1 _ZN19QQuickSwipeDelegate21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.9.0~rc @@ -1510,30 +1097,22 @@ _ZN19QQuickToolSeparator18orientationChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN19QQuickToolSeparatorC1EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN19QQuickToolSeparatorC2EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc - _ZN20QQuickAbstractButton10itemChangeEN10QQuickItem10ItemChangeERKNS0_14ItemChangeDataE@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickAbstractButton10setCheckedEb@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickAbstractButton10setDisplayENS_7DisplayE@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickAbstractButton10setPressedEb@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton10timerEventEP11QTimerEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton11downChangedEv@Qt_5_PRIVATE_API 5.7.1 - _ZN20QQuickAbstractButton11iconChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickAbstractButton11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickAbstractButton11setShortcutERK12QKeySequence@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickAbstractButton11textChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton12buttonChangeENS_12ButtonChangeE@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickAbstractButton12pressAndHoldEv@Qt_5_PRIVATE_API 5.7.1 _ZN20QQuickAbstractButton12setCheckableEb@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton12setIndicatorEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickAbstractButton13actionChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickAbstractButton13doubleClickedEv@Qt_5_PRIVATE_API 5.7.1 _ZN20QQuickAbstractButton13focusOutEventEP11QFocusEvent@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton13keyPressEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickAbstractButton13pressXChangedEv@Qt_5_PRIVATE_API 5.11.1 - _ZN20QQuickAbstractButton13pressYChangedEv@Qt_5_PRIVATE_API 5.11.1 _ZN20QQuickAbstractButton13setAutoRepeatEb@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton14checkedChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickAbstractButton14displayChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickAbstractButton14nextCheckStateEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton14pressedChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton15keyReleaseEventEP9QKeyEvent@Qt_5_PRIVATE_API 5.6.0~beta @@ -1542,30 +1121,19 @@ _ZN20QQuickAbstractButton16indicatorChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton16setAutoExclusiveEb@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickAbstractButton17autoRepeatChangedEv@Qt_5_PRIVATE_API 5.11.1 - _ZN20QQuickAbstractButton17componentCompleteEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAbstractButton18setAutoRepeatDelayEi@Qt_5_PRIVATE_API 5.11.1 + _ZN20QQuickAbstractButton17componentCompleteEv@Qt_5_PRIVATE_API 5.9.5 _ZN20QQuickAbstractButton20autoExclusiveChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton21mouseDoubleClickEventEP11QMouseEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickAbstractButton21setAutoRepeatIntervalEi@Qt_5_PRIVATE_API 5.11.1 - _ZN20QQuickAbstractButton22autoRepeatDelayChangedEv@Qt_5_PRIVATE_API 5.11.1 - _ZN20QQuickAbstractButton25autoRepeatIntervalChangedEv@Qt_5_PRIVATE_API 5.11.1 _ZN20QQuickAbstractButton26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickAbstractButton29implicitIndicatorWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickAbstractButton30implicitIndicatorHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickAbstractButton5eventEP6QEvent@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickAbstractButton6toggleEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton7clickedEv@Qt_5_PRIVATE_API 5.7.1 _ZN20QQuickAbstractButton7pressedEv@Qt_5_PRIVATE_API 5.7.1 _ZN20QQuickAbstractButton7setDownEb@Qt_5_PRIVATE_API 5.7.1 - _ZN20QQuickAbstractButton7setIconERK10QQuickIcon@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickAbstractButton7setTextERK7QString@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton7toggledEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickAbstractButton8canceledEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButton8releasedEv@Qt_5_PRIVATE_API 5.7.1 _ZN20QQuickAbstractButton9resetDownEv@Qt_5_PRIVATE_API 5.7.1 - _ZN20QQuickAbstractButton9resetTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickAbstractButton9setActionEP12QQuickAction@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickAbstractButtonC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButtonC1ER27QQuickAbstractButtonPrivateP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickAbstractButtonC2EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta @@ -1581,78 +1149,36 @@ _ZN20QQuickControlPrivate11handlePressERK7QPointF@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickControlPrivate11inheritFontERK5QFont@Qt_5_PRIVATE_API 5.7.1 _ZN20QQuickControlPrivate11resolveFontEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickControlPrivate11setTopInsetEdb@Qt_5_PRIVATE_API 5.12.2 _ZN20QQuickControlPrivate12handleUngrabEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickControlPrivate12mirrorChangeEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickControlPrivate12setLeftInsetEdb@Qt_5_PRIVATE_API 5.12.2 _ZN20QQuickControlPrivate12updateLocaleERK7QLocaleb@Qt_5_PRIVATE_API 5.7.1 _ZN20QQuickControlPrivate13handleReleaseERK7QPointF@Qt_5_PRIVATE_API 5.9.0~rc - _ZN20QQuickControlPrivate13itemDestroyedEP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickControlPrivate13parentPaletteEPK10QQuickItem@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickControlPrivate13resizeContentEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickControlPrivate13setRightInsetEdb@Qt_5_PRIVATE_API 5.12.2 _ZN20QQuickControlPrivate13setTopPaddingEdb@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickControlPrivate13updatePaletteERK8QPalette@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickControlPrivate14getContentItemEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN20QQuickControlPrivate14inheritPaletteERK8QPalette@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickControlPrivate14resolvePaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickControlPrivate14setBottomInsetEdb@Qt_5_PRIVATE_API 5.12.2 _ZN20QQuickControlPrivate14setLeftPaddingEdb@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickControlPrivate15setRightPaddingEdb@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickControlPrivate15updateFontRecurEP10QQuickItemRK5QFont@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickControlPrivate16calcHoverEnabledEPK10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc - _ZN20QQuickControlPrivate16cancelBackgroundEv@Qt_5_PRIVATE_API 5.10.1 + _ZN20QQuickControlPrivate16cancelBackgroundEv@Qt_5_PRIVATE_API 5.9.5 _ZN20QQuickControlPrivate16resizeBackgroundEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickControlPrivate16setBottomPaddingEdb@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickControlPrivate17cancelContentItemEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickControlPrivate17executeBackgroundEb@Qt_5_PRIVATE_API 5.10.1 + _ZN20QQuickControlPrivate17cancelContentItemEv@Qt_5_PRIVATE_API 5.9.5 + _ZN20QQuickControlPrivate17executeBackgroundEb@Qt_5_PRIVATE_API 5.9.5 _ZN20QQuickControlPrivate17updateLocaleRecurEP10QQuickItemRK7QLocale@Qt_5_PRIVATE_API 5.7.1 - _ZN20QQuickControlPrivate18accessibleAttachedEPK7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickControlPrivate18executeContentItemEb@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickControlPrivate18setVerticalPaddingEdb@Qt_5_PRIVATE_API 5.12.2 + _ZN20QQuickControlPrivate18executeContentItemEb@Qt_5_PRIVATE_API 5.9.5 _ZN20QQuickControlPrivate18updateHoverEnabledEbb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN20QQuickControlPrivate18updatePaletteRecurEP10QQuickItemRK8QPalette@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickControlPrivate19ImplicitSizeChangesE@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickControlPrivate19itemGeometryChangedEP10QQuickItem20QQuickGeometryChangeRK6QRectF@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickControlPrivate20setHorizontalPaddingEdb@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickControlPrivate20updateBaselineOffsetEv@Qt_5_PRIVATE_API 5.12.2 _ZN20QQuickControlPrivate21setContentItem_helperEP10QQuickItemb@Qt_5_PRIVATE_API 5.9.1 - _ZN20QQuickControlPrivate23addImplicitSizeListenerEP10QQuickItem6QFlagsIN17QQuickItemPrivate10ChangeTypeEE@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickControlPrivate23addImplicitSizeListenerEP10QQuickItemP24QQuickItemChangeListener6QFlagsIN17QQuickItemPrivate10ChangeTypeEE@Qt_5_PRIVATE_API 5.12.2 _ZN20QQuickControlPrivate23updateHoverEnabledRecurEP10QQuickItemb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN20QQuickControlPrivate24itemImplicitWidthChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickControlPrivate25itemImplicitHeightChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickControlPrivate25updateImplicitContentSizeEv@Qt_5_PRIVATE_API 5.12.2 _ZN20QQuickControlPrivate26accessibilityActiveChangedEb@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickControlPrivate26removeImplicitSizeListenerEP10QQuickItem6QFlagsIN17QQuickItemPrivate10ChangeTypeEE@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickControlPrivate26removeImplicitSizeListenerEP10QQuickItemP24QQuickItemChangeListener6QFlagsIN17QQuickItemPrivate10ChangeTypeEE@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickControlPrivate26updateImplicitContentWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickControlPrivate27updateImplicitContentHeightEv@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickControlPrivate4initEv@Qt_5_PRIVATE_API 5.12.2 + _ZN20QQuickControlPrivate9ExtraDataC1Ev@Qt_5_PRIVATE_API 5.7.1 + _ZN20QQuickControlPrivate9ExtraDataC2Ev@Qt_5_PRIVATE_API 5.7.1 + _ZN20QQuickControlPrivate9themeFontEN14QPlatformTheme4FontE@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickControlPrivateC1Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickControlPrivateC2Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickControlPrivateD0Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickControlPrivateD1Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN20QQuickControlPrivateD2Ev@Qt_5_PRIVATE_API 5.6.0~beta - _ZN20QQuickMenuBarPrivate10createItemEP10QQuickMenu@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate11contentDataEv@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickMenuBarPrivate11menus_clearEP16QQmlListPropertyI10QQuickMenuE@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate11menus_countEP16QQmlListPropertyI10QQuickMenuE@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate12activateItemEP17QQuickMenuBarItem@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate12menus_appendEP16QQmlListPropertyI10QQuickMenuEPS1_@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate13onItemHoveredEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate15beginCreateItemEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate15onItemTriggeredEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate16activateNextItemEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate17onMenuAboutToHideEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate17toggleCurrentMenuEbb@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate18completeCreateItemEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate18contentData_appendEP16QQmlListPropertyI7QObjectEPS1_@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate20activatePreviousItemEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickMenuBarPrivate24itemImplicitWidthChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickMenuBarPrivate25itemImplicitHeightChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickMenuBarPrivate5menusEv@Qt_5_PRIVATE_API 5.12.2 - _ZN20QQuickMenuBarPrivate8menus_atEP16QQmlListPropertyI10QQuickMenuEi@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickSwitchDelegate10touchEventEP11QTouchEvent@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickSwitchDelegate11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.7.1 _ZN20QQuickSwitchDelegate11qt_metacastEPKc@Qt_5_PRIVATE_API 5.7.1 @@ -1666,38 +1192,29 @@ _ZN20QQuickSwitchDelegate21visualPositionChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN20QQuickSwitchDelegateC1EP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 _ZN20QQuickSwitchDelegateC2EP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 - _ZN20QQuickTabBarAttached11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickTabBarAttached11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickTabBarAttached12indexChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickTabBarAttached13tabBarChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickTabBarAttached15positionChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickTabBarAttached16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickTabBarAttachedC1EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickTabBarAttachedC2EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickTumblerPrivate11endSetModelEv@Qt_5_PRIVATE_API 5.11.2 - _ZN20QQuickTumblerPrivate13beginSetModelEv@Qt_5_PRIVATE_API 5.11.2 + _ZN20QQuickTumblerPrivate10unlockWrapEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickTumblerPrivate13resetViewDataEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickTumblerPrivate13setupViewDataEP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickTumblerPrivate14itemChildAddedEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.9.0~rc - _ZN20QQuickTumblerPrivate15setCurrentIndexEiNS_20PropertyChangeReasonE@Qt_5_PRIVATE_API 5.11.2 _ZN20QQuickTumblerPrivate16itemChildRemovedEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickTumblerPrivate16syncCurrentIndexEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickTumblerPrivate17determineViewTypeEP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickTumblerPrivate18disconnectFromViewEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickTumblerPrivate19_q_updateItemWidthsEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN20QQuickTumblerPrivate19itemGeometryChangedEP10QQuickItem20QQuickGeometryChangeRK6QRectF@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickTumblerPrivate19setWrapBasedOnCountEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickTumblerPrivate20_q_updateItemHeightsEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickTumblerPrivate21_q_onViewCountChangedEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN20QQuickTumblerPrivate22_q_onViewOffsetChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickTumblerPrivate22calculateDisplacementsEv@Qt_5_PRIVATE_API 5.10.1 - _ZN20QQuickTumblerPrivate22setPendingCurrentIndexEi@Qt_5_PRIVATE_API 5.11.2 - _ZN20QQuickTumblerPrivate24_q_onViewContentYChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN20QQuickTumblerPrivate28_q_onViewCurrentIndexChangedEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN20QQuickTumblerPrivate29warnAboutIncorrectContentItemEv@Qt_5_PRIVATE_API 5.12.2 + _ZN20QQuickTumblerPrivate33_q_calculateAttachedDisplacementsEv@Qt_5_PRIVATE_API 5.9.5 _ZN20QQuickTumblerPrivate3getEP13QQuickTumbler@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickTumblerPrivate7setWrapEbb@Qt_5_PRIVATE_API 5.9.0~rc + _ZN20QQuickTumblerPrivate8lockWrapEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN20QQuickTumblerPrivate8setCountEi@Qt_5_PRIVATE_API 5.9.0~rc + _ZN20QQuickTumblerPrivateC1Ev@Qt_5_PRIVATE_API 5.9.0~rc + _ZN20QQuickTumblerPrivateC2Ev@Qt_5_PRIVATE_API 5.9.0~rc + _ZN20QQuickTumblerPrivateD0Ev@Qt_5_PRIVATE_API 5.9.0~rc + _ZN20QQuickTumblerPrivateD1Ev@Qt_5_PRIVATE_API 5.9.0~rc + _ZN20QQuickTumblerPrivateD2Ev@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBox11itemRemovedEiP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBox11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBox11qt_metacastEPKc@Qt_5_PRIVATE_API 5.9.0~rc @@ -1710,48 +1227,22 @@ _ZN21QQuickDialogButtonBox15delegateChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBox15geometryChangedERK6QRectFS2_@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBox15positionChangedEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN21QQuickDialogButtonBox15setButtonLayoutEN21QPlatformDialogHelper12ButtonLayoutE@Qt_5_PRIVATE_API 5.12.2 _ZN21QQuickDialogButtonBox16alignmentChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBox16staticMetaObjectE@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBox17componentCompleteEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBox17contentItemChangeEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.9.0~rc - _ZN21QQuickDialogButtonBox17resetButtonLayoutEv@Qt_5_PRIVATE_API 5.12.2 _ZN21QQuickDialogButtonBox18setStandardButtonsE6QFlagsIN21QPlatformDialogHelper14StandardButtonEE@Qt_5_PRIVATE_API 5.9.0~rc - _ZN21QQuickDialogButtonBox19buttonLayoutChangedEv@Qt_5_PRIVATE_API 5.12.2 _ZN21QQuickDialogButtonBox21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBox22standardButtonsChangedEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN21QQuickDialogButtonBox5resetEv@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickDialogButtonBox7appliedEv@Qt_5_PRIVATE_API 5.10.1 _ZN21QQuickDialogButtonBox7clickedEP20QQuickAbstractButton@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBox8acceptedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBox8rejectedEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN21QQuickDialogButtonBox9discardedEv@Qt_5_PRIVATE_API 5.10.1 _ZN21QQuickDialogButtonBox9itemAddedEiP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBoxC1EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBoxC2EP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBoxD0Ev@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBoxD1Ev@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickDialogButtonBoxD2Ev@Qt_5_PRIVATE_API 5.9.0~rc - _ZN21QQuickOverlayAttached11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickOverlayAttached11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickOverlayAttached11setModelessEP13QQmlComponent@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickOverlayAttached12modalChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickOverlayAttached14overlayChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickOverlayAttached15modelessChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickOverlayAttached16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickOverlayAttached7pressedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickOverlayAttached8releasedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickOverlayAttached8setModalEP13QQmlComponent@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickOverlayAttachedC1EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickOverlayAttachedC2EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickPaletteProvider24getMetaObjectForMetaTypeEi@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickPaletteProvider4initEiR8QVariant@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickPaletteProvider4initEv@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickPaletteProvider4readERK8QVariantPvi@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickPaletteProvider5equalEiPKvRK8QVariant@Qt_5_PRIVATE_API 5.10.1 - (subst)_ZN21QQuickPaletteProvider5storeEiPKvPv{size_t}@Qt_5_PRIVATE_API 5.12.2 - _ZN21QQuickPaletteProvider5writeEiPKvR8QVariant@Qt_5_PRIVATE_API 5.10.1 - _ZN21QQuickPaletteProvider7cleanupEv@Qt_5_PRIVATE_API 5.10.1 _ZN21QQuickRangeSliderNode10setHoveredEb@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickRangeSliderNode10setPressedEb@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickRangeSliderNode11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta @@ -1763,9 +1254,6 @@ _ZN21QQuickRangeSliderNode15positionChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickRangeSliderNode16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickRangeSliderNode21visualPositionChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN21QQuickRangeSliderNode26implicitHandleWidthChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN21QQuickRangeSliderNode27implicitHandleHeightChangedEv@Qt_5_PRIVATE_API 5.12.2 - _ZN21QQuickRangeSliderNode5movedEv@Qt_5_PRIVATE_API 5.12.2 _ZN21QQuickRangeSliderNode8decreaseEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickRangeSliderNode8increaseEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickRangeSliderNode8setValueEd@Qt_5_PRIVATE_API 5.6.0~beta @@ -1781,15 +1269,11 @@ _ZN21QQuickScrollIndicator11setPositionEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickScrollIndicator11sizeChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickScrollIndicator13activeChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN21QQuickScrollIndicator14setMinimumSizeEd@Qt_5_PRIVATE_API 5.11.1 _ZN21QQuickScrollIndicator14setOrientationEN2Qt11OrientationE@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickScrollIndicator15positionChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickScrollIndicator16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta - _ZN21QQuickScrollIndicator17visualSizeChangedEv@Qt_5_PRIVATE_API 5.11.1 - _ZN21QQuickScrollIndicator18minimumSizeChangedEv@Qt_5_PRIVATE_API 5.11.1 _ZN21QQuickScrollIndicator18orientationChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickScrollIndicator21qmlAttachedPropertiesEP7QObject@Qt_5_PRIVATE_API 5.6.0~beta - _ZN21QQuickScrollIndicator21visualPositionChangedEv@Qt_5_PRIVATE_API 5.11.1 _ZN21QQuickScrollIndicator7setSizeEd@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickScrollIndicator9setActiveEb@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickScrollIndicatorC1EP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta @@ -1816,9 +1300,12 @@ _ZN21QQuickTumblerAttached19displacementChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN21QQuickTumblerAttachedC1EP7QObject@Qt_5_PRIVATE_API 5.9.0~rc _ZN21QQuickTumblerAttachedC2EP7QObject@Qt_5_PRIVATE_API 5.9.0~rc + _ZN21QQuickTumblerAttachedD0Ev@Qt_5_PRIVATE_API 5.6.0~beta + _ZN21QQuickTumblerAttachedD1Ev@Qt_5_PRIVATE_API 5.6.0~beta + _ZN21QQuickTumblerAttachedD2Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN22QQuickContainerPrivate10insertItemEiP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN22QQuickContainerPrivate10removeItemEiP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZN22QQuickContainerPrivate12reorderItemsEv@Qt_5_PRIVATE_API 5.10.1 + _ZN22QQuickContainerPrivate12reorderItemsEv@Qt_5_PRIVATE_API 5.9.3 _ZN22QQuickContainerPrivate13itemDestroyedEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN22QQuickContainerPrivate14contentData_atEP16QQmlListPropertyI7QObjectEi@Qt_5_PRIVATE_API 5.6.0~beta _ZN22QQuickContainerPrivate14itemChildAddedEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.6.0~beta @@ -1827,8 +1314,6 @@ _ZN22QQuickContainerPrivate17itemParentChangedEP10QQuickItemS1_@Qt_5_PRIVATE_API 5.6.0~beta _ZN22QQuickContainerPrivate18contentChildren_atEP16QQmlListPropertyI10QQuickItemEi@Qt_5_PRIVATE_API 5.6.0~beta _ZN22QQuickContainerPrivate18contentData_appendEP16QQmlListPropertyI7QObjectEPS1_@Qt_5_PRIVATE_API 5.6.0~beta - _ZN22QQuickContainerPrivate18updateContentWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZN22QQuickContainerPrivate19updateContentHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZN22QQuickContainerPrivate21contentChildren_clearEP16QQmlListPropertyI10QQuickItemE@Qt_5_PRIVATE_API 5.6.0~beta _ZN22QQuickContainerPrivate21contentChildren_countEP16QQmlListPropertyI10QQuickItemE@Qt_5_PRIVATE_API 5.6.0~beta _ZN22QQuickContainerPrivate22_q_currentIndexChangedEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -1836,7 +1321,9 @@ _ZN22QQuickContainerPrivate23itemSiblingOrderChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZN22QQuickContainerPrivate4initEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN22QQuickContainerPrivate7cleanupEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN22QQuickContainerPrivate8moveItemEiiP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 + _ZN22QQuickContainerPrivate8moveItemEii@Qt_5_PRIVATE_API 5.6.0~beta + _ZN22QQuickContainerPrivateC1Ev@Qt_5_PRIVATE_API 5.6.0~beta + _ZN22QQuickContainerPrivateC2Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN22QQuickTextAreaAttached11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.7.1 _ZN22QQuickTextAreaAttached11qt_metacastEPKc@Qt_5_PRIVATE_API 5.7.1 _ZN22QQuickTextAreaAttached12setFlickableEP14QQuickTextArea@Qt_5_PRIVATE_API 5.7.1 @@ -1845,20 +1332,16 @@ _ZN22QQuickTextAreaAttachedC1EP7QObject@Qt_5_PRIVATE_API 5.7.1 _ZN22QQuickTextAreaAttachedC2EP7QObject@Qt_5_PRIVATE_API 5.7.1 _ZN23QQuickApplicationWindow10classBeginEv@Qt_5_PRIVATE_API 5.7.1 - _ZN23QQuickApplicationWindow10setMenuBarEP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 - _ZN23QQuickApplicationWindow10setPaletteERK8QPalette@Qt_5_PRIVATE_API 5.10.1 + _ZN23QQuickApplicationWindow11contentDataEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN23QQuickApplicationWindow11fontChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN23QQuickApplicationWindow11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN23QQuickApplicationWindow11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta _ZN23QQuickApplicationWindow11resetLocaleEv@Qt_5_PRIVATE_API 5.7.1 _ZN23QQuickApplicationWindow11resizeEventEP12QResizeEvent@Qt_5_PRIVATE_API 5.6.0~beta - _ZN23QQuickApplicationWindow12resetPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZN23QQuickApplicationWindow13footerChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN23QQuickApplicationWindow13headerChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN23QQuickApplicationWindow13localeChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN23QQuickApplicationWindow13setBackgroundEP10QQuickItem@Qt_5_PRIVATE_API 5.7.1 - _ZN23QQuickApplicationWindow14menuBarChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN23QQuickApplicationWindow14paletteChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN23QQuickApplicationWindow16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN23QQuickApplicationWindow17backgroundChangedEv@Qt_5_PRIVATE_API 5.7.1 _ZN23QQuickApplicationWindow17componentCompleteEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -1915,13 +1398,9 @@ _ZN23QQuickSwipeViewAttached21isPreviousItemChangedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN23QQuickSwipeViewAttachedC1EP7QObject@Qt_5_PRIVATE_API 5.9.0~rc _ZN23QQuickSwipeViewAttachedC2EP7QObject@Qt_5_PRIVATE_API 5.9.0~rc - _ZN25QQuickActionGroupAttached11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.10.1 - _ZN25QQuickActionGroupAttached11qt_metacastEPKc@Qt_5_PRIVATE_API 5.10.1 - _ZN25QQuickActionGroupAttached12groupChangedEv@Qt_5_PRIVATE_API 5.10.1 - _ZN25QQuickActionGroupAttached16staticMetaObjectE@Qt_5_PRIVATE_API 5.10.1 - _ZN25QQuickActionGroupAttached8setGroupEP17QQuickActionGroup@Qt_5_PRIVATE_API 5.10.1 - _ZN25QQuickActionGroupAttachedC1EP7QObject@Qt_5_PRIVATE_API 5.10.1 - _ZN25QQuickActionGroupAttachedC2EP7QObject@Qt_5_PRIVATE_API 5.10.1 + _ZN23QQuickSwipeViewAttachedD0Ev@Qt_5_PRIVATE_API 5.6.0~beta + _ZN23QQuickSwipeViewAttachedD1Ev@Qt_5_PRIVATE_API 5.6.0~beta + _ZN23QQuickSwipeViewAttachedD2Ev@Qt_5_PRIVATE_API 5.6.0~beta _ZN25QQuickButtonGroupAttached11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.6.0~beta _ZN25QQuickButtonGroupAttached11qt_metacastEPKc@Qt_5_PRIVATE_API 5.6.0~beta _ZN25QQuickButtonGroupAttached12groupChangedEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -1931,28 +1410,19 @@ _ZN25QQuickButtonGroupAttachedC2EP7QObject@Qt_5_PRIVATE_API 5.6.0~beta _ZN27QQuickAbstractButtonPrivate10handleMoveERK7QPointF@Qt_5_PRIVATE_API 5.9.0~rc _ZN27QQuickAbstractButtonPrivate11handlePressERK7QPointF@Qt_5_PRIVATE_API 5.9.0~rc - _ZN27QQuickAbstractButtonPrivate12grabShortcutEv@Qt_5_PRIVATE_API 5.10.1 _ZN27QQuickAbstractButtonPrivate12handleUngrabEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN27QQuickAbstractButtonPrivate12setMovePointERK7QPointF@Qt_5_PRIVATE_API 5.11.1 _ZN27QQuickAbstractButtonPrivate13handleReleaseERK7QPointF@Qt_5_PRIVATE_API 5.9.0~rc - _ZN27QQuickAbstractButtonPrivate13setPressPointERK7QPointF@Qt_5_PRIVATE_API 5.11.1 - _ZN27QQuickAbstractButtonPrivate14ungrabShortcutEv@Qt_5_PRIVATE_API 5.10.1 - _ZN27QQuickAbstractButtonPrivate15cancelIndicatorEv@Qt_5_PRIVATE_API 5.10.1 + _ZN27QQuickAbstractButtonPrivate15cancelIndicatorEv@Qt_5_PRIVATE_API 5.9.5 _ZN27QQuickAbstractButtonPrivate15stopPressRepeatEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN27QQuickAbstractButtonPrivate16actionTextChangeEv@Qt_5_PRIVATE_API 5.10.1 - _ZN27QQuickAbstractButtonPrivate16executeIndicatorEb@Qt_5_PRIVATE_API 5.10.1 + _ZN27QQuickAbstractButtonPrivate16executeIndicatorEb@Qt_5_PRIVATE_API 5.9.5 _ZN27QQuickAbstractButtonPrivate16startPressRepeatEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN27QQuickAbstractButtonPrivate16startRepeatDelayEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN27QQuickAbstractButtonPrivate16stopPressAndHoldEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN27QQuickAbstractButtonPrivate17startPressAndHoldEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN27QQuickAbstractButtonPrivate19updateEffectiveIconEv@Qt_5_PRIVATE_API 5.11.1 _ZN27QQuickAbstractButtonPrivate23isPressAndHoldConnectedEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZN27QQuickAbstractButtonPrivate24itemImplicitWidthChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN27QQuickAbstractButtonPrivate25itemImplicitHeightChangedEP10QQuickItem@Qt_5_PRIVATE_API 5.12.2 - _ZN27QQuickAbstractButtonPrivate5clickEv@Qt_5_PRIVATE_API 5.10.1 _ZN27QQuickAbstractButtonPrivate6toggleEb@Qt_5_PRIVATE_API 5.9.0~rc - _ZN27QQuickAbstractButtonPrivate7setTextERK7QStringb@Qt_5_PRIVATE_API 5.10.1 - _ZN27QQuickAbstractButtonPrivate7triggerEv@Qt_5_PRIVATE_API 5.10.1 + _ZN27QQuickAbstractButtonPrivateC1Ev@Qt_5_PRIVATE_API 5.9.0~rc + _ZN27QQuickAbstractButtonPrivateC2Ev@Qt_5_PRIVATE_API 5.9.0~rc _ZN27QQuickSwipeDelegateAttached10setPressedEb@Qt_5_PRIVATE_API 5.9.0~rc _ZN27QQuickSwipeDelegateAttached11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.9.0~rc _ZN27QQuickSwipeDelegateAttached11qt_metacastEPKc@Qt_5_PRIVATE_API 5.9.0~rc @@ -1961,6 +1431,12 @@ _ZN27QQuickSwipeDelegateAttached7clickedEv@Qt_5_PRIVATE_API 5.9.0~rc _ZN27QQuickSwipeDelegateAttachedC1EP7QObject@Qt_5_PRIVATE_API 5.9.0~rc _ZN27QQuickSwipeDelegateAttachedC2EP7QObject@Qt_5_PRIVATE_API 5.9.0~rc + _ZN28QQuickTumblerAttachedPrivate24_q_calculateDisplacementEv@Qt_5_PRIVATE_API 5.9.5 + _ZN28QQuickTumblerAttachedPrivate25emitIfDisplacementChangedEdd@Qt_5_PRIVATE_API 5.9.5 + _ZN28QQuickTumblerAttachedPrivate3getEP21QQuickTumblerAttached@Qt_5_PRIVATE_API 5.9.5 + _ZN28QQuickTumblerAttachedPrivate4initEP10QQuickItem@Qt_5_PRIVATE_API 5.9.5 + _ZN28QQuickTumblerAttachedPrivateC1Ev@Qt_5_PRIVATE_API 5.9.5 + _ZN28QQuickTumblerAttachedPrivateC2Ev@Qt_5_PRIVATE_API 5.9.5 _ZN29QQuickDialogButtonBoxAttached11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5_PRIVATE_API 5.9.0~rc _ZN29QQuickDialogButtonBoxAttached11qt_metacastEPKc@Qt_5_PRIVATE_API 5.9.0~rc _ZN29QQuickDialogButtonBoxAttached13setButtonRoleEN21QPlatformDialogHelper10ButtonRoleE@Qt_5_PRIVATE_API 5.9.0~rc @@ -1986,7 +1462,6 @@ _ZN31QQuickApplicationWindowAttached13footerChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN31QQuickApplicationWindowAttached13headerChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN31QQuickApplicationWindowAttached13windowChangedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZN31QQuickApplicationWindowAttached14menuBarChangedEv@Qt_5_PRIVATE_API 5.10.1 _ZN31QQuickApplicationWindowAttached14overlayChangedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZN31QQuickApplicationWindowAttached16staticMetaObjectE@Qt_5_PRIVATE_API 5.6.0~beta _ZN31QQuickApplicationWindowAttached18contentItemChangedEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -2005,37 +1480,17 @@ _ZNK10QQuickDial8positionEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK10QQuickDial8snapModeEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK10QQuickDial8stepSizeEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK10QQuickDial9inputModeEv@Qt_5_PRIVATE_API 5.12.2 _ZNK10QQuickDial9isPressedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK10QQuickIcon4nameEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickIcon5colorEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickIcon5widthEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickIcon6heightEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickIcon6sourceEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickIcon7isEmptyEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickIcon7resolveERKS_@Qt_5_PRIVATE_API 5.11.1 - _ZNK10QQuickIconeqERKS_@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickIconneERKS_@Qt_5_PRIVATE_API 5.10.1 _ZNK10QQuickMenu10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK10QQuickMenu11defaultFontEv@Qt_5_PRIVATE_API 5.9.1 _ZNK10QQuickMenu12contentModelEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK10QQuickMenu12currentIndexEv@Qt_5_PRIVATE_API 5.10.1 _ZNK10QQuickMenu14accessibleRoleEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK10QQuickMenu14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickMenu5countEv@Qt_5_PRIVATE_API 5.10.1 _ZNK10QQuickMenu5titleEv@Qt_5_PRIVATE_API 5.7.1 _ZNK10QQuickMenu6itemAtEi@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK10QQuickMenu6menuAtEi@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickMenu7cascadeEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickMenu7overlapEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickMenu8actionAtEi@Qt_5_PRIVATE_API 5.10.1 - _ZNK10QQuickMenu8delegateEv@Qt_5_PRIVATE_API 5.10.1 _ZNK10QQuickPage10metaObjectEv@Qt_5_PRIVATE_API 5.7.1 + _ZNK10QQuickPage12contentWidthEv@Qt_5_PRIVATE_API 5.9.0~rc + _ZNK10QQuickPage13contentHeightEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK10QQuickPage14accessibleRoleEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK10QQuickPage19implicitFooterWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK10QQuickPage19implicitHeaderWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK10QQuickPage20implicitFooterHeightEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK10QQuickPage20implicitHeaderHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK10QQuickPage5titleEv@Qt_5_PRIVATE_API 5.7.1 _ZNK10QQuickPage6footerEv@Qt_5_PRIVATE_API 5.7.1 _ZNK10QQuickPage6headerEv@Qt_5_PRIVATE_API 5.7.1 @@ -2047,22 +1502,12 @@ _ZNK11QQuickFrame14accessibleRoleEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK11QQuickLabel10backgroundEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK11QQuickLabel10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK11QQuickLabel10rightInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK11QQuickLabel11bottomInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK11QQuickLabel23implicitBackgroundWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK11QQuickLabel24implicitBackgroundHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK11QQuickLabel4fontEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK11QQuickLabel7paletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK11QQuickLabel8topInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK11QQuickLabel9leftInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK11QQuickPopup10backgroundEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK11QQuickPopup10isMirroredEv@Qt_5_PRIVATE_API 5.10.1 _ZNK11QQuickPopup10leftMarginEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK11QQuickPopup10parentItemEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK11QQuickPopup10rightInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK11QQuickPopup10topPaddingEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK11QQuickPopup11bottomInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK11QQuickPopup11closePolicyEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup11contentItemEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK11QQuickPopup11defaultFontEv@Qt_5_PRIVATE_API 5.7.1 @@ -2077,22 +1522,15 @@ _ZNK11QQuickPopup14accessibleNameEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK11QQuickPopup14accessibleRoleEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup14availableWidthEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK11QQuickPopup14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK11QQuickPopup14hasActiveFocusEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup14implicitHeightEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup15availableHeightEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup15transformOriginEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK11QQuickPopup15verticalPaddingEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK11QQuickPopup17horizontalPaddingEv@Qt_5_PRIVATE_API 5.12.2 _ZNK11QQuickPopup19isComponentCompleteEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup1xEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup1yEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup1zEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK11QQuickPopup20implicitContentWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK11QQuickPopup21implicitContentHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK11QQuickPopup23filtersChildMouseEventsEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK11QQuickPopup23implicitBackgroundWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK11QQuickPopup24implicitBackgroundHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK11QQuickPopup3dimEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup4clipEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup4exitEv@Qt_5_PRIVATE_API 5.7.1 @@ -2107,15 +1545,10 @@ _ZNK11QQuickPopup7marginsEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup7opacityEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup7paddingEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK11QQuickPopup7paletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK11QQuickPopup7spacingEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK11QQuickPopup8hasFocusEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK11QQuickPopup8isOpenedEv@Qt_5_PRIVATE_API 5.10.1 _ZNK11QQuickPopup8positionEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK11QQuickPopup8topInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK11QQuickPopup9isEnabledEv@Qt_5_PRIVATE_API 5.10.1 _ZNK11QQuickPopup9isVisibleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK11QQuickPopup9leftInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK11QQuickPopup9popupItemEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickPopup9topMarginEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickSwipe10behindItemEv@Qt_5_PRIVATE_API 5.7.1 @@ -2129,44 +1562,25 @@ _ZNK11QQuickSwipe8positionEv@Qt_5_PRIVATE_API 5.7.1 _ZNK11QQuickSwipe9isEnabledEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK11QQuickSwipe9rightItemEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK12QQuickAction10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK12QQuickAction11isCheckableEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK12QQuickAction4iconEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK12QQuickAction4textEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK12QQuickAction8shortcutEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK12QQuickAction9isCheckedEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK12QQuickAction9isEnabledEv@Qt_5_PRIVATE_API 5.10.1 _ZNK12QQuickButton10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickButton11defaultFontEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickButton13isHighlightedEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK12QQuickButton14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK12QQuickButton6isFlatEv@Qt_5_PRIVATE_API 5.7.1 _ZNK12QQuickDialog10metaObjectEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK12QQuickDialog14accessibleRoleEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK12QQuickDialog14standardButtonEN21QPlatformDialogHelper14StandardButtonE@Qt_5_PRIVATE_API 5.10.1 _ZNK12QQuickDialog15standardButtonsEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK12QQuickDialog19implicitFooterWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK12QQuickDialog19implicitHeaderWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK12QQuickDialog20implicitFooterHeightEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK12QQuickDialog20implicitHeaderHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK12QQuickDialog5titleEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK12QQuickDialog6footerEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK12QQuickDialog6headerEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK12QQuickDialog6resultEv@Qt_5_PRIVATE_API 5.10.1 _ZNK12QQuickDrawer10dragMarginEv@Qt_5_PRIVATE_API 5.7.1 _ZNK12QQuickDrawer10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickDrawer13isInteractiveEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK12QQuickDrawer4edgeEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickDrawer8positionEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK12QQuickSlider10isVerticalEv@Qt_5_PRIVATE_API 5.10.1 _ZNK12QQuickSlider10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickSlider11orientationEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK12QQuickSlider12isHorizontalEv@Qt_5_PRIVATE_API 5.10.1 _ZNK12QQuickSlider14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickSlider14visualPositionEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK12QQuickSlider18touchDragThresholdEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK12QQuickSlider19implicitHandleWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK12QQuickSlider20implicitHandleHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK12QQuickSlider2toEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickSlider4fromEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickSlider4liveEv@Qt_5_PRIVATE_API 5.9.0~rc @@ -2178,22 +1592,18 @@ _ZNK12QQuickSlider8stepSizeEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickSlider9isPressedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickSwitch10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK12QQuickSwitch11defaultFontEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK12QQuickSwitch14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK12QQuickSwitch14visualPositionEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickSwitch8positionEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK12QQuickTabBar10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK12QQuickTabBar11defaultFontEv@Qt_5_PRIVATE_API 5.12.2 + _ZNK12QQuickTabBar12contentWidthEv@Qt_5_PRIVATE_API 5.9.0~rc + _ZNK12QQuickTabBar13contentHeightEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK12QQuickTabBar14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK12QQuickTabBar14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK12QQuickTabBar8positionEv@Qt_5_PRIVATE_API 5.7.1 _ZNK12QQuickTabBar9isContentEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickControl10backgroundEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickControl10isMirroredEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickControl10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickControl10rightInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK13QQuickControl10topPaddingEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickControl11bottomInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK13QQuickControl11contentItemEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickControl11defaultFontEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickControl11focusPolicyEv@Qt_5_PRIVATE_API 5.7.1 @@ -2204,90 +1614,45 @@ _ZNK13QQuickControl14accessibleNameEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickControl14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickControl14availableWidthEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickControl14baselineOffsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK13QQuickControl14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK13QQuickControl14hasVisualFocusEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickControl14isHoverEnabledEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickControl14isWheelEnabledEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickControl15availableHeightEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickControl15verticalPaddingEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK13QQuickControl17horizontalPaddingEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK13QQuickControl20implicitContentWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK13QQuickControl21implicitContentHeightEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK13QQuickControl23implicitBackgroundWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK13QQuickControl24implicitBackgroundHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK13QQuickControl4fontEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickControl6localeEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickControl7paddingEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickControl7paletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK13QQuickControl7spacingEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickControl8topInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK13QQuickControl9isHoveredEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK13QQuickControl9leftInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK13QQuickMenuBar10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickMenuBar11defaultFontEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickMenuBar14accessibleRoleEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickMenuBar14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickMenuBar6menuAtEi@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickMenuBar8delegateEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickMenuBar9isContentEP10QQuickItem@Qt_5_PRIVATE_API 5.10.1 _ZNK13QQuickOverlay10metaObjectEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickOverlay5modalEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickOverlay8modelessEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK13QQuickPalette10brightTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette10buttonTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette10windowTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette11linkVisitedEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette11toolTipBaseEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette11toolTipTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette13alternateBaseEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette15highlightedTextEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette3midEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette4baseEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette4darkEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette4linkEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette4textEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette5lightEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette6buttonEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette6shadowEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette6windowEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette8midlightEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK13QQuickPalette9highlightEv@Qt_5_PRIVATE_API 5.10.1 _ZNK13QQuickSpinBox10isEditableEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickSpinBox10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickSpinBox11defaultFontEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK13QQuickSpinBox11displayTextEv@Qt_5_PRIVATE_API 5.11.1 _ZNK13QQuickSpinBox13textFromValueEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickSpinBox13valueFromTextEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickSpinBox14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickSpinBox14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK13QQuickSpinBox16inputMethodHintsEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK13QQuickSpinBox22isInputMethodComposingEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK13QQuickSpinBox2toEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickSpinBox2upEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickSpinBox4downEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickSpinBox4fromEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickSpinBox4wrapEv@Qt_5_PRIVATE_API 5.10.1 _ZNK13QQuickSpinBox5valueEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickSpinBox8stepSizeEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickSpinBox9validatorEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickToolBar10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickToolBar11defaultFontEv@Qt_5_PRIVATE_API 5.12.2 _ZNK13QQuickToolBar14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickToolBar14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK13QQuickToolBar8positionEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickToolTip10metaObjectEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickToolTip11defaultFontEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickToolTip14accessibleRoleEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK13QQuickToolTip14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK13QQuickToolTip4textEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickToolTip5delayEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickToolTip7timeoutEv@Qt_5_PRIVATE_API 5.7.1 _ZNK13QQuickTumbler10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickTumbler11currentItemEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickTumbler11defaultFontEv@Qt_5_PRIVATE_API 5.10.1 _ZNK13QQuickTumbler12currentIndexEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK13QQuickTumbler14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK13QQuickTumbler16visibleItemCountEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK13QQuickTumbler4wrapEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK13QQuickTumbler5countEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -2298,7 +1663,7 @@ _ZNK14QQuickCheckBox10isTristateEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickCheckBox10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickCheckBox11defaultFontEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK14QQuickCheckBox14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 + _ZNK14QQuickCheckBox14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickComboBox10isEditableEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK14QQuickComboBox10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickComboBox11currentTextEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -2307,13 +1672,10 @@ _ZNK14QQuickComboBox12currentIndexEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickComboBox13delegateModelEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickComboBox14accessibleRoleEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK14QQuickComboBox14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK14QQuickComboBox16highlightedIndexEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickComboBox16inputMethodHintsEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK14QQuickComboBox18hasAcceptableInputEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK14QQuickComboBox22implicitIndicatorWidthEv@Qt_5_PRIVATE_API 5.12.2 _ZNK14QQuickComboBox22isInputMethodComposingEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK14QQuickComboBox23implicitIndicatorHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK14QQuickComboBox4findERK7QString6QFlagsIN2Qt9MatchFlagEE@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickComboBox5countEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickComboBox5modelEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -2330,53 +1692,31 @@ _ZNK14QQuickGroupBox10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickGroupBox11defaultFontEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickGroupBox14accessibleRoleEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK14QQuickGroupBox14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK14QQuickGroupBox18implicitLabelWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK14QQuickGroupBox19implicitLabelHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK14QQuickGroupBox5labelEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickGroupBox5titleEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickMenuItem10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickMenuItem11defaultFontEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickMenuItem13isHighlightedEv@Qt_5_PRIVATE_API 5.7.1 _ZNK14QQuickMenuItem14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK14QQuickMenuItem14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK14QQuickMenuItem4menuEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK14QQuickMenuItem5arrowEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK14QQuickMenuItem7subMenuEv@Qt_5_PRIVATE_API 5.10.1 _ZNK14QQuickTextArea10backgroundEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickTextArea10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK14QQuickTextArea10rightInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK14QQuickTextArea11bottomInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK14QQuickTextArea11focusReasonEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK14QQuickTextArea14isHoverEnabledEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK14QQuickTextArea15placeholderTextEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK14QQuickTextArea20placeholderTextColorEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK14QQuickTextArea23implicitBackgroundWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK14QQuickTextArea24implicitBackgroundHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK14QQuickTextArea4fontEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK14QQuickTextArea7paletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK14QQuickTextArea8containsERK7QPointF@Qt_5_PRIVATE_API 5.7.1 - _ZNK14QQuickTextArea8topInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK14QQuickTextArea9isHoveredEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK14QQuickTextArea9leftInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK15QQuickContainer10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickContainer11currentItemEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickContainer12contentModelEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickContainer12contentWidthEv@Qt_5_PRIVATE_API 5.12.2 _ZNK15QQuickContainer12currentIndexEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickContainer13contentHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK15QQuickContainer5countEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickContainer6itemAtEi@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickContainer9isContentEP10QQuickItem@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickScrollBar10isVerticalEv@Qt_5_PRIVATE_API 5.10.1 _ZNK15QQuickScrollBar10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickScrollBar10visualSizeEv@Qt_5_PRIVATE_API 5.11.1 - _ZNK15QQuickScrollBar11minimumSizeEv@Qt_5_PRIVATE_API 5.11.1 _ZNK15QQuickScrollBar11orientationEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickScrollBar12isHorizontalEv@Qt_5_PRIVATE_API 5.10.1 _ZNK15QQuickScrollBar13isInteractiveEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK15QQuickScrollBar14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickScrollBar14visualPositionEv@Qt_5_PRIVATE_API 5.11.1 _ZNK15QQuickScrollBar4sizeEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickScrollBar6policyEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK15QQuickScrollBar8isActiveEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -2392,76 +1732,43 @@ _ZNK15QQuickStackView14accessibleRoleEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK15QQuickStackView5depthEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickStackView6isBusyEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickStackView7isEmptyEv@Qt_5_PRIVATE_API 5.10.1 _ZNK15QQuickStackView7popExitEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickStackView8popEnterEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickStackView8pushExitEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickStackView9pushEnterEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickSwipeView10isVerticalEv@Qt_5_PRIVATE_API 5.10.1 _ZNK15QQuickSwipeView10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickSwipeView11orientationEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK15QQuickSwipeView12isHorizontalEv@Qt_5_PRIVATE_API 5.10.1 _ZNK15QQuickSwipeView13isInteractiveEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK15QQuickSwipeView14accessibleRoleEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK15QQuickTabButton10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickTabButton11defaultFontEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickTabButton14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickTabButton14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK15QQuickTextField10backgroundEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickTextField10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickTextField10rightInsetEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK15QQuickTextField11bottomInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK15QQuickTextField11focusReasonEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK15QQuickTextField14isHoverEnabledEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK15QQuickTextField15placeholderTextEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickTextField20placeholderTextColorEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK15QQuickTextField23implicitBackgroundWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK15QQuickTextField24implicitBackgroundHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK15QQuickTextField4fontEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK15QQuickTextField7paletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK15QQuickTextField8topInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK15QQuickTextField9isHoveredEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK15QQuickTextField9leftInsetEv@Qt_5_PRIVATE_API 5.12.2 _ZNK16QQuickScrollView10metaObjectEv@Qt_5_PRIVATE_API 5.9.0~rc + _ZNK16QQuickScrollView12contentWidthEv@Qt_5_PRIVATE_API 5.9.0~rc + _ZNK16QQuickScrollView13contentHeightEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK16QQuickScrollView14accessibleRoleEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK16QQuickSpinButton10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK16QQuickSpinButton22implicitIndicatorWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK16QQuickSpinButton23implicitIndicatorHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK16QQuickSpinButton9indicatorEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK16QQuickSpinButton9isHoveredEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK16QQuickSpinButton9isPressedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK16QQuickToolButton10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK16QQuickToolButton11defaultFontEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK16QQuickToolButton14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickActionGroup10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickActionGroup11isExclusiveEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickActionGroup13checkedActionEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickActionGroup9isEnabledEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickButtonGroup10checkStateEv@Qt_5_PRIVATE_API 5.11.1 _ZNK17QQuickButtonGroup10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK17QQuickButtonGroup11isExclusiveEv@Qt_5_PRIVATE_API 5.10.1 _ZNK17QQuickButtonGroup13checkedButtonEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK17QQuickContentItem10metaObjectEv@Qt_5_PRIVATE_API 5.12.2 _ZNK17QQuickDelayButton10metaObjectEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK17QQuickDelayButton10transitionEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK17QQuickDelayButton11defaultFontEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK17QQuickDelayButton14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK17QQuickDelayButton5delayEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK17QQuickDelayButton8progressEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK17QQuickMenuBarItem10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickMenuBarItem11defaultFontEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickMenuBarItem13isHighlightedEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickMenuBarItem14accessibleRoleEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickMenuBarItem14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickMenuBarItem4menuEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickMenuBarItem7menuBarEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickMenuPrivate10blockInputEP10QQuickItemRK7QPointF@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickMenuPrivate14currentSubMenuEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickMenuPrivate20firstEnabledMenuItemEv@Qt_5_PRIVATE_API 5.12.2 + _ZNK17QQuickMenuPrivate12currentIndexEv@Qt_5_PRIVATE_API 5.7.1 _ZNK17QQuickMenuPrivate6itemAtEi@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK17QQuickPanePrivate15getContentWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK17QQuickPanePrivate16getContentHeightEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK17QQuickPanePrivate17contentChildItemsEv@Qt_5_PRIVATE_API 5.12.2 _ZNK17QQuickProgressBar10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK17QQuickProgressBar14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK17QQuickProgressBar14visualPositionEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -2473,19 +1780,14 @@ _ZNK17QQuickRadioButton10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK17QQuickRadioButton11defaultFontEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK17QQuickRadioButton14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK17QQuickRadioButton14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK17QQuickRangeSlider10isVerticalEv@Qt_5_PRIVATE_API 5.10.1 _ZNK17QQuickRangeSlider10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK17QQuickRangeSlider11orientationEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK17QQuickRangeSlider12isHorizontalEv@Qt_5_PRIVATE_API 5.10.1 _ZNK17QQuickRangeSlider14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK17QQuickRangeSlider18touchDragThresholdEv@Qt_5_PRIVATE_API 5.12.2 _ZNK17QQuickRangeSlider2toEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK17QQuickRangeSlider4fromEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK17QQuickRangeSlider4liveEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK17QQuickRangeSlider5firstEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK17QQuickRangeSlider6secondEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK17QQuickRangeSlider7valueAtEd@Qt_5_PRIVATE_API 5.12.2 _ZNK17QQuickRangeSlider8snapModeEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK17QQuickRangeSlider8stepSizeEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK17QQuickRoundButton10metaObjectEv@Qt_5_PRIVATE_API 5.9.0~rc @@ -2494,9 +1796,6 @@ _ZNK18QQuickItemDelegate11defaultFontEv@Qt_5_PRIVATE_API 5.7.1 _ZNK18QQuickItemDelegate13isHighlightedEv@Qt_5_PRIVATE_API 5.7.1 _ZNK18QQuickItemDelegate14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK18QQuickItemDelegate14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK18QQuickPopupAnchors10metaObjectEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK18QQuickPopupAnchors8centerInEv@Qt_5_PRIVATE_API 5.12.2 _ZNK19QQuickBusyIndicator10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK19QQuickBusyIndicator14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK19QQuickBusyIndicator9isRunningEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -2505,11 +1804,8 @@ _ZNK19QQuickCheckDelegate10metaObjectEv@Qt_5_PRIVATE_API 5.7.1 _ZNK19QQuickCheckDelegate11defaultFontEv@Qt_5_PRIVATE_API 5.7.1 _ZNK19QQuickCheckDelegate14accessibleRoleEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK19QQuickCheckDelegate14defaultPaletteEv@Qt_5_PRIVATE_API 5.12.2 _ZNK19QQuickMenuSeparator10metaObjectEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK19QQuickMenuSeparator11defaultFontEv@Qt_5_PRIVATE_API 5.12.2 _ZNK19QQuickMenuSeparator14accessibleRoleEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK19QQuickMenuSeparator14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK19QQuickPageIndicator10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK19QQuickPageIndicator12currentIndexEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK19QQuickPageIndicator13isInteractiveEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -2519,56 +1815,32 @@ _ZNK19QQuickRadioDelegate10metaObjectEv@Qt_5_PRIVATE_API 5.7.1 _ZNK19QQuickRadioDelegate11defaultFontEv@Qt_5_PRIVATE_API 5.7.1 _ZNK19QQuickRadioDelegate14accessibleRoleEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK19QQuickRadioDelegate14defaultPaletteEv@Qt_5_PRIVATE_API 5.12.2 _ZNK19QQuickSwipeDelegate10metaObjectEv@Qt_5_PRIVATE_API 5.7.1 _ZNK19QQuickSwipeDelegate11defaultFontEv@Qt_5_PRIVATE_API 5.7.1 _ZNK19QQuickSwipeDelegate14accessibleRoleEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK19QQuickSwipeDelegate14defaultPaletteEv@Qt_5_PRIVATE_API 5.12.2 _ZNK19QQuickSwipeDelegate5swipeEv@Qt_5_PRIVATE_API 5.7.1 _ZNK19QQuickToolSeparator10isVerticalEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK19QQuickToolSeparator10metaObjectEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK19QQuickToolSeparator11defaultFontEv@Qt_5_PRIVATE_API 5.12.2 _ZNK19QQuickToolSeparator11orientationEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK19QQuickToolSeparator12isHorizontalEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK19QQuickToolSeparator14accessibleRoleEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK19QQuickToolSeparator14defaultPaletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK20QQuickAbstractButton10autoRepeatEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK20QQuickAbstractButton10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK20QQuickAbstractButton11isCheckableEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK20QQuickAbstractButton13autoExclusiveEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK20QQuickAbstractButton14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK20QQuickAbstractButton15autoRepeatDelayEv@Qt_5_PRIVATE_API 5.11.1 - _ZNK20QQuickAbstractButton18autoRepeatIntervalEv@Qt_5_PRIVATE_API 5.11.1 - _ZNK20QQuickAbstractButton22implicitIndicatorWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK20QQuickAbstractButton23implicitIndicatorHeightEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK20QQuickAbstractButton4iconEv@Qt_5_PRIVATE_API 5.10.1 _ZNK20QQuickAbstractButton4textEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK20QQuickAbstractButton6actionEv@Qt_5_PRIVATE_API 5.10.1 _ZNK20QQuickAbstractButton6isDownEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK20QQuickAbstractButton6pressXEv@Qt_5_PRIVATE_API 5.11.1 - _ZNK20QQuickAbstractButton6pressYEv@Qt_5_PRIVATE_API 5.11.1 - _ZNK20QQuickAbstractButton7displayEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK20QQuickAbstractButton8shortcutEv@Qt_5_PRIVATE_API 5.10.1 _ZNK20QQuickAbstractButton9indicatorEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK20QQuickAbstractButton9isCheckedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK20QQuickAbstractButton9isPressedEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK20QQuickControlPrivate14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK20QQuickControlPrivate15getContentWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK20QQuickControlPrivate16getContentHeightEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK20QQuickMenuBarPrivate15getContentWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK20QQuickMenuBarPrivate16getContentHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK20QQuickSwitchDelegate10metaObjectEv@Qt_5_PRIVATE_API 5.7.1 _ZNK20QQuickSwitchDelegate11defaultFontEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK20QQuickSwitchDelegate14defaultPaletteEv@Qt_5_PRIVATE_API 5.12.2 _ZNK20QQuickSwitchDelegate14visualPositionEv@Qt_5_PRIVATE_API 5.7.1 _ZNK20QQuickSwitchDelegate8positionEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK20QQuickTabBarAttached10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK20QQuickTabBarAttached5indexEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK20QQuickTabBarAttached6tabBarEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK20QQuickTabBarAttached8positionEv@Qt_5_PRIVATE_API 5.10.1 _ZNK20QQuickTumblerPrivate25viewContentItemChildItemsEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK21QQuickDialogButtonBox10metaObjectEv@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK21QQuickDialogButtonBox12buttonLayoutEv@Qt_5_PRIVATE_API 5.12.2 _ZNK21QQuickDialogButtonBox14accessibleRoleEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK21QQuickDialogButtonBox14standardButtonEN21QPlatformDialogHelper14StandardButtonE@Qt_5_PRIVATE_API 5.9.0~rc _ZNK21QQuickDialogButtonBox15standardButtonsEv@Qt_5_PRIVATE_API 5.9.0~rc @@ -2576,27 +1848,16 @@ _ZNK21QQuickDialogButtonBox8positionEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK21QQuickDialogButtonBox9alignmentEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK21QQuickDialogButtonBox9isContentEP10QQuickItem@Qt_5_PRIVATE_API 5.9.0~rc - _ZNK21QQuickOverlayAttached10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK21QQuickOverlayAttached5modalEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK21QQuickOverlayAttached7overlayEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK21QQuickOverlayAttached8modelessEv@Qt_5_PRIVATE_API 5.10.1 _ZNK21QQuickRangeSliderNode10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK21QQuickRangeSliderNode14visualPositionEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK21QQuickRangeSliderNode19implicitHandleWidthEv@Qt_5_PRIVATE_API 5.12.2 - _ZNK21QQuickRangeSliderNode20implicitHandleHeightEv@Qt_5_PRIVATE_API 5.12.2 _ZNK21QQuickRangeSliderNode5valueEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK21QQuickRangeSliderNode6handleEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK21QQuickRangeSliderNode8positionEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK21QQuickRangeSliderNode9isHoveredEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK21QQuickRangeSliderNode9isPressedEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK21QQuickScrollIndicator10isVerticalEv@Qt_5_PRIVATE_API 5.10.1 _ZNK21QQuickScrollIndicator10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK21QQuickScrollIndicator10visualSizeEv@Qt_5_PRIVATE_API 5.11.1 - _ZNK21QQuickScrollIndicator11minimumSizeEv@Qt_5_PRIVATE_API 5.11.1 _ZNK21QQuickScrollIndicator11orientationEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK21QQuickScrollIndicator12isHorizontalEv@Qt_5_PRIVATE_API 5.10.1 _ZNK21QQuickScrollIndicator14accessibleRoleEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK21QQuickScrollIndicator14visualPositionEv@Qt_5_PRIVATE_API 5.11.1 _ZNK21QQuickScrollIndicator4sizeEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK21QQuickScrollIndicator8isActiveEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK21QQuickScrollIndicator8positionEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -2621,9 +1882,7 @@ _ZNK23QQuickApplicationWindow6footerEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK23QQuickApplicationWindow6headerEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK23QQuickApplicationWindow6localeEv@Qt_5_PRIVATE_API 5.7.1 - _ZNK23QQuickApplicationWindow7menuBarEv@Qt_5_PRIVATE_API 5.10.1 _ZNK23QQuickApplicationWindow7overlayEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK23QQuickApplicationWindow7paletteEv@Qt_5_PRIVATE_API 5.10.1 _ZNK23QQuickScrollBarAttached10horizontalEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK23QQuickScrollBarAttached10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK23QQuickScrollBarAttached8verticalEv@Qt_5_PRIVATE_API 5.6.0~beta @@ -2638,11 +1897,8 @@ _ZNK23QQuickSwipeViewAttached14isPreviousItemEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK23QQuickSwipeViewAttached4viewEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK23QQuickSwipeViewAttached5indexEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK25QQuickActionGroupAttached10metaObjectEv@Qt_5_PRIVATE_API 5.10.1 - _ZNK25QQuickActionGroupAttached5groupEv@Qt_5_PRIVATE_API 5.10.1 _ZNK25QQuickButtonGroupAttached10metaObjectEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK25QQuickButtonGroupAttached5groupEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK27QQuickAbstractButtonPrivate14acceptKeyClickEN2Qt3KeyE@Qt_5_PRIVATE_API 5.12.3 _ZNK27QQuickAbstractButtonPrivate17findCheckedButtonEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK27QQuickAbstractButtonPrivate20findExclusiveButtonsEv@Qt_5_PRIVATE_API 5.9.0~rc _ZNK27QQuickSwipeDelegateAttached10metaObjectEv@Qt_5_PRIVATE_API 5.9.0~rc @@ -2659,10 +1915,7 @@ _ZNK31QQuickApplicationWindowAttached6footerEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK31QQuickApplicationWindowAttached6headerEv@Qt_5_PRIVATE_API 5.6.0~beta _ZNK31QQuickApplicationWindowAttached6windowEv@Qt_5_PRIVATE_API 5.6.0~beta - _ZNK31QQuickApplicationWindowAttached7menuBarEv@Qt_5_PRIVATE_API 5.10.1 _ZNK31QQuickApplicationWindowAttached7overlayEv@Qt_5_PRIVATE_API 5.6.0~beta - (optional=templinst)_ZNSt3_V28__rotateIPP20QQuickAbstractButtonEET_S4_S4_S4_St26random_access_iterator_tag@Qt_5_PRIVATE_API 5.12.3 - (optional=templinst|arch=m68k mips64el mipsel powerpc ppc64 ppc64el s390x|subst)_ZSt17__rotate_adaptiveIPP20QQuickAbstractButtonS2_{ssize_t}ET_S3_S3_S3_T1_S4_T0_S4_@Qt_5_PRIVATE_API 5.12.5 _ZTI10QQuickDial@Qt_5_PRIVATE_API 5.6.0~beta _ZTI10QQuickMenu@Qt_5_PRIVATE_API 5.6.0~beta _ZTI10QQuickPage@Qt_5_PRIVATE_API 5.7.1 @@ -2671,7 +1924,6 @@ _ZTI11QQuickLabel@Qt_5_PRIVATE_API 5.6.0~beta _ZTI11QQuickPopup@Qt_5_PRIVATE_API 5.6.0~beta _ZTI11QQuickSwipe@Qt_5_PRIVATE_API 5.7.1 - _ZTI12QQuickAction@Qt_5_PRIVATE_API 5.10.1 _ZTI12QQuickButton@Qt_5_PRIVATE_API 5.6.0~beta _ZTI12QQuickDialog@Qt_5_PRIVATE_API 5.9.0~rc _ZTI12QQuickDrawer@Qt_5_PRIVATE_API 5.6.0~beta @@ -2679,7 +1931,6 @@ _ZTI12QQuickSwitch@Qt_5_PRIVATE_API 5.6.0~beta _ZTI12QQuickTabBar@Qt_5_PRIVATE_API 5.6.0~beta _ZTI13QQuickControl@Qt_5_PRIVATE_API 5.6.0~beta - _ZTI13QQuickMenuBar@Qt_5_PRIVATE_API 5.10.1 _ZTI13QQuickOverlay@Qt_5_PRIVATE_API 5.7.1 _ZTI13QQuickSpinBox@Qt_5_PRIVATE_API 5.6.0~beta _ZTI13QQuickToolBar@Qt_5_PRIVATE_API 5.6.0~beta @@ -2699,11 +1950,8 @@ _ZTI16QQuickScrollView@Qt_5_PRIVATE_API 5.9.0~rc _ZTI16QQuickSpinButton@Qt_5_PRIVATE_API 5.6.0~beta _ZTI16QQuickToolButton@Qt_5_PRIVATE_API 5.6.0~beta - _ZTI17QQuickActionGroup@Qt_5_PRIVATE_API 5.10.1 _ZTI17QQuickButtonGroup@Qt_5_PRIVATE_API 5.6.0~beta - _ZTI17QQuickContentItem@Qt_5_PRIVATE_API 5.12.2 _ZTI17QQuickDelayButton@Qt_5_PRIVATE_API 5.9.0~rc - _ZTI17QQuickMenuBarItem@Qt_5_PRIVATE_API 5.10.1 _ZTI17QQuickMenuPrivate@Qt_5_PRIVATE_API 5.6.0~beta _ZTI17QQuickPanePrivate@Qt_5_PRIVATE_API 5.6.0~beta _ZTI17QQuickProgressBar@Qt_5_PRIVATE_API 5.6.0~beta @@ -2712,7 +1960,6 @@ _ZTI17QQuickRoundButton@Qt_5_PRIVATE_API 5.9.0~rc _ZTI18QQuickFramePrivate@Qt_5_PRIVATE_API 5.6.0~beta _ZTI18QQuickItemDelegate@Qt_5_PRIVATE_API 5.6.0~beta - _ZTI18QQuickPopupAnchors@Qt_5_PRIVATE_API 5.12.2 _ZTI19QQuickBusyIndicator@Qt_5_PRIVATE_API 5.6.0~beta _ZTI19QQuickCheckDelegate@Qt_5_PRIVATE_API 5.7.1 _ZTI19QQuickMenuSeparator@Qt_5_PRIVATE_API 5.9.0~rc @@ -2722,13 +1969,9 @@ _ZTI19QQuickToolSeparator@Qt_5_PRIVATE_API 5.9.0~rc _ZTI20QQuickAbstractButton@Qt_5_PRIVATE_API 5.6.0~beta _ZTI20QQuickControlPrivate@Qt_5_PRIVATE_API 5.6.0~beta - _ZTI20QQuickMenuBarPrivate@Qt_5_PRIVATE_API 5.10.1 _ZTI20QQuickSwitchDelegate@Qt_5_PRIVATE_API 5.7.1 - _ZTI20QQuickTabBarAttached@Qt_5_PRIVATE_API 5.10.1 _ZTI20QQuickTumblerPrivate@Qt_5_PRIVATE_API 5.9.0~rc _ZTI21QQuickDialogButtonBox@Qt_5_PRIVATE_API 5.9.0~rc - _ZTI21QQuickOverlayAttached@Qt_5_PRIVATE_API 5.10.1 - _ZTI21QQuickPaletteProvider@Qt_5_PRIVATE_API 5.10.1 _ZTI21QQuickRangeSliderNode@Qt_5_PRIVATE_API 5.6.0~beta _ZTI21QQuickScrollIndicator@Qt_5_PRIVATE_API 5.6.0~beta _ZTI21QQuickToolTipAttached@Qt_5_PRIVATE_API 5.7.1 @@ -2739,15 +1982,14 @@ _ZTI23QQuickScrollBarAttached@Qt_5_PRIVATE_API 5.6.0~beta _ZTI23QQuickStackViewAttached@Qt_5_PRIVATE_API 5.9.0~rc _ZTI23QQuickSwipeViewAttached@Qt_5_PRIVATE_API 5.6.0~beta - _ZTI25QQuickActionGroupAttached@Qt_5_PRIVATE_API 5.10.1 _ZTI25QQuickButtonGroupAttached@Qt_5_PRIVATE_API 5.6.0~beta _ZTI27QQuickAbstractButtonPrivate@Qt_5_PRIVATE_API 5.9.0~rc _ZTI27QQuickSwipeDelegateAttached@Qt_5_PRIVATE_API 5.9.0~rc + _ZTI28QQuickTumblerAttachedPrivate@Qt_5_PRIVATE_API 5.9.5 _ZTI29QQuickDialogButtonBoxAttached@Qt_5_PRIVATE_API 5.9.0~rc - _ZTI29QQuickImplicitSizeItemPrivate@Qt_5 5.12.3 _ZTI29QQuickScrollIndicatorAttached@Qt_5_PRIVATE_API 5.6.0~beta _ZTI31QQuickApplicationWindowAttached@Qt_5_PRIVATE_API 5.6.0~beta - _ZTI38QQuickItemViewTransitionChangeListener@Qt_5 5.12.3 + _ZTI38QQuickItemViewTransitionChangeListener@Qt_5_PRIVATE_API 5.6.0~beta _ZTS10QQuickDial@Qt_5_PRIVATE_API 5.6.0~beta _ZTS10QQuickMenu@Qt_5_PRIVATE_API 5.6.0~beta _ZTS10QQuickPage@Qt_5_PRIVATE_API 5.7.1 @@ -2756,7 +1998,6 @@ _ZTS11QQuickLabel@Qt_5_PRIVATE_API 5.6.0~beta _ZTS11QQuickPopup@Qt_5_PRIVATE_API 5.6.0~beta _ZTS11QQuickSwipe@Qt_5_PRIVATE_API 5.7.1 - _ZTS12QQuickAction@Qt_5_PRIVATE_API 5.10.1 _ZTS12QQuickButton@Qt_5_PRIVATE_API 5.6.0~beta _ZTS12QQuickDialog@Qt_5_PRIVATE_API 5.9.0~rc _ZTS12QQuickDrawer@Qt_5_PRIVATE_API 5.6.0~beta @@ -2764,7 +2005,6 @@ _ZTS12QQuickSwitch@Qt_5_PRIVATE_API 5.6.0~beta _ZTS12QQuickTabBar@Qt_5_PRIVATE_API 5.6.0~beta _ZTS13QQuickControl@Qt_5_PRIVATE_API 5.6.0~beta - _ZTS13QQuickMenuBar@Qt_5_PRIVATE_API 5.10.1 _ZTS13QQuickOverlay@Qt_5_PRIVATE_API 5.7.1 _ZTS13QQuickSpinBox@Qt_5_PRIVATE_API 5.6.0~beta _ZTS13QQuickToolBar@Qt_5_PRIVATE_API 5.6.0~beta @@ -2784,11 +2024,8 @@ _ZTS16QQuickScrollView@Qt_5_PRIVATE_API 5.9.0~rc _ZTS16QQuickSpinButton@Qt_5_PRIVATE_API 5.6.0~beta _ZTS16QQuickToolButton@Qt_5_PRIVATE_API 5.6.0~beta - _ZTS17QQuickActionGroup@Qt_5_PRIVATE_API 5.10.1 _ZTS17QQuickButtonGroup@Qt_5_PRIVATE_API 5.6.0~beta - _ZTS17QQuickContentItem@Qt_5_PRIVATE_API 5.12.2 _ZTS17QQuickDelayButton@Qt_5_PRIVATE_API 5.9.0~rc - _ZTS17QQuickMenuBarItem@Qt_5_PRIVATE_API 5.10.1 _ZTS17QQuickMenuPrivate@Qt_5_PRIVATE_API 5.6.0~beta _ZTS17QQuickPanePrivate@Qt_5_PRIVATE_API 5.6.0~beta _ZTS17QQuickProgressBar@Qt_5_PRIVATE_API 5.6.0~beta @@ -2797,7 +2034,6 @@ _ZTS17QQuickRoundButton@Qt_5_PRIVATE_API 5.9.0~rc _ZTS18QQuickFramePrivate@Qt_5_PRIVATE_API 5.6.0~beta _ZTS18QQuickItemDelegate@Qt_5_PRIVATE_API 5.6.0~beta - _ZTS18QQuickPopupAnchors@Qt_5_PRIVATE_API 5.12.2 _ZTS19QQuickBusyIndicator@Qt_5_PRIVATE_API 5.6.0~beta _ZTS19QQuickCheckDelegate@Qt_5_PRIVATE_API 5.7.1 _ZTS19QQuickMenuSeparator@Qt_5_PRIVATE_API 5.9.0~rc @@ -2807,13 +2043,9 @@ _ZTS19QQuickToolSeparator@Qt_5_PRIVATE_API 5.9.0~rc _ZTS20QQuickAbstractButton@Qt_5_PRIVATE_API 5.6.0~beta _ZTS20QQuickControlPrivate@Qt_5_PRIVATE_API 5.6.0~beta - _ZTS20QQuickMenuBarPrivate@Qt_5_PRIVATE_API 5.10.1 _ZTS20QQuickSwitchDelegate@Qt_5_PRIVATE_API 5.7.1 - _ZTS20QQuickTabBarAttached@Qt_5_PRIVATE_API 5.10.1 _ZTS20QQuickTumblerPrivate@Qt_5_PRIVATE_API 5.9.0~rc _ZTS21QQuickDialogButtonBox@Qt_5_PRIVATE_API 5.9.0~rc - _ZTS21QQuickOverlayAttached@Qt_5_PRIVATE_API 5.10.1 - _ZTS21QQuickPaletteProvider@Qt_5_PRIVATE_API 5.10.1 _ZTS21QQuickRangeSliderNode@Qt_5_PRIVATE_API 5.6.0~beta _ZTS21QQuickScrollIndicator@Qt_5_PRIVATE_API 5.6.0~beta _ZTS21QQuickToolTipAttached@Qt_5_PRIVATE_API 5.7.1 @@ -2824,15 +2056,14 @@ _ZTS23QQuickScrollBarAttached@Qt_5_PRIVATE_API 5.6.0~beta _ZTS23QQuickStackViewAttached@Qt_5_PRIVATE_API 5.9.0~rc _ZTS23QQuickSwipeViewAttached@Qt_5_PRIVATE_API 5.6.0~beta - _ZTS25QQuickActionGroupAttached@Qt_5_PRIVATE_API 5.10.1 _ZTS25QQuickButtonGroupAttached@Qt_5_PRIVATE_API 5.6.0~beta _ZTS27QQuickAbstractButtonPrivate@Qt_5_PRIVATE_API 5.9.0~rc _ZTS27QQuickSwipeDelegateAttached@Qt_5_PRIVATE_API 5.9.0~rc + _ZTS28QQuickTumblerAttachedPrivate@Qt_5_PRIVATE_API 5.9.5 _ZTS29QQuickDialogButtonBoxAttached@Qt_5_PRIVATE_API 5.9.0~rc - _ZTS29QQuickImplicitSizeItemPrivate@Qt_5 5.12.3 _ZTS29QQuickScrollIndicatorAttached@Qt_5_PRIVATE_API 5.6.0~beta _ZTS31QQuickApplicationWindowAttached@Qt_5_PRIVATE_API 5.6.0~beta - _ZTS38QQuickItemViewTransitionChangeListener@Qt_5 5.12.3 + _ZTS38QQuickItemViewTransitionChangeListener@Qt_5_PRIVATE_API 5.6.0~beta _ZTV10QQuickDial@Qt_5_PRIVATE_API 5.6.0~beta _ZTV10QQuickMenu@Qt_5_PRIVATE_API 5.6.0~beta _ZTV10QQuickPage@Qt_5_PRIVATE_API 5.7.1 @@ -2841,7 +2072,6 @@ _ZTV11QQuickLabel@Qt_5_PRIVATE_API 5.6.0~beta _ZTV11QQuickPopup@Qt_5_PRIVATE_API 5.6.0~beta _ZTV11QQuickSwipe@Qt_5_PRIVATE_API 5.7.1 - _ZTV12QQuickAction@Qt_5_PRIVATE_API 5.10.1 _ZTV12QQuickButton@Qt_5_PRIVATE_API 5.6.0~beta _ZTV12QQuickDialog@Qt_5_PRIVATE_API 5.9.0~rc _ZTV12QQuickDrawer@Qt_5_PRIVATE_API 5.6.0~beta @@ -2849,7 +2079,6 @@ _ZTV12QQuickSwitch@Qt_5_PRIVATE_API 5.6.0~beta _ZTV12QQuickTabBar@Qt_5_PRIVATE_API 5.6.0~beta _ZTV13QQuickControl@Qt_5_PRIVATE_API 5.6.0~beta - _ZTV13QQuickMenuBar@Qt_5_PRIVATE_API 5.10.1 _ZTV13QQuickOverlay@Qt_5_PRIVATE_API 5.7.1 _ZTV13QQuickSpinBox@Qt_5_PRIVATE_API 5.6.0~beta _ZTV13QQuickToolBar@Qt_5_PRIVATE_API 5.6.0~beta @@ -2869,11 +2098,8 @@ _ZTV16QQuickScrollView@Qt_5_PRIVATE_API 5.9.0~rc _ZTV16QQuickSpinButton@Qt_5_PRIVATE_API 5.6.0~beta _ZTV16QQuickToolButton@Qt_5_PRIVATE_API 5.6.0~beta - _ZTV17QQuickActionGroup@Qt_5_PRIVATE_API 5.10.1 _ZTV17QQuickButtonGroup@Qt_5_PRIVATE_API 5.6.0~beta - _ZTV17QQuickContentItem@Qt_5_PRIVATE_API 5.12.2 _ZTV17QQuickDelayButton@Qt_5_PRIVATE_API 5.9.0~rc - _ZTV17QQuickMenuBarItem@Qt_5_PRIVATE_API 5.10.1 _ZTV17QQuickMenuPrivate@Qt_5_PRIVATE_API 5.6.0~beta _ZTV17QQuickPanePrivate@Qt_5_PRIVATE_API 5.6.0~beta _ZTV17QQuickProgressBar@Qt_5_PRIVATE_API 5.6.0~beta @@ -2882,7 +2108,6 @@ _ZTV17QQuickRoundButton@Qt_5_PRIVATE_API 5.9.0~rc _ZTV18QQuickFramePrivate@Qt_5_PRIVATE_API 5.6.0~beta _ZTV18QQuickItemDelegate@Qt_5_PRIVATE_API 5.6.0~beta - _ZTV18QQuickPopupAnchors@Qt_5_PRIVATE_API 5.12.2 _ZTV19QQuickBusyIndicator@Qt_5_PRIVATE_API 5.6.0~beta _ZTV19QQuickCheckDelegate@Qt_5_PRIVATE_API 5.7.1 _ZTV19QQuickMenuSeparator@Qt_5_PRIVATE_API 5.9.0~rc @@ -2892,13 +2117,9 @@ _ZTV19QQuickToolSeparator@Qt_5_PRIVATE_API 5.9.0~rc _ZTV20QQuickAbstractButton@Qt_5_PRIVATE_API 5.6.0~beta _ZTV20QQuickControlPrivate@Qt_5_PRIVATE_API 5.6.0~beta - _ZTV20QQuickMenuBarPrivate@Qt_5_PRIVATE_API 5.10.1 _ZTV20QQuickSwitchDelegate@Qt_5_PRIVATE_API 5.7.1 - _ZTV20QQuickTabBarAttached@Qt_5_PRIVATE_API 5.10.1 _ZTV20QQuickTumblerPrivate@Qt_5_PRIVATE_API 5.9.0~rc _ZTV21QQuickDialogButtonBox@Qt_5_PRIVATE_API 5.9.0~rc - _ZTV21QQuickOverlayAttached@Qt_5_PRIVATE_API 5.10.1 - _ZTV21QQuickPaletteProvider@Qt_5_PRIVATE_API 5.10.1 _ZTV21QQuickRangeSliderNode@Qt_5_PRIVATE_API 5.6.0~beta _ZTV21QQuickScrollIndicator@Qt_5_PRIVATE_API 5.6.0~beta _ZTV21QQuickToolTipAttached@Qt_5_PRIVATE_API 5.7.1 @@ -2909,27 +2130,21 @@ _ZTV23QQuickScrollBarAttached@Qt_5_PRIVATE_API 5.6.0~beta _ZTV23QQuickStackViewAttached@Qt_5_PRIVATE_API 5.9.0~rc _ZTV23QQuickSwipeViewAttached@Qt_5_PRIVATE_API 5.6.0~beta - _ZTV25QQuickActionGroupAttached@Qt_5_PRIVATE_API 5.10.1 _ZTV25QQuickButtonGroupAttached@Qt_5_PRIVATE_API 5.6.0~beta _ZTV27QQuickAbstractButtonPrivate@Qt_5_PRIVATE_API 5.9.0~rc _ZTV27QQuickSwipeDelegateAttached@Qt_5_PRIVATE_API 5.9.0~rc + _ZTV28QQuickTumblerAttachedPrivate@Qt_5_PRIVATE_API 5.9.5 _ZTV29QQuickDialogButtonBoxAttached@Qt_5_PRIVATE_API 5.9.0~rc - _ZTV29QQuickImplicitSizeItemPrivate@Qt_5 5.12.3 _ZTV29QQuickScrollIndicatorAttached@Qt_5_PRIVATE_API 5.6.0~beta _ZTV31QQuickApplicationWindowAttached@Qt_5_PRIVATE_API 5.6.0~beta - (c++)"non-virtual thunk to QQuickAbstractButton::componentComplete()@Qt_5_PRIVATE_API" 5.10.1 + (c++)"non-virtual thunk to QQuickAbstractButton::componentComplete()@Qt_5_PRIVATE_API" 5.9.5 (c++)"non-virtual thunk to QQuickAbstractButton::~QQuickAbstractButton()@Qt_5_PRIVATE_API" 5.6.0~beta - (c++)"non-virtual thunk to QQuickAbstractButtonPrivate::itemImplicitHeightChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.12.2 - (c++)"non-virtual thunk to QQuickAbstractButtonPrivate::itemImplicitWidthChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.12.2 (c++)"non-virtual thunk to QQuickApplicationWindow::classBegin()@Qt_5_PRIVATE_API" 5.7.1 (c++)"non-virtual thunk to QQuickApplicationWindow::componentComplete()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickApplicationWindow::~QQuickApplicationWindow()@Qt_5_PRIVATE_API" 5.6.0~beta - (c++)"non-virtual thunk to QQuickButtonGroup::classBegin()@Qt_5_PRIVATE_API" 5.11.1 - (c++)"non-virtual thunk to QQuickButtonGroup::componentComplete()@Qt_5_PRIVATE_API" 5.11.1 - (c++)"non-virtual thunk to QQuickButtonGroup::~QQuickButtonGroup()@Qt_5_PRIVATE_API" 5.11.1 (c++)"non-virtual thunk to QQuickComboBox::componentComplete()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickComboBox::~QQuickComboBox()@Qt_5_PRIVATE_API" 5.7.1 - (c++)"non-virtual thunk to QQuickContainer::componentComplete()@Qt_5_PRIVATE_API" 5.10.1 + (c++)"non-virtual thunk to QQuickContainer::componentComplete()@Qt_5_PRIVATE_API" 5.9.3 (c++)"non-virtual thunk to QQuickContainer::~QQuickContainer()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickContainerPrivate::itemChildAdded(QQuickItem*, QQuickItem*)@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickContainerPrivate::itemDestroyed(QQuickItem*)@Qt_5_PRIVATE_API" 5.6.0~beta @@ -2937,25 +2152,15 @@ (c++)"non-virtual thunk to QQuickContainerPrivate::itemSiblingOrderChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickControl::classBegin()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickControl::componentComplete()@Qt_5_PRIVATE_API" 5.6.0~beta - (c++)"non-virtual thunk to QQuickControl::~QQuickControl()@Qt_5_PRIVATE_API" 5.12.2 (c++)"non-virtual thunk to QQuickControlPrivate::accessibilityActiveChanged(bool)@Qt_5_PRIVATE_API" 5.6.0~beta - (c++)"non-virtual thunk to QQuickControlPrivate::itemDestroyed(QQuickItem*)@Qt_5_PRIVATE_API" 5.12.2 - (c++)"non-virtual thunk to QQuickControlPrivate::itemGeometryChanged(QQuickItem*, QQuickGeometryChange, QRectF const&)@Qt_5_PRIVATE_API" 5.12.2 - (c++)"non-virtual thunk to QQuickControlPrivate::itemImplicitHeightChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.12.2 - (c++)"non-virtual thunk to QQuickControlPrivate::itemImplicitWidthChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.12.2 (c++)"non-virtual thunk to QQuickControlPrivate::~QQuickControlPrivate()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickDial::componentComplete()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickDialogButtonBox::componentComplete()@Qt_5_PRIVATE_API" 5.9.0~rc (c++)"non-virtual thunk to QQuickDialogButtonBox::~QQuickDialogButtonBox()@Qt_5_PRIVATE_API" 5.9.0~rc - (c++)"non-virtual thunk to QQuickGroupBox::componentComplete()@Qt_5_PRIVATE_API" 5.10.1 - (c++)"non-virtual thunk to QQuickGroupBox::~QQuickGroupBox()@Qt_5_PRIVATE_API" 5.12.2 + (c++)"non-virtual thunk to QQuickGroupBox::componentComplete()@Qt_5_PRIVATE_API" 5.9.5 (c++)"non-virtual thunk to QQuickLabel::classBegin()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickLabel::componentComplete()@Qt_5_PRIVATE_API" 5.7.1 - (c++)"non-virtual thunk to QQuickLabel::~QQuickLabel()@Qt_5_PRIVATE_API" 5.12.2 (c++)"non-virtual thunk to QQuickMenu::componentComplete()@Qt_5_PRIVATE_API" 5.7.1 - (c++)"non-virtual thunk to QQuickMenuBarPrivate::itemImplicitHeightChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.12.2 - (c++)"non-virtual thunk to QQuickMenuBarPrivate::itemImplicitWidthChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.12.2 - (c++)"non-virtual thunk to QQuickMenuItem::componentComplete()@Qt_5_PRIVATE_API" 5.10.1 (c++)"non-virtual thunk to QQuickMenuPrivate::itemChildAdded(QQuickItem*, QQuickItem*)@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickMenuPrivate::itemDestroyed(QQuickItem*)@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickMenuPrivate::itemGeometryChanged(QQuickItem*, QQuickGeometryChange, QRectF const&)@Qt_5_PRIVATE_API" 5.9.0~rc @@ -2963,36 +2168,26 @@ (c++)"non-virtual thunk to QQuickMenuPrivate::itemSiblingOrderChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickOverlay::~QQuickOverlay()@Qt_5_PRIVATE_API" 5.7.1 (c++)"non-virtual thunk to QQuickPage::componentComplete()@Qt_5_PRIVATE_API" 5.9.1 - (c++)"non-virtual thunk to QQuickPage::~QQuickPage()@Qt_5_PRIVATE_API" 5.12.2 - (c++)"non-virtual thunk to QQuickPane::componentComplete()@Qt_5_PRIVATE_API" 5.12.2 - (c++)"non-virtual thunk to QQuickPane::~QQuickPane()@Qt_5_PRIVATE_API" 5.12.2 - (c++)"non-virtual thunk to QQuickPanePrivate::itemImplicitHeightChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.12.2 - (c++)"non-virtual thunk to QQuickPanePrivate::itemImplicitWidthChanged(QQuickItem*)@Qt_5_PRIVATE_API" 5.12.2 (c++)"non-virtual thunk to QQuickPopup::classBegin()@Qt_5_PRIVATE_API" 5.7.1 (c++)"non-virtual thunk to QQuickPopup::componentComplete()@Qt_5_PRIVATE_API" 5.7.1 (c++)"non-virtual thunk to QQuickPopup::~QQuickPopup()@Qt_5_PRIVATE_API" 5.7.1 (c++)"non-virtual thunk to QQuickProgressBar::componentComplete()@Qt_5_PRIVATE_API" 5.6.0~beta - (c++)"non-virtual thunk to QQuickRangeSlider::classBegin()@Qt_5_PRIVATE_API" 5.10.1 + (c++)"non-virtual thunk to QQuickRangeSlider::classBegin()@Qt_5_PRIVATE_API" 5.9.5 (c++)"non-virtual thunk to QQuickRangeSlider::componentComplete()@Qt_5_PRIVATE_API" 5.6.0~beta - (c++)"non-virtual thunk to QQuickRangeSlider::~QQuickRangeSlider()@Qt_5_PRIVATE_API" 5.12.2 (c++)"non-virtual thunk to QQuickScrollView::componentComplete()@Qt_5_PRIVATE_API" 5.9.0~rc (c++)"non-virtual thunk to QQuickSlider::componentComplete()@Qt_5_PRIVATE_API" 5.6.0~beta - (c++)"non-virtual thunk to QQuickSlider::~QQuickSlider()@Qt_5_PRIVATE_API" 5.12.2 - (c++)"non-virtual thunk to QQuickSpinBox::classBegin()@Qt_5_PRIVATE_API" 5.10.1 + (c++)"non-virtual thunk to QQuickSpinBox::classBegin()@Qt_5_PRIVATE_API" 5.9.5 (c++)"non-virtual thunk to QQuickSpinBox::componentComplete()@Qt_5_PRIVATE_API" 5.6.0~beta - (c++)"non-virtual thunk to QQuickSpinBox::~QQuickSpinBox()@Qt_5_PRIVATE_API" 5.12.2 (c++)"non-virtual thunk to QQuickStackView::componentComplete()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickStackView::~QQuickStackView()@Qt_5_PRIVATE_API" 5.6.0~beta - (c++)"non-virtual thunk to QQuickSwipeDelegate::componentComplete()@Qt_5_PRIVATE_API" 5.12.2 (c++)"non-virtual thunk to QQuickTabBar::componentComplete()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickTextArea::classBegin()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickTextArea::componentComplete()@Qt_5_PRIVATE_API" 5.7.1 (c++)"non-virtual thunk to QQuickTextArea::~QQuickTextArea()@Qt_5_PRIVATE_API" 5.9.2 (c++)"non-virtual thunk to QQuickTextField::classBegin()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickTextField::componentComplete()@Qt_5_PRIVATE_API" 5.7.1 - (c++)"non-virtual thunk to QQuickTextField::~QQuickTextField()@Qt_5_PRIVATE_API" 5.12.2 (c++)"non-virtual thunk to QQuickTumbler::componentComplete()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickTumbler::~QQuickTumbler()@Qt_5_PRIVATE_API" 5.6.0~beta (c++)"non-virtual thunk to QQuickTumblerPrivate::itemChildAdded(QQuickItem*, QQuickItem*)@Qt_5_PRIVATE_API" 5.9.0~rc (c++)"non-virtual thunk to QQuickTumblerPrivate::itemChildRemoved(QQuickItem*, QQuickItem*)@Qt_5_PRIVATE_API" 5.9.0~rc - (c++)"non-virtual thunk to QQuickTumblerPrivate::itemGeometryChanged(QQuickItem*, QQuickGeometryChange, QRectF const&)@Qt_5_PRIVATE_API" 5.10.1 + (c++)"non-virtual thunk to QQuickTumblerPrivate::~QQuickTumblerPrivate()@Qt_5_PRIVATE_API" 5.9.0~rc diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/not-installed qtquickcontrols2-opensource-src-5.9.5/debian/not-installed --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/not-installed 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -usr/include/*/qt5/QtQuickControls2/5.* -usr/include/*/qt5/QtQuickTemplates2/5.* -usr/lib/*/libQt5QuickControls2.la -usr/lib/*/libQt5QuickTemplates2.la -usr/lib/*/qt5/mkspecs/modules/qt_lib_quickcontrols2_private.pri -usr/lib/*/qt5/mkspecs/modules/qt_lib_quicktemplates2_private.pri diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/patches/disable_fontless_examples_build.patch qtquickcontrols2-opensource-src-5.9.5/debian/patches/disable_fontless_examples_build.patch --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/patches/disable_fontless_examples_build.patch 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/patches/disable_fontless_examples_build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -Description: disable examples using fontello fonts. - There are two examples using the embedded fontello font. As the fonts is not - in it's preferred form of modification we needed to remove them. Also the - fonts are not letters, so they can not be replaced with another one. - . - So we disable the build of this to examples. -Author: Lisandro Damián Nicanor Pérez Meyer -Bug-Debian: https://bugs.debian.org/900855 -Forwarded: not-needed - ---- - examples/quickcontrols2/quickcontrols2.pro | 2 -- - 1 file changed, 2 deletions(-) - ---- a/examples/quickcontrols2/quickcontrols2.pro -+++ b/examples/quickcontrols2/quickcontrols2.pro -@@ -2,10 +2,8 @@ TEMPLATE = subdirs - SUBDIRS += \ - gallery \ - chattutorial \ -- texteditor \ - contactlist \ - sidepanel \ -- swipetoremove \ - wearable \ - imagine/automotive \ - imagine/musicplayer diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/patches/series qtquickcontrols2-opensource-src-5.9.5/debian/patches/series --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/patches/series 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -disable_fontless_examples_build.patch diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-dev.install qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-dev.install --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-dev.install 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-dev.install 2018-04-14 20:00:09.000000000 +0000 @@ -13,13 +13,9 @@ usr/include/*/qt5/QtQuickTemplates2/qtquicktemplates2version.h usr/lib/*/cmake/Qt5QuickControls2/Qt5QuickControls2Config.cmake usr/lib/*/cmake/Qt5QuickControls2/Qt5QuickControls2ConfigVersion.cmake -usr/lib/*/cmake/Qt5QuickTemplates2/Qt5QuickTemplates2Config.cmake -usr/lib/*/cmake/Qt5QuickTemplates2/Qt5QuickTemplates2ConfigVersion.cmake usr/lib/*/libQt5QuickControls2.prl usr/lib/*/libQt5QuickControls2.so usr/lib/*/libQt5QuickTemplates2.prl usr/lib/*/libQt5QuickTemplates2.so usr/lib/*/pkgconfig/Qt5QuickControls2.pc -usr/lib/*/pkgconfig/Qt5QuickTemplates2.pc usr/lib/*/qt5/mkspecs/modules/qt_lib_quickcontrols2.pri -usr/lib/*/qt5/mkspecs/modules/qt_lib_quicktemplates2.pri diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc-html.doc-base.qtlabscalendar qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc-html.doc-base.qtlabscalendar --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc-html.doc-base.qtlabscalendar 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc-html.doc-base.qtlabscalendar 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -Document: qt5-labscalendar -Title: Qt 5 Labs Calendar module -Author: The Qt Company Ltd -Abstract: This is the HTML documentation for Qt 5 Labs Calendar -Section: Programming/C++ - -Format: HTML -Index: /usr/share/doc/qtquickcontrols2-5-doc-html/html/qtlabscalendar/qtlabscalendar-index.html -Files: /usr/share/doc/qtquickcontrols2-5-doc-html/html/qtlabscalendar/*.html diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc-html.doc-base.qtlabsplatform qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc-html.doc-base.qtlabsplatform --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc-html.doc-base.qtlabsplatform 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc-html.doc-base.qtlabsplatform 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -Document: qt5-labsplatform -Title: Qt 5 Labs Platform module -Author: The Qt Company Ltd -Abstract: This is the HTML documentation for Qt 5 Labs Platform -Section: Programming/C++ - -Format: HTML -Index: /usr/share/doc/qtquickcontrols2-5-doc-html/html/qtlabsplatform/qtlabsplatform-index.html -Files: /usr/share/doc/qtquickcontrols2-5-doc-html/html/qtlabsplatform/*.html diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc-html.doc-base.qtquickcontrols qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc-html.doc-base.qtquickcontrols --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc-html.doc-base.qtquickcontrols 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc-html.doc-base.qtquickcontrols 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -Document: qt5-quickcontrols -Title: Qt 5 Quick Controls module -Author: The Qt Company Ltd -Abstract: This is the HTML documentation for Qt 5 Quick Controls and Quick Templates 2 -Section: Programming/C++ - -Format: HTML -Index: /usr/share/doc/qtquickcontrols2-5-doc-html/html/qtquickcontrols/qtquickcontrols-index.html -Files: /usr/share/doc/qtquickcontrols2-5-doc-html/html/qtquickcontrols/*.html diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc-html.install qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc-html.install --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc-html.install 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc-html.install 2018-04-14 20:00:09.000000000 +0000 @@ -1,3 +1,3 @@ usr/share/qt5/doc/qtlabscalendar/ usr/share/qt5/doc/qtlabsplatform/ -usr/share/qt5/doc/qtquickcontrols/ +usr/share/qt5/doc/qtquickcontrols2/ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc-html.links qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc-html.links --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc-html.links 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc-html.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/qt5/doc usr/share/doc/qtquickcontrols2-5-doc-html/html diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc.install qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc.install --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/qtquickcontrols2-5-doc.install 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/qtquickcontrols2-5-doc.install 2018-04-14 20:00:09.000000000 +0000 @@ -1,3 +1,3 @@ usr/share/qt5/doc/qtlabscalendar.qch usr/share/qt5/doc/qtlabsplatform.qch -usr/share/qt5/doc/qtquickcontrols.qch +usr/share/qt5/doc/qtquickcontrols2.qch diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/rules qtquickcontrols2-opensource-src-5.9.5/debian/rules --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/rules 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/rules 2018-04-14 20:00:09.000000000 +0000 @@ -4,13 +4,12 @@ #export DH_VERBOSE=1 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -export QT_SELECT = qt5 %: dh $@ --with pkgkde_symbolshelper,qmlcdeps override_dh_auto_configure: - dh_auto_configure -- QT_BUILD_PARTS+=tests + qmake -qt5 QT_BUILD_PARTS+=tests override_dh_auto_build-indep: dh_auto_build -- docs @@ -18,17 +17,27 @@ override_dh_auto_install-indep: dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs +override_dh_auto_install-arch: + dh_auto_install + + # Remove private headers and the .pri files + rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtQuickControls2/5.* + rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtQuickTemplates2/5.* + rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/*_private.pri + + # Remove .la files + rm -fv debian/tmp/usr/lib/*/libQt5QuickControls2.la + rm -fv debian/tmp/usr/lib/*/libQt5QuickTemplates2.la + override_dh_missing: dh_missing --fail-missing override_dh_auto_test-arch: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) $(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root # The tests are not fatal because of https://bugreports.qt.io/browse/QTBUG-57100 -xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \ dh_auto_test --no-parallel -- -Ctests/auto -k \ LD_LIBRARY_PATH=$(CURDIR)/lib \ QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml -endif override_dh_auto_test-indep: diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/watch qtquickcontrols2-opensource-src-5.9.5/debian/watch --- qtquickcontrols2-opensource-src-5.12.5+dfsg/debian/watch 2019-10-20 20:49:39.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/debian/watch 2018-04-14 20:00:09.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -opts=uversionmangle=s/-/~/,dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \ -https://download.qt.io/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qtquickcontrols2-everywhere-src-(.*)\.tar\.xz +opts=uversionmangle=s/-/~/ \ +https://download.qt.io/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qtquickcontrols2-opensource-src-(.*)\.tar\.xz diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.10.0 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.10.0 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.10.0 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.10.0 1970-01-01 00:00:00.000000000 +0000 @@ -1,166 +0,0 @@ -Qt 5.10 introduces many new features and improvements as well as bugfixes -over the 5.9.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.10 series is binary compatible with the 5.10.x series. -Applications compiled for 5.9 will continue to run with 5.10. - -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 * -**************************************************************************** - - - [QTBUG-58060] DialogButtonBox with Material style now uses the Android - button layout. - -**************************************************************************** -* Controls * -**************************************************************************** - - - AbstractButton: - * [QTBUG-49820] Added support for icons. The following properties are - now available for derived types to use: icon.name, icon.source, - icon.width, icon.height, icon.color. - * [QTBUG-49820] Added display property to allow control over how icons - and text are displayed within buttons, without having to implement - custom delegates. - * [QTBUG-50705] Added AbstractButton::action property. - - - Action: - * [QTBUG-50705] Introduced Action, an abstract user interface action - that can have shortcuts and be assigned to buttons. - - - ActionGroup: - * [QTBUG-50705] Introduced ActionGroup, a non-visual group of actions - that is mutually exclusive by default. - - - ApplicationWindow: - * [QTBUG-61336] The attached activeFocusControl property has been made - functional with a plain QML Window to make the functionality available - when using QQuickWindow/View/Widget instead of ApplicationWindow. - * [QTBUG-61336] Deprecated the overlay grouped property in favor of the - newly introduced Overlay attached properties. - - - ButtonGroup: - * Added exclusive property to allow creating non-exclusive button - groups. - - - Container: - * Deprecated removeItem(int) in favor of removeItem(Item) and - takeItem(int) with clearer semantics. The former destroys the item, - whereas the latter transfers ownership to the caller. - - - Dialog: - * Added "result" property that holds whether the dialog was previously - accepted or rejected. - * Added a standardButton() method for accessing the standard buttons in - the dialog's button box. - * [QTBUG-59423] Added missing applied(), discarded(), helpRequested(), - and reset() signals that are emitted when the respective standard - buttons are clicked. - - - DialogButtonBox: - * [QTBUG-59423] Added missing applied(), reset(), and discarded() - signals. - - - Menu: - * [QTBUG-50471] Added a popup() method that opens a menu at the mouse - cursor on desktop platforms that have a mouse cursor available, and - otherwise centers the menu over its parent item. - * Added support for declaring Actions. The new "delegate" property is - used to define a Component that is used to create menu items that - present the actions. - * Deprecated removeItem(int) in favor of removeItem(Item) and - takeItem(int) with clearer semantics. The former destroys the item, - whereas the latter transfers ownership to the caller. - * [QTBUG-60351] Added support for cascading sub-menus. - * Added addMenu(), insertMenu(), removeMenu(), and takeMenu() methods - for adding and removing sub-menus programmatically. - * Added addAction(), insertAction(), removeAction(), and takeAction() - methods for adding and removing actions programmatically. - * Added currentIndex property for styling purposes. - * Added actionAt() and menuAt() accessors. - * Added a dismiss() method. Unlike close() that only closes a menu and - its sub-menus, dismiss() closes the whole hierarchy of menus, - including the parent menus. - * Added "count" property. - - - MenuBar: - * [QTBUG-60350] Introduced a MenuBar control. - - - MenuItem: - * Added a "menu" property that provides access to the menu that contains - the menu item. - * Menu has been fixed to highlight its items while key navigating and - mouse hovering to ensure seamless item highlight between mouse hover - and key navigation. In order to provide appropriate highlighting that - works for key navigation and mouse hover, styles should bind their - visual highlight to MenuItem::highlighted instead of - Control::activeFocus or Control::hovered. - - - Overlay: - * [QTBUG-61336] Introduced Overlay attached properties and signals that - supersede the overlay grouped property in Application Window. The - Overlay attached type allows providing background dimming for popups - without requiring an ApplicationWindow instance. - - - Popup: - * Added an "opened" boolean property that holds whether a popup is fully - open. That is, the popup is visible and neither the enter nor exit - transitions are running. - * Added "enabled" property. - * Added a read-only "mirrored" property that is true when the popup's - locale is right-to-left. - - - RangeSlider: - * Added horizontal and vertical properties to make it more convenient to - create orientation-dependent bindings in styles. - - - ScrollBar: - * Added horizontal and vertical properties to make it more convenient to - create orientation-dependent bindings in styles. - - - ScrollIndicator: - * Added horizontal and vertical properties to make it more convenient to - create orientation-dependent bindings in styles. - - - Slider: - * Added horizontal and vertical properties to make it more convenient to - create orientation-dependent bindings in styles. - - - SpinBox: - * [QTBUG-58760] Added wrap-property to allow wrapping circular - spinboxes. - - - StackView: - * Allowed specifying a transition when clearing the stack view. - - - SwipeView: - * Added horizontal and vertical properties to make it more convenient to - create orientation-dependent bindings in styles. - - - TabBar: - * Added index/tabBar/position attached properties. - -**************************************************************************** -* Styles * -**************************************************************************** - - - Introduced a Fusion style that offers a platform agnostic - desktop-oriented look'n'feel. - - Added the Imagine style, which is based on image assets that can be - provided using a predefined naming convention. - - Added support for specifying the default font for different styles in - qtquickcontrols2.conf. - - Fixed the style selection mechanism so that now it is possible to - organize platform and locale-specific files into sub-directories, such - as "+linux", "+macos", and "+windows". diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.10.1 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.10.1 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.10.1 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.10.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -Qt 5.10.1 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.10.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.10 series is binary compatible with the 5.9.x series. -Applications compiled for 5.9 will continue to run with 5.10. - -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. - -This release contains all fixes included in the Qt 5.9.4 release. - -**************************************************************************** -* Qt 5.10.1 Changes * -**************************************************************************** - -Controls --------- - - - AbstractButton: - * [QTBUG-65193] Made button's text win over action's when both are - specified. - - - Action: - * [QTBUG-65108] Fixed an issue where a checkable action would toggle - twice when toggling an associated checkable button. - * [QTBUG-65889] Fixed shortcuts in Repeater. - -Styles ------- - - - Imagine: - * [QTBUG-65500] Fixed to respect user font settings from - qtquickcontrols2.conf. - -Third-Party Code ----------------- - - - [QTBUG-65409] Document constants from AngularJS in - src/imports/controls/material/ElevationEffect.qml diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.11.0 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.11.0 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.11.0 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.11.0 1970-01-01 00:00:00.000000000 +0000 @@ -1,161 +0,0 @@ -Qt 5.11 introduces many new features and improvements as well as bugfixes -over the 5.10.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.11 series is binary compatible with the 5.10.x series. -Applications compiled for 5.10 will continue to run with 5.11. - -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. - -**************************************************************************** -* Qt 5.11.0 Changes * -**************************************************************************** - -Important Behavior Changes --------------------------- - - - [QTBUG-56295] CheckBox and CheckDelegate no longer force the tristate - property to true when setting checkState to Qt.PartiallyChecked. This - allows the controls to present a partially checked state without being - interactively tri-state. - - [QTBUG-56295] CheckBox and CheckDelegate no longer consider the partially - checked state as a checked state. This fixes check state cycling for non- - tri-state controls so that the check state goes from partially checked to - fully checked state. - -Controls --------- - - - AbstractButton: - * The autoRepeat property was promoted from Button to AbstractButton. - * Added autoRepeatDelay and autoRepeatInterval properties. - * [QTBUG-62811] Added pressX and pressY properties. - * [QTBUG-66625] Fixed the icon property group type registration. - - - Action: - * [QTBUG-65193] Made AbstractButton's icon properties win over Action's - when both are set. - * [QTBUG-66625] Fixed the icon property group type registration. - - - ButtonGroup: - * [QTBUG-56295][QTBUG-63782] Added checkState property that indicates - the combined check state of the entire group. - - - CheckBox: - * [QTBUG-63238] Made it possible to implement nextCheckState() in QML. - - - CheckDelegate: - * [QTBUG-63238] Made it possible to implement nextCheckState() in QML. - - - ComboBox: - * [QTBUG-61348] Fixed key search in the popup. - * [QTBUG-66044] Fixed wheel event propagation. - - - Control: - * [QTBUG-66133] Fixed focus scope controls, such as Frame, GroupBox, - Page, and Pane, to respect click focus policy by clearing a potential - sub-focus child. This makes it possible to close the virtual keyboard - by clicking the background of a Pane that has Qt.ClickFocus set as its - focusPolicy, for example. - * [QTBUG-66133] Fixed focus scope controls to respect wheel focus - policy. - - - Dial: - * [QTBUG-66637] Fixed to keep mouse grab on mouse press. - - - DialogButtonBox: - * [QTBUG-59719] Fixed implicit size calculation with one button. - - - Drawer: - * [QTBUG-66637] Fixed to no steal mouse/touch grab when e.g. dragging a - horizontal Slider in a horizontal Drawer. - - - Label: - * [QTBUG-65880] Fixed a background size regression caused by deferred - execution. - - - Popup: - * [QTBUG-66113] Fixed restoring focus for popups that did not originally - request focus, but gained focus after opening. - * Fixed Shortcuts in Popups with window context not being activated. - - - RangeSlider: - * [QTBUG-66637] Fixed to keep mouse grab on mouse press. - - - ScrollBar: - * [QTBUG-56557] Added minimumSize, visualSize, and visualPosition - properties. - - - ScrollIndicator: - * [QTBUG-56557] Added minimumSize, visualSize, and visualPosition - properties. - - - Slider: - * [QTBUG-66637] Fixed to keep mouse grab on mouse press. - - - SpinBox: - * Added a displayText property that allows styles to create a simple - and efficient QML binding to display the textual value instead of - calling the textFromValue() JS-function. - * [QTBUG-66044] Fixed wheel event propagation. - - - StackView: - * [QTBUG-51321] Fixed to transfer focus to the current item. - * [QTBUG-67118] Fixed a crash with initialItem. - - - TextArea: - * [QTBUG-67334] Fixed the background to not scroll when TextArea is - placed in a ScrollView. - * [QTBUG-65880] Fixed a background size regression caused by deferred - execution. - - - TextField: - * [QTBUG-65880] Fixed a background size regression caused by deferred - execution. - -Styles ------- - - - [QTBUG-66430] Fixed to not override/reset platform default fonts and - palettes if :/qtquickcontrols2.conf exists but doesn't define fonts - or palettes. - - - Fusion: - * [QTBUG-66752] Fixed BusyIndicator to show up when running is set to - true after creation. - * [QTBUG-66276] Added missing plugins.qmltypes. - - - Material: - * Decreased Dial's handle size from 14 to 10. - * [QTBUG-64872] Made BusyIndicator's line size adapt to the size of the - control. - * [QTBUG-58646] Fixed artifacts in ripple effects. - * [QTBUG-67442] Fixed CheckBox's, CheckDelegate's, RadioButton's and - RadioDelegate's indicator in disabled state. - - - Universal: - * Decreased Dial's handle size from 20 to 14. - -Platform --------- - - - ColorDialog: - * [QT3DS-1363] Fixed currentColor to get correctly updated when opening - the dialog first time. - - - Menu: - * [QTBUG-55251] Fixed positioning on high-DPI screens. - * [QTBUG-66876] Fixed menu titles not being visible if they were defined - using qsTr() or bindings. - * [QTBUG-66889] Fixed a crash on exist with sub-menus on Windows. - - - MenuItem: - * [QTBUG-66386] Fixed checked state handling. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.11.1 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.11.1 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.11.1 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.11.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Qt 5.11.1 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.11.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.11 series is binary compatible with the 5.10.x series. -Applications compiled for 5.10 will continue to run with 5.11. - -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. - -**************************************************************************** -* Qt 5.11.1 Changes * -**************************************************************************** - - - [QTBUG-67684] ComboBox: don't block the escape/back key - - [QTBUG-67684] ComboBox: reset when hidden diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.11.2 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.11.2 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.11.2 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.11.2 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Qt 5.11.2 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.11.0 through 5.11.1. - -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.11 series is binary compatible with the 5.10.x series. -Applications compiled for 5.10 will continue to run with 5.11. - -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. - -**************************************************************************** -* Qt 5.11.2 Changes * -**************************************************************************** - - - [QTBUG-69897] StackView: fixed a crash in viewItemTransitionFinished() - - [QTBUG-69839] ColorDialog: fixed a crash when initializing the platform dialog helper - - [QTBUG-69506] IconImage: prevented the color from being applied twice - - [QTBUG-66483] Popup: fixed a crash on exit when using a shader - - [QTBUG-68219] Styles: fixed handling of QRC paths in QT_QUICK_CONTROLS_STYLE_PATH - - [QTBUG-68858] Menu: fixed items not being scrollable when using Window - - [QTBUG-68737] Tumbler: fixed to respect currentIndex changes in onModelChanged - - [QTBUG-68769] TextArea, TextField: fixed to use the control's renderType in placeholder text - - SpinBox: fixed "function expressions as statements" warnings diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.11.3 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.11.3 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.11.3 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.11.3 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Qt 5.11.3 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.11.0 through 5.11.2. - -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.11 series is binary compatible with the 5.10.x series. -Applications compiled for 5.10 will continue to run with 5.11. - -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. - - - This release contains only minor code improvements. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.0 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.0 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.0 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.0 1970-01-01 00:00:00.000000000 +0000 @@ -1,171 +0,0 @@ -Qt 5.12 introduces many new features and improvements as well as bugfixes -over the 5.11.x series. For more details, refer to the online documentation -included in this distribution. The documentation is also available online: - -https://doc.qt.io/qt-5/index.html - -The Qt version 5.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -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 * -**************************************************************************** - - - AbstractButton: - * Added implicitIndicatorWidth and implicitIndicatorHeight properties. - - - ComboBox: - * Added implicitIndicatorWidth and implicitIndicatorHeight properties. - - - Control: - * Added horizontalPadding and verticalPadding properties as a convenient - way to set both left and right, or top and bottom paddings in one go. - * Unless explicitly specified, baselineOffset is now automatically - updated based on the top padding of the control and the baselineOffset - of the contentItem. Styles no longer need to specify the - baselineOffset in QML. - * [QTBUG-60156] Added implicitBackgroundWidth and - implicitBackgroundHeight properties that can be used to simplify - complex implicit size bindings. - * Added implicitContentWidth and implicitContentHeight properties that - can be used to simplify complex implicit size bindings. - * [QTBUG-60156] Added topInset, bottomInset, leftInset, and rightInset - properties to control the geometry of the background similarly to how - paddings control the geometry of the contentItem. - - - Dial: - * [QTBUG-56323] Added the inputMode property. This property controls how - the dial is interacted with. The circular input mode (default, old - behavior) operates on an absolute input system, whereas the horizontal - and vertical input modes use a relative input system. - - - Dialog: - * Added implicitHeaderWidth, implicitHeaderHeight, implicitFooterWidth, - and implicitFooterHeight properties. - - - DialogButtonBox: - * Added buttonLayout property that can be used to arrange the buttons. - * Added contentWidth and contentHeight properties. - - - GroupBox: - * Added implicitLabelWidth and implicitLabelHeight properties. - - - Label: - * Added implicitBackgroundWidth and implicitBackgroundHeight properties - that can be used to simplify complex implicit size bindings. - [ChangeLog][Controls][TextArea] Added implicitBackgroundWidth and - implicitBackgroundHeight properties that can be used to simplify - complex implicit size bindings. [ChangeLog][Controls][TextField] Added - implicitBackgroundWidth and implicitBackgroundHeight properties that - can be used to simplify complex implicit size bindings. - * Added topInset, bottomInset, leftInset, and rightInset properties to - control the geometry of the background similarly to how paddings - control the geometry of the contentItem. - - - Page: - * Added implicitHeaderWidth, implicitHeaderHeight, implicitFooterWidth, - and implicitFooterHeight properties. - - - Popup: - * Added horizontalPadding and verticalPadding properties as a convenient - way to set both left and right, or top and bottom paddings in one go. - * [QTBUG-60354] Added anchors.centerIn to Popup to allow a covenient way - of centering a popup. - * Added implicitBackgroundWidth, implicitBackgroundHeight, - implicitContentWidth, and implicitContentHeight properties. - * [QTBUG-60156] Added topInset, bottomInset, leftInset, and rightInset - properties to control the geometry of the background similarly to how - paddings control the geometry of the contentItem. - - - QQuickStyle: - * [QTBUG-67062] Added stylePathList() and addStylePath() methods for - managing the list of directories where Qt Quick Controls 2 searches - for available styles. - - - RangeSlider: - * [QTBUG-67311] Added a moved() signal to each handle (similar to the - Slider's moved() signal) to react to the values being interactively - changed by the user. - * [QTBUG-67317] Added a valueAt() function to allow accessing each - handle's value when the live property is set to false. - * Added first.implicitHandleWidth, first.implicitHandleHeight, - second.implicitHandleWidth, and second.implicitHandleHeight - properties. - * [QTBUG-62784] Added touchDragThreshold property for configuring the - threshold to initiate the touch 'drag' of the handle of the slider. The - mouse 'drag' won't be affected by the property. - - - Slider: - * Added implicitHandleWidth and implicitHandleHeight properties. - * [QTBUG-62784] Added touchDragThreshold property for configuring the - threshold to initiate the touch 'drag' of the handle of the slider. The - mouse 'drag' won't be affected by the property. - - - SpinBox: - * Added up.implicitIndicatorWidth, up.implicitIndicatorHeight, - down.implicitIndicatorWidth, and down.implicitIndicatorHeight - properties. - - - SwipeView: - * Added contentWidth and contentHeight properties. - - - TextArea: - * Added topInset, bottomInset, leftInset, and rightInset properties to - control the geometry of the background similarly to how paddings - control the geometry of the contentItem. - * Added placeholderTextColor property for user convenience to customize - the placeholderText color to fit the backgrounds. - - - TextField: - * Added topInset, bottomInset, leftInset, and rightInset properties to - control the geometry of the background similarly to how paddings - control the geometry of the contentItem. - * [QTBUG-66260] Added placeholderTextColor property for user convenience - to customize the placeholderText color to fit the backgrounds. - - - ToolTip: - * [QTBUG-62890] Added non-attached show() and hide() methods to make it - more flexible to meet certain requirements. - - - Tumbler: - * [QTBUG-66358] Added positionViewAtIndex() function that calls the - respective PathView/ListView function, depending on the value of wrap. - This allows changing currentIndex without animations. - -**************************************************************************** -* Material * -**************************************************************************** - - - [QTBUG-51109] Added Dense variant of the Material style for use on - desktop platforms. Some controls are slightly smaller in height and use - smaller font sizes. The variant can be enabled by setting - QT_QUICK_CONTROLS_MATERIAL_VARIANT to Dense or setting Variant=Dense in - the qtquickcontrols.conf file. - -**************************************************************************** -* Platform * -**************************************************************************** - - - Menu: - * [QTBUG-67730] Deprecated iconName and iconSource properties in favor - of icon.name and icon.source grouped properties. - * [QTBUG-67730] Added icon.mask grouped property. - [ChangeLog][Platform][MenuItem] Added icon.mask grouped property. - [ChangeLog][Platform][SystemTrayIcon] Added icon.mask grouped - property. - - - MenuItem: - * [QTBUG-67730] Deprecated iconName and iconSource properties in favor - of icon.name and icon.source grouped properties. - - - SystemTrayIcon: - * [QTBUG-67730] Deprecated iconName and iconSource properties in favor - of icon.name and icon.source grouped properties. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.1 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.1 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.1 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Qt 5.12.1 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.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.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -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. - - - This release contains only minor code improvements. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.2 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.2 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.2 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.2 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -Qt 5.12.2 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.0 through 5.12.1. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -https://doc.qt.io/qt-5/index.html - -The Qt version 5.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -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 * -**************************************************************************** - - - [QTBUG-73849] Fixed incorrect documentation link to - Number.toLocaleString(). - - [QTBUG-72536] Fixed bug with long text in ScrollView. - - [QTBUG-73447] Fixed Menu's appearance not changing when enabled state - changes - - [QTBUG-70181] Fixed disabled menu items getting focus. - - [QTBUG-69540] Fixed disabled sub-menu items being highlighted. - - [QTBUG-72023] Fixed font and palette settings in .conf files not being - respected. - - [QTBUG-69682] Fixed Menu not being dismissed when the triggered item - disables itself. - - [QTBUG-73412] Fixed Dial's new properties not being detected by Creator. - - [QTBUG-73202] Documented how to move active focus out of TextArea with - tab. - - [QTBUG-72786] Fixed palette colors not propagating to ComboBox's popup. - - [QTBUG-73179] Fixed Qt.labs.platform.FileDialog not honoring folder - property. - - [QTBUG-72811] Fixed AbstractButton's clicked() signal not being emitted - after long press. - - [QTBUG-72746] Fixed crash on exit when using popups. - - [QTBUG-72372] Fixed issue where a button would go outside of - DialogButtonBox. - - [QTBUG-71902] Fixed incorrect font size in certain styles on Windows. - - [QTBUG-72750] Fixed Slider's wheel event propagation. - -**************************************************************************** -* Controls * -**************************************************************************** - -Fusion ------- - - - [QTBUG-70819] Made Active and Disabled button colors closer to Widgets' - Fusion style. - - [QTBUG-70819] Use white ButtonText when a dark system theme is in use. - - [QTBUG-70652] Use system palette for highlightedText instead of a fixed - white color. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.3 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.3 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.3 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.3 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Qt 5.12.3 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.0 through 5.12.2. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - - https://doc.qt.io/qt-5/index.html - -The Qt version 5.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -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 * -**************************************************************************** - - - [QTBUG-70451] DialogButtonBox: fixed buttons with equal roles being - randomly sorted. - - [QTBUG-70161] ComboBox: fixed popup immediately closing on iOS - - [QTBUG-72886] DialogButtonBox: fixed content size calculation - - [QTBUG-74226] Fixed attached ToolTips using the timeout of the last shown - tool tip - - [QTBUG-72536] ScrollView now respects the content size set on/by - the flickable - - [QTBUG-73354] Menu: enter/return can now be used to activate items, - rather than just space. - - [QTBUG-71290] Drawer: fixed infinite positioning loop - - [QTBUG-66494] Page: fixed binding loop - -**************************************************************************** -* Styles * -**************************************************************************** - -Default --------- - - [QTBUG-72786] Made ItemDelegate respect highlightedText and improved - highlightedText color so that text shows up against a highlighted background. - This also allows easily switching ComboBox to a dark style via palette - customization. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.4 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.4 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.4 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.4 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Qt 5.12.4 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.0 through 5.12.3. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -https://doc.qt.io/qt-5/index.html - -The Qt version 5.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -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. - - - This release contains only minor code improvements. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.5 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.5 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.12.5 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.12.5 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Qt 5.12.5 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.12.0 through 5.12.4. - -For more details, refer to the online documentation included in this -distribution. The documentation is also available online: - -https://doc.qt.io/qt-5/index.html - -The Qt version 5.12 series is binary compatible with the 5.11.x series. -Applications compiled for 5.11 will continue to run with 5.12. - -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 * -**************************************************************************** - - - TextArea: - * [QTBUG-76369] Fixed rendering issue using the Material style. - - - Container - * [QTBUG-76164] Fixed crash when removing items. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.9.6 qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.9.6 --- qtquickcontrols2-opensource-src-5.12.5+dfsg/dist/changes-5.9.6 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/dist/changes-5.9.6 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -Qt 5.9.6 is a bug-fix release. It maintains both forward and backward -compatibility (source and binary) with Qt 5.9.0 through 5.9.5. - -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. - -**************************************************************************** -* Qt 5.9.6 Changes * -**************************************************************************** - -Controls --------- - - - Label: - * [QTBUG-65880] Fixed a background size regression caused by deferred - execution. - - - TextArea: - * [QTBUG-67334] Fixed the background to not scroll when TextArea is - placed in a ScrollView. - * [QTBUG-65880] Fixed a background size regression caused by deferred - execution. - - - TextField: - * [QTBUG-65880] Fixed a background size regression caused by deferred - execution. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 540 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 540 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Page { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.1 Page { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 import io.qt.examples.chattutorial 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.1 import io.qt.examples.chattutorial 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter4-models/main.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter4-models/main.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter4-models/main.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter4-models/main.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter4-models/sqlconversationmodel.h qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter4-models/sqlconversationmodel.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter4-models/sqlconversationmodel.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter4-models/sqlconversationmodel.h 2018-03-21 07:59:29.000000000 +0000 @@ -64,8 +64,8 @@ QString recipient() const; void setRecipient(const QString &recipient); - QVariant data(const QModelIndex &index, int role) const override; - QHash roleNames() const override; + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + QHash roleNames() const Q_DECL_OVERRIDE; Q_INVOKABLE void sendMessage(const QString &recipient, const QString &message); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 ToolBar { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 import io.qt.examples.chattutorial 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.1 import io.qt.examples.chattutorial 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick.Controls 2.1 +import QtQuick.Controls.Material 2.1 ToolBar { Material.theme: Material.Dark diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/sqlconversationmodel.h qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/sqlconversationmodel.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/chapter5-styling/sqlconversationmodel.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/chapter5-styling/sqlconversationmodel.h 2018-03-21 07:59:29.000000000 +0000 @@ -64,8 +64,8 @@ QString recipient() const; void setRecipient(const QString &recipient); - QVariant data(const QModelIndex &index, int role) const override; - QHash roleNames() const override; + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + QHash roleNames() const Q_DECL_OVERRIDE; Q_INVOKABLE void sendMessage(const QString &recipient, const QString &message); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -27,9 +27,7 @@ /*! \example chattutorial -\keyword Qt Quick Controls - Chat Tutorial - \title Qt Quick Controls - Chat Tutorial - \keyword Qt Quick Controls 2 - Chat Tutorial +\title Qt Quick Controls 2 - Chat Tutorial \brief Tutorial about writing a basic chat client using Qt Quick Controls 2. \ingroup qtquickcontrols2-examples @@ -98,7 +96,7 @@ \quotefromfile chattutorial/chapter1-settingup/main.qml \skipto import -\printuntil import QtQuick.Controls 2.12 +\printuntil import QtQuick.Controls 2.1 First, import the \l {Qt Quick} module. This gives us access to graphical primitives such as \l Item, \l Rectangle, \l Text, and so @@ -218,9 +216,6 @@ \borderedimage qtquickcontrols2-chattutorial-chapter1.png -\noautolist -\generatelist examplefiles .*chapter1.* - \section1 Chapter 2: Lists In this chapter, we'll explain how to create a list of interactive items using @@ -295,9 +290,6 @@ \borderedimage qtquickcontrols2-chattutorial-chapter2.png -\generatelist examplefiles .*(chapter2|shared).* -\generatelist exampleimages .*shared.*(Einstein|Hemingway|Gude)\.png - \section1 Chapter 3: Navigation In this chapter, you'll learn how to use \l StackView to navigate between pages @@ -522,9 +514,6 @@ \borderedimage qtquickcontrols2-chattutorial-chapter3.gif -\generatelist examplefiles .*(chapter3|shared).* -\generatelist exampleimages .*shared.*(Einstein|Hemingway|Gude)\.png - \section1 Chapter 4: Models In chapter 4, we'll take you through the process of creating both read-only and @@ -741,9 +730,6 @@ \borderedimage qtquickcontrols2-chattutorial-chapter4.gif -\generatelist examplefiles .*(chapter4|shared).* -\generatelist exampleimages - \section1 Chapter 5: Styling Styles in Qt Quick Controls 2 are designed to work on any platform. In this @@ -768,7 +754,7 @@ import the Material style directly and use the Material attached property: \code - import QtQuick.Controls.Material 2.12 + import QtQuick.Controls.Material 2.1 // ... @@ -870,9 +856,6 @@ \borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png \borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png -\generatelist examplefiles .*(chapter5|shared).* -\generatelist exampleimages - \section1 Summary In this tutorial, we've taken you through the following steps of writing a diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.7 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.1 ItemDelegate { id: delegate diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/ContactDialog.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/ContactDialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/ContactDialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/ContactDialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.7 +import QtQuick.Controls 2.1 Dialog { id: dialog diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/ContactForm.ui.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/ContactForm.ui.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/ContactForm.ui.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/ContactForm.ui.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.7 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.1 GridLayout { id: grid diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/contactlist.pro qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/contactlist.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/contactlist.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/contactlist.pro 2018-03-21 07:59:29.000000000 +0000 @@ -10,13 +10,7 @@ contactmodel.cpp RESOURCES += \ - ContactDelegate.ui.qml \ - ContactDialog.qml \ - ContactForm.ui.qml \ - contactlist.qml \ - ContactView.ui.qml \ - designer/Backend/ContactModel.qml \ - SectionDelegate.ui.qml + $$files(*.qml) # Additional import path used to resolve QML modules just for Qt Quick Designer QML_DESIGNER_IMPORT_PATH = $$PWD/designer diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/contactlist.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/contactlist.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/contactlist.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/contactlist.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.7 +import QtQuick.Controls 2.1 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/ContactView.ui.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/ContactView.ui.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/ContactView.ui.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/ContactView.ui.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.7 +import QtQuick.Controls 2.1 import Backend 1.0 ListView { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 ListModel { ListElement { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -26,9 +26,7 @@ ****************************************************************************/ /*! \example contactlist - \keyword Qt Quick Controls - Contact List - \title Qt Quick Controls - Contact List - \keyword Qt Quick Controls 2 - Contact List + \title Qt Quick Controls 2 - Contact List \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a C++ class that implements a simple contact list. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.7 +import QtQuick.Controls 2.1 ToolBar { id: background diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -27,9 +27,7 @@ /*! \example flatstyle - \keyword Qt Quick Controls - Flat Style - \title Qt Quick Controls - Flat Style - \keyword Qt Quick Controls 2 - Flat Style + \title Qt Quick Controls 2 - Flat Style \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a QML plugin with customized controls. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/Flat/Button.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/Flat/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/Flat/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/Flat/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.8 +import QtQuick.Templates 2.1 as T import Theme 1.0 T.Button { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.8 +import QtQuick.Templates 2.1 as T import Theme 1.0 T.CheckBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/Flat/Switch.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/Flat/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/Flat/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/Flat/Switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.8 +import QtQuick.Templates 2.1 as T import Theme 1.0 T.Switch { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/flatstyle.pro qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/flatstyle.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/flatstyle.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/flatstyle.pro 2018-03-21 07:59:29.000000000 +0000 @@ -6,14 +6,10 @@ SOURCES += main.cpp RESOURCES += \ - qtquickcontrols2.conf \ - flatstyle.qml \ - MainForm.ui.qml \ - Flat/Button.qml \ - Flat/CheckBox.qml \ - Flat/Switch.qml \ - imports/Theme/Theme.qml \ - imports/Theme/qmldir + qtquickcontrols2.conf \ + $$files(*.qml) \ + $$files(imports/Theme/*) \ + $$files(Flat/*.qml) # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = $$PWD/imports diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/flatstyle.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/flatstyle.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/flatstyle.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/flatstyle.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.8 +import QtQuick.Controls 2.1 import Qt.labs.platform 1.0 import Theme 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml 2018-03-21 07:59:29.000000000 +0000 @@ -50,7 +50,7 @@ pragma Singleton -import QtQuick 2.12 +import QtQuick 2.8 QtObject { readonly property color gray: "#b2b1b1" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/MainForm.ui.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/MainForm.ui.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/flatstyle/MainForm.ui.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/flatstyle/MainForm.ui.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.8 +import QtQuick.Controls 2.1 +import QtQuick.Layouts 1.0 import Theme 1.0 Item { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -27,9 +27,7 @@ /*! \example gallery - \keyword Qt Quick Controls - Gallery - \title Qt Quick Controls - Gallery - \keyword Qt Quick Controls 2 - Gallery + \title Qt Quick Controls 2 - Gallery \ingroup qtquickcontrols2-examples \brief A gallery of controls. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/gallery.cpp qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/gallery.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/gallery.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/gallery.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -53,7 +53,6 @@ #include #include #include -#include int main(int argc, char *argv[]) { @@ -63,8 +62,6 @@ QGuiApplication app(argc, argv); - QIcon::setThemeName("gallery"); - QSettings settings; QString style = QQuickStyle::name(); if (!style.isEmpty()) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/gallery.pro qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/gallery.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/gallery.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/gallery.pro 2018-03-21 07:59:29.000000000 +0000 @@ -7,59 +7,10 @@ RESOURCES += \ gallery.qml \ - pages/BusyIndicatorPage.qml \ - pages/ButtonPage.qml \ - pages/CheckBoxPage.qml \ - pages/ComboBoxPage.qml \ - pages/DelayButtonPage.qml \ - pages/DelegatePage.qml \ - pages/DialogPage.qml \ - pages/DialPage.qml \ - pages/FramePage.qml \ - pages/GroupBoxPage.qml \ - pages/PageIndicatorPage.qml \ - pages/ProgressBarPage.qml \ - pages/RadioButtonPage.qml \ - pages/RangeSliderPage.qml \ - pages/ScrollablePage.qml \ - pages/ScrollBarPage.qml \ - pages/ScrollIndicatorPage.qml \ - pages/SliderPage.qml \ - pages/SpinBoxPage.qml \ - pages/StackViewPage.qml \ - pages/SwipeViewPage.qml \ - pages/SwitchPage.qml \ - pages/TabBarPage.qml \ - pages/TextAreaPage.qml \ - pages/TextFieldPage.qml \ - pages/ToolTipPage.qml \ - pages/TumblerPage.qml \ qtquickcontrols2.conf \ - icons/gallery/index.theme \ - icons/gallery/20x20/back.png \ - icons/gallery/20x20/drawer.png \ - icons/gallery/20x20/menu.png \ - icons/gallery/20x20@2/back.png \ - icons/gallery/20x20@2/drawer.png \ - icons/gallery/20x20@2/menu.png \ - icons/gallery/20x20@3/back.png \ - icons/gallery/20x20@3/drawer.png \ - icons/gallery/20x20@3/menu.png \ - icons/gallery/20x20@4/back.png \ - icons/gallery/20x20@4/drawer.png \ - icons/gallery/20x20@4/menu.png \ - images/arrow.png \ - images/arrow@2x.png \ - images/arrow@3x.png \ - images/arrow@4x.png \ - images/arrows.png \ - images/arrows@2x.png \ - images/arrows@3x.png \ - images/arrows@4x.png \ - images/qt-logo.png \ - images/qt-logo@2x.png \ - images/qt-logo@3x.png \ - images/qt-logo@4x.png + $$files(images/*.png) \ + $$files(images/+material/*.png) \ + $$files(pages/*.qml) target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/gallery INSTALLS += target diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/gallery.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/gallery.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/gallery.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/gallery.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.1 +import QtQuick.Controls.Universal 2.1 import Qt.labs.settings 1.0 ApplicationWindow { @@ -89,7 +89,12 @@ anchors.fill: parent ToolButton { - icon.name: stackView.depth > 1 ? "back" : "drawer" + contentItem: Image { + fillMode: Image.Pad + horizontalAlignment: Image.AlignHCenter + verticalAlignment: Image.AlignVCenter + source: stackView.depth > 1 ? "images/back.png" : "images/drawer.png" + } onClicked: { if (stackView.depth > 1) { stackView.pop() @@ -111,7 +116,12 @@ } ToolButton { - icon.name: "menu" + contentItem: Image { + fillMode: Image.Pad + horizontalAlignment: Image.AlignHCenter + verticalAlignment: Image.AlignVCenter + source: "images/menu.png" + } onClicked: optionsMenu.open() Menu { Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20/back.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20/back.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20/drawer.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20/drawer.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20/menu.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20/menu.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20@2/back.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20@2/back.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20@2/drawer.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20@2/drawer.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20@2/menu.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20@2/menu.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20@3/back.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20@3/back.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20@3/drawer.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20@3/drawer.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20@3/menu.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20@3/menu.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20@4/back.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20@4/back.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20@4/drawer.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20@4/drawer.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/20x20@4/menu.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/20x20@4/menu.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/index.theme qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/index.theme --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/icons/gallery/index.theme 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/icons/gallery/index.theme 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -[Icon Theme] -Name=Gallery -Comment=Qt Quick Controls 2 Gallery Example Icon Theme - -Directories=20x20,20x20@2,20x20@3,20x20@4 - -[20x20] -Size=20 -Type=Fixed - -[20x20@2] -Size=20 -Scale=2 -Type=Fixed - -[20x20@3] -Size=20 -Scale=3 -Type=Fixed - -[20x20@4] -Size=20 -Scale=4 -Type=Fixed Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/arrow@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/arrow@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/arrow@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/arrow@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/arrow@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/arrow@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/arrow.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/arrow.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/arrows@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/arrows@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/arrows@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/arrows@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/arrows@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/arrows@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/arrows.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/arrows.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/back@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/back@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/back@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/back@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/back@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/back@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/back.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/back.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/drawer@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/drawer@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/drawer@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/drawer@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/drawer@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/drawer@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/drawer.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/drawer.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/back@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/back@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/back@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/back@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/back@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/back@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/back.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/back.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/drawer@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/drawer@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/drawer@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/drawer@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/drawer@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/drawer@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/drawer.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/drawer.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/menu@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/menu@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/menu@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/menu@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/menu@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/menu@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/+material/menu.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/+material/menu.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/menu@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/menu@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/menu@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/menu@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/menu@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/menu@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/menu.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/menu.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/qt-logo@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/qt-logo@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/qt-logo@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/qt-logo@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/qt-logo@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/qt-logo@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/images/qt-logo.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/images/qt-logo.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ButtonPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ButtonPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ButtonPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ButtonPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/DelegatePage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/DelegatePage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/DelegatePage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/DelegatePage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Layouts 1.1 +import QtQuick.Controls 2.1 Pane { padding: 0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/DialogPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/DialogPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/DialogPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/DialogPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.1 ScrollablePage { id: page @@ -101,7 +101,7 @@ x: (parent.width - width) / 2 y: (parent.height - height) / 2 - parent: Overlay.overlay + parent: ApplicationWindow.overlay modal: true title: "Confirmation" @@ -134,7 +134,7 @@ y: (parent.height - height) / 2 width: Math.min(page.width, page.height) / 3 * 2 contentHeight: logo.height * 2 - parent: Overlay.overlay + parent: ApplicationWindow.overlay modal: true title: "Content" @@ -194,7 +194,7 @@ x: (parent.width - width) / 2 y: (parent.height - height) / 2 - parent: Overlay.overlay + parent: ApplicationWindow.overlay focus: true modal: true diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/DialPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/DialPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/DialPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/DialPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/FramePage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/FramePage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/FramePage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/FramePage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ScrollablePage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ScrollablePage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ScrollablePage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ScrollablePage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 Page { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Flickable { id: flickable diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Flickable { id: flickable diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/SliderPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/SliderPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/SliderPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/SliderPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/StackViewPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/StackViewPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/StackViewPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/StackViewPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 StackView { id: stackView diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Pane { id: pane diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/SwitchPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/SwitchPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/SwitchPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/SwitchPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/TabBarPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/TabBarPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/TabBarPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/TabBarPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Page { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/TextAreaPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/TextAreaPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/TextAreaPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/TextAreaPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/TextFieldPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/TextFieldPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/TextFieldPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/TextFieldPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ToolTipPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ToolTipPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/ToolTipPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/ToolTipPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/TumblerPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/TumblerPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/gallery/pages/TumblerPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/gallery/pages/TumblerPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollablePage { id: page diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/automotive.cpp qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/automotive.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/automotive.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/automotive.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** 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 -#include -#include -#include -#include -#include - -int main(int argc, char *argv[]) -{ - QGuiApplication::setApplicationName("Automotive"); - QGuiApplication::setOrganizationName("QtProject"); - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - - QGuiApplication app(argc, argv); - - QIcon::setThemeName("automotive"); - - QQmlApplicationEngine engine; - engine.load(QUrl("qrc:/qml/automotive.qml")); - if (engine.rootObjects().isEmpty()) - return -1; - - return app.exec(); -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/automotive.pro qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/automotive.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/automotive.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/automotive.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -TEMPLATE = app -TARGET = automotive -QT += quick quickcontrols2 - -SOURCES += \ - automotive.cpp - -RESOURCES += \ - icons/icons.qrc \ - imagine-assets/imagine-assets.qrc \ - qml/qml.qrc \ - qtquickcontrols2.conf - -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/imagine/automotive -INSTALLS += target Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/doc/images/qtquickcontrols2-automotive.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/doc/images/qtquickcontrols2-automotive.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example imagine/automotive - \keyword Qt Quick Controls - Imagine Style Example: Automotive - \title Qt Quick Controls - Imagine Style Example: Automotive - \keyword Qt Quick Controls 2 - Imagine Style Example: Automotive - \ingroup qtquickcontrols2-examples - \brief An automotive user interface using custom Imagine style assets. - - This example demonstrates how custom Imagine style assets can be used to - style an automotive user interface. - - \image qtquickcontrols2-automotive.png - - \include examples-run.qdocinc -*/ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/air-con.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/air-con.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/command.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/command.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/message.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/message.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/music.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/music.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/seats.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/seats.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/settings.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/settings.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/statistics.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/statistics.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/windows.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/windows.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/air-con.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/air-con.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/command.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/command.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/message.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/message.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/music.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/music.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/navigation.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/navigation.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/seats.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/seats.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/settings.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/settings.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/statistics.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/statistics.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/windows.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/windows.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/icons.svg qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/icons.svg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/icons.svg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/icons.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,526 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ! - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/index.theme qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/index.theme --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/automotive/index.theme 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/automotive/index.theme 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -[Icon Theme] -Name=Automotive -Comment=Icon theme for the Qt Quick Controls 2 Automotive Imagine Style Example - -Directories=44x44,44x44@2 - -[44x44] -Size=44 -Type=Fixed - -[44x44@2] -Size=44 -Scale=2 -Type=Fixed Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/car@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/car@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/car.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/car.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/icons.qrc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/icons.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/icons.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/icons.qrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ - - - car.png - car@2x.png - warning.png - warning@2x.png - weather.png - weather@2x.png - automotive/icons.svg - automotive/index.theme - automotive/44x44/air-con.png - automotive/44x44/command.png - automotive/44x44/message.png - automotive/44x44/music.png - automotive/44x44/seats.png - automotive/44x44/settings.png - automotive/44x44/statistics.png - automotive/44x44/windows.png - automotive/44x44@2/air-con.png - automotive/44x44@2/command.png - automotive/44x44@2/message.png - automotive/44x44@2/music.png - automotive/44x44@2/navigation.png - automotive/44x44@2/seats.png - automotive/44x44@2/settings.png - automotive/44x44@2/statistics.png - automotive/44x44@2/windows.png - - Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/warning@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/warning@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/warning.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/warning.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/weather@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/weather@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/icons/weather.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/icons/weather.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background.9.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/imagine-assets.qrc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/imagine-assets.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/imagine-assets.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/imagine-assets.qrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ - - - applicationwindow-background.png - applicationwindow-background@2x.png - button-background.9.png - button-background@2x.9.png - button-background-checked.9.png - button-background-checked@2x.9.png - button-background-checked-hovered.9.png - button-background-checked-hovered@2x.9.png - button-background-hovered.9.png - button-background-hovered@2x.9.png - button-background-pressed.9.png - button-background-pressed@2x.9.png - dial-background.png - dial-background@2x.png - dial-background-hovered.png - dial-background-hovered@2x.png - dial-background-pressed.png - dial-background-pressed@2x.png - dial-handle.png - dial-handle@2x.png - dial-handle-pressed.png - dial-handle-pressed@2x.png - frame-background.9.png - frame-background@2x.9.png - itemdelegate-background.9.png - itemdelegate-background@2x.9.png - itemdelegate-background-checked.9.png - itemdelegate-background-checked@2x.9.png - itemdelegate-background-hovered.9.png - itemdelegate-background-hovered@2x.9.png - itemdelegate-background-pressed.9.png - itemdelegate-background-pressed@2x.9.png - radiobutton-indicator.png - radiobutton-indicator@2x.png - radiobutton-indicator-checked.png - radiobutton-indicator-checked@2x.png - radiobutton-indicator-checked-hovered.png - radiobutton-indicator-checked-hovered@2x.png - radiobutton-indicator-checked-pressed.png - radiobutton-indicator-checked-pressed@2x.png - radiobutton-indicator-hovered.png - radiobutton-indicator-hovered@2x.png - radiobutton-indicator-pressed.png - radiobutton-indicator-pressed@2x.png - scrollindicator-handle.png - scrollindicator-handle@2x.png - slider-background-horizontal.9.png - slider-background-horizontal@2x.9.png - slider-handle.png - slider-handle@2x.png - slider-handle-hovered.png - slider-handle-hovered@2x.png - slider-handle-pressed.png - slider-handle-pressed@2x.png - slider-progress-horizontal.9.png - slider-progress-horizontal@2x.9.png - slider-progress-horizontal-pressed.9.png - slider-progress-horizontal-pressed@2x.9.png - switchdelegate-background.9.png - switchdelegate-background@2x.9.png - switchdelegate-handle.png - switchdelegate-handle@2x.png - switchdelegate-handle-checked.png - switchdelegate-handle-checked@2x.png - switchdelegate-handle-checked-hovered.png - switchdelegate-handle-checked-hovered@2x.png - switchdelegate-handle-hovered.png - switchdelegate-handle-hovered@2x.png - switchdelegate-handle-pressed.png - switchdelegate-handle-pressed@2x.png - switchdelegate-indicator.png - switchdelegate-indicator@2x.png - switchdelegate-indicator-pressed.png - switchdelegate-indicator-pressed@2x.png - toolseparator-separator-vertical.9.png - toolseparator-separator-vertical@2x.9.png - - Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical.9.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qml/automotive.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qml/automotive.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qml/automotive.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qml/automotive.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,642 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Window 2.0 - -ApplicationWindow { - id: window - width: 1280 - height: 720 - minimumWidth: 1180 - minimumHeight: 663 - visible: true - title: "Qt Quick Controls 2 - Imagine Style Example: Automotive" - - readonly property color colorGlow: "#1d6d64" - readonly property color colorWarning: "#d5232f" - readonly property color colorMain: "#6affcd" - readonly property color colorBright: "#ffffff" - readonly property color colorLightGrey: "#888" - readonly property color colorDarkGrey: "#333" - - readonly property int fontSizeExtraSmall: Qt.application.font.pixelSize * 0.8 - readonly property int fontSizeMedium: Qt.application.font.pixelSize * 1.5 - readonly property int fontSizeLarge: Qt.application.font.pixelSize * 2 - readonly property int fontSizeExtraLarge: Qt.application.font.pixelSize * 5 - - Component.onCompleted: { - x = Screen.width / 2 - width / 2 - y = Screen.height / 2 - height / 2 - } - - Shortcut { - sequence: "Ctrl+Q" - onActivated: Qt.quit() - } - - Frame { - id: frame - anchors.fill: parent - anchors.margins: 90 - - RowLayout { - id: mainRowLayout - anchors.fill: parent - anchors.margins: 24 - spacing: 36 - - Container { - id: leftTabBar - - currentIndex: 1 - - Layout.fillWidth: false - Layout.fillHeight: true - - ButtonGroup { - buttons: columnLayout.children - } - - contentItem: ColumnLayout { - id: columnLayout - spacing: 3 - - Repeater { - model: leftTabBar.contentModel - } - } - - FeatureButton { - id: navigationFeatureButton - text: qsTr("Navigation") - icon.name: "navigation" - Layout.fillHeight: true - } - - FeatureButton { - text: qsTr("Music") - icon.name: "music" - checked: true - Layout.fillHeight: true - } - - FeatureButton { - text: qsTr("Message") - icon.name: "message" - Layout.fillHeight: true - } - - FeatureButton { - text: qsTr("Command") - icon.name: "command" - Layout.fillHeight: true - } - - FeatureButton { - text: qsTr("Settings") - icon.name: "settings" - Layout.fillHeight: true - } - } - - StackLayout { - currentIndex: leftTabBar.currentIndex - - Layout.preferredWidth: 150 - Layout.maximumWidth: 150 - Layout.fillWidth: false - - Item {} - - ColumnLayout { - spacing: 16 - - ButtonGroup { - id: viewButtonGroup - buttons: viewTypeRowLayout.children - } - - RowLayout { - id: viewTypeRowLayout - spacing: 3 - - Layout.bottomMargin: 12 - - Button { - text: qsTr("Compact") - font.pixelSize: fontSizeExtraSmall - checked: true - - Layout.fillWidth: true - } - Button { - text: qsTr("Full") - font.pixelSize: fontSizeExtraSmall - checkable: true - - Layout.fillWidth: true - } - } - - GlowingLabel { - text: qsTr("VOLUME") - color: "white" - font.pixelSize: fontSizeMedium - } - - Dial { - id: volumeDial - from: 0 - value: 42 - to: 100 - stepSize: 1 - - Layout.alignment: Qt.AlignHCenter - Layout.minimumWidth: 64 - Layout.minimumHeight: 64 - Layout.preferredWidth: 128 - Layout.preferredHeight: 128 - Layout.maximumWidth: 128 - Layout.maximumHeight: 128 - Layout.fillHeight: true - - Label { - text: volumeDial.value.toFixed(0) - color: "white" - font.pixelSize: Qt.application.font.pixelSize * 3 - anchors.centerIn: parent - } - } - - ButtonGroup { - id: audioSourceButtonGroup - } - - RowLayout { - Layout.topMargin: 16 - - GlowingLabel { - id: radioOption - text: qsTr("RADIO") - color: "white" - font.pixelSize: fontSizeMedium - horizontalAlignment: Label.AlignLeft - - Layout.fillWidth: true - } - GlowingLabel { - text: qsTr("AUX") - color: colorLightGrey - font.pixelSize: fontSizeMedium * 0.8 - horizontalAlignment: Label.AlignHCenter - glowEnabled: false - - Layout.alignment: Qt.AlignBottom - Layout.fillWidth: true - } - GlowingLabel { - text: qsTr("MP3") - color: colorDarkGrey - font.pixelSize: fontSizeMedium * 0.6 - horizontalAlignment: Label.AlignRight - glowEnabled: false - - Layout.alignment: Qt.AlignBottom - Layout.fillWidth: true - } - } - - Frame { - id: stationFrame - leftPadding: 1 - rightPadding: 1 - topPadding: 1 - bottomPadding: 1 - - Layout.fillWidth: true - Layout.fillHeight: true - Layout.preferredHeight: 128 - - ListView { - clip: true - anchors.fill: parent - - ScrollIndicator.vertical: ScrollIndicator { - parent: stationFrame - anchors.top: parent.top - anchors.right: parent.right - anchors.rightMargin: 1 - anchors.bottom: parent.bottom - } - - model: ListModel { - ListElement { name: "V-Radio"; frequency: "105.5 MHz" } - ListElement { name: "World News"; frequency: "93.4 MHz" } - ListElement { name: "TekStep FM"; frequency: "95.0 MHz" } - ListElement { name: "Classic Radio"; frequency: "89.9 MHz" } - ListElement { name: "Buena Vista FM"; frequency: "100.8 MHz" } - ListElement { name: "Drive-by Radio"; frequency: "99.1 MHz" } - ListElement { name: "Unknown #1"; frequency: "104.5 MHz" } - ListElement { name: "Unknown #2"; frequency: "91.2 MHz" } - ListElement { name: "Unknown #3"; frequency: "93.8 MHz" } - ListElement { name: "Unknown #4"; frequency: "80.4 MHz" } - ListElement { name: "Unknown #5"; frequency: "101.1 MHz" } - ListElement { name: "Unknown #6"; frequency: "92.2 MHz" } - } - delegate: ItemDelegate { - id: stationDelegate - width: parent.width - height: 22 - text: model.name - font.pixelSize: fontSizeExtraSmall - topPadding: 0 - bottomPadding: 0 - - contentItem: RowLayout { - Label { - text: model.name - font: stationDelegate.font - horizontalAlignment: Text.AlignLeft - Layout.fillWidth: true - } - Label { - text: model.frequency - font: stationDelegate.font - horizontalAlignment: Text.AlignRight - Layout.fillWidth: true - } - } - } - } - } - - Frame { - Layout.fillWidth: true - - RowLayout { - anchors.fill: parent - - Label { - text: qsTr("Sort by") - font.pixelSize: fontSizeExtraSmall - - Layout.alignment: Qt.AlignTop - } - - ColumnLayout { - RadioButton { - text: qsTr("Name") - font.pixelSize: fontSizeExtraSmall - } - RadioButton { - text: qsTr("Frequency") - font.pixelSize: fontSizeExtraSmall - } - RadioButton { - text: qsTr("Favourites") - font.pixelSize: fontSizeExtraSmall - checked: true - } - } - } - } - } - } - - Rectangle { - color: colorMain - implicitWidth: 1 - Layout.fillHeight: true - } - - ColumnLayout { - Layout.preferredWidth: 350 - Layout.fillWidth: true - Layout.fillHeight: true - - GlowingLabel { - id: timeLabel - text: qsTr("11:02") - font.pixelSize: fontSizeExtraLarge - - Layout.alignment: Qt.AlignHCenter - - GlowingLabel { - text: qsTr("AM") - font.pixelSize: fontSizeLarge - anchors.left: parent.right - anchors.leftMargin: 8 - } - } - - Label { - text: qsTr("01/01/2018") - color: colorLightGrey - font.pixelSize: fontSizeMedium - - Layout.alignment: Qt.AlignHCenter - Layout.topMargin: 2 - Layout.bottomMargin: 10 - } - - Image { - source: "qrc:/icons/car.png" - fillMode: Image.PreserveAspectFit - - Layout.fillHeight: true - - Column { - x: parent.width * 0.88 - y: parent.height * 0.56 - spacing: 3 - - Image { - source: "qrc:/icons/warning.png" - anchors.horizontalCenter: parent.horizontalCenter - - layer.enabled: true - layer.effect: CustomGlow { - spread: 0.2 - samples: 40 - color: colorWarning - } - } - - GlowingLabel { - text: qsTr("Door open") - color: colorWarning - glowColor: Qt.rgba(colorWarning.r, colorWarning.g, colorWarning.b, 0.4) - } - } - } - } - - Rectangle { - color: colorMain - implicitWidth: 1 - Layout.fillHeight: true - } - - ColumnLayout { - Row { - spacing: 8 - - Image { - source: "qrc:/icons/weather.png" - } - - Column { - spacing: 8 - - Row { - anchors.horizontalCenter: parent.horizontalCenter - - GlowingLabel { - id: outsideTempValueLabel - text: qsTr("31") - font.pixelSize: fontSizeExtraLarge - } - - GlowingLabel { - text: qsTr("°C") - font.pixelSize: Qt.application.font.pixelSize * 2.5 - anchors.baseline: outsideTempValueLabel.baseline - } - } - - Label { - text: qsTr("Osaka, Japan") - color: colorLightGrey - font.pixelSize: fontSizeMedium - } - } - } - - ColumnLayout { - id: airConRowLayout - spacing: 8 - - Layout.preferredWidth: 128 - Layout.preferredHeight: 380 - Layout.fillHeight: true - - Item { - Layout.fillHeight: true - } - - SwitchDelegate { - text: qsTr("AC") - leftPadding: 0 - rightPadding: 0 - topPadding: 0 - bottomPadding: 0 - - Layout.fillWidth: true - } - - // QTBUG-63269 - Item { - implicitHeight: temperatureValueLabel.implicitHeight - Layout.fillWidth: true - Layout.topMargin: 16 - - Label { - text: qsTr("Temperature") - anchors.baseline: temperatureValueLabel.bottom - anchors.left: parent.left - } - - GlowingLabel { - id: temperatureValueLabel - text: qsTr("24°C") - font.pixelSize: fontSizeLarge - anchors.right: parent.right - } - } - - Slider { - value: 0.35 - Layout.fillWidth: true - } - - // QTBUG-63269 - Item { - implicitHeight: powerValueLabel.implicitHeight - Layout.fillWidth: true - Layout.topMargin: 16 - - Label { - text: qsTr("Power") - anchors.baseline: powerValueLabel.bottom - anchors.left: parent.left - } - - GlowingLabel { - id: powerValueLabel - text: qsTr("10%") - font.pixelSize: fontSizeLarge - anchors.right: parent.right - } - } - - Slider { - value: 0.25 - Layout.fillWidth: true - } - - SwitchDelegate { - text: qsTr("Low") - leftPadding: 0 - rightPadding: 0 - topPadding: 0 - bottomPadding: 0 - - Layout.fillWidth: true - Layout.topMargin: 16 - } - - SwitchDelegate { - text: qsTr("High") - checked: true - leftPadding: 0 - rightPadding: 0 - topPadding: 0 - bottomPadding: 0 - - Layout.fillWidth: true - } - - SwitchDelegate { - text: qsTr("Defog") - leftPadding: 0 - rightPadding: 0 - topPadding: 0 - bottomPadding: 0 - - Layout.fillWidth: true - } - - SwitchDelegate { - text: qsTr("Recirculate") - leftPadding: 0 - rightPadding: 0 - topPadding: 0 - bottomPadding: 0 - - Layout.fillWidth: true - } - - Item { - Layout.fillHeight: true - } - } - } - - Container { - id: rightTabBar - - currentIndex: 1 - - Layout.fillHeight: true - - ButtonGroup { - buttons: rightTabBarContentLayout.children - } - - contentItem: ColumnLayout { - id: rightTabBarContentLayout - spacing: 3 - - Repeater { - model: rightTabBar.contentModel - } - } - - Item { - Layout.fillHeight: true - } - - FeatureButton { - text: qsTr("Windows") - icon.name: "windows" - - Layout.maximumHeight: navigationFeatureButton.height - Layout.fillHeight: true - } - FeatureButton { - text: qsTr("Air Con.") - icon.name: "air-con" - checked: true - - Layout.maximumHeight: navigationFeatureButton.height - Layout.fillHeight: true - } - FeatureButton { - text: qsTr("Seats") - icon.name: "seats" - - Layout.maximumHeight: navigationFeatureButton.height - Layout.fillHeight: true - } - FeatureButton { - text: qsTr("Statistics") - icon.name: "statistics" - - Layout.maximumHeight: navigationFeatureButton.height - Layout.fillHeight: true - } - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -import QtGraphicalEffects 1.12 - -Glow { - color: glowColor - samples: 20 - spread: 0.3 -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 - -Button { - id: button - checkable: true - font.pixelSize: fontSizeExtraSmall - leftPadding: 4 - rightPadding: 4 - topPadding: 12 - bottomPadding: 12 - implicitWidth: 60 - implicitHeight: 90 - - icon.name: "placeholder" - icon.width: 44 - icon.height: 44 - display: Button.TextUnderIcon -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -// This container and the transform on the Label are -// necessary to get precise bounding rect of the text for layouting reasons, -// since some of the labels' font sizes can get quite large. -Item { - id: root - implicitHeight: labelTextMetrics.tightBoundingRect.height - implicitWidth: label.implicitWidth - - property alias text: label.text - property alias font: label.font - property alias horizontalAlignment: label.horizontalAlignment - property alias verticalAlignment: label.verticalAlignment - property bool glowEnabled: true - property color glowColor: colorGlow - property color color: colorBright - - Label { - id: label - anchors.baseline: root.baseline - color: root.color - - layer.enabled: root.glowEnabled - layer.effect: CustomGlow { - color: glowColor - } - - TextMetrics { - id: labelTextMetrics - text: label.text - font: label.font - } - - transform: Translate { - y: -labelTextMetrics.tightBoundingRect.y - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qml/qml.qrc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qml/qml.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qml/qml.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qml/qml.qrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - - - FeatureButton.qml - GlowingLabel.qml - CustomGlow.qml - automotive.qml - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[Controls] -Style=Imagine - -[Imagine] -Path=:/imagine-assets - -[Imagine\Palette] -Text=#6affcd -ButtonText=#6affcd -WindowText=#6affcd Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example imagine/musicplayer - \keyword Qt Quick Controls - Imagine Style Example: Music Player - \title Qt Quick Controls - Imagine Style Example: Music Player - \keyword Qt Quick Controls 2 - Imagine Style Example: Music Player - \ingroup qtquickcontrols2-examples - \brief An audio player user interface using custom Imagine style assets. - - This example demonstrates how custom Imagine style assets - can be used to style a user interface for an audio player application. - - \image qtquickcontrols2-musicplayer.png - - \omit - The assets are generated from a Photoshop file: \e musicplayer.psd. - This file can found in the \e design folder in the example directory. - All objects related to a particular asset are collected in a layer group. - For example, the assets for Button's background element are under a layer group with the following name: - - \badcode - 100% button-background.9.png, 200% button-background@2x.9.png, 300% button-background@3x.9.png, 400% button-background@4x.9.png - \endcode - - Using Photoshop's \l {Generate Image Assets}{https://helpx.adobe.com/photoshop/using/generate-assets-layers.html} feature, - the size and name for each asset are encoded into the name of the layer group. - - Where applicable, \l {Smart Objects}{https://helpx.adobe.com/photoshop/using/create-smart-objects.html} - are used to reduce duplication for common objects such as 9-patch lines. - \endomit - - \include examples-run.qdocinc -*/ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/icons.qrc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/icons.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/icons.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/icons.qrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ - - - musicplayer/index.theme - musicplayer/32x32/bluetooth.png - musicplayer/32x32/cart.png - musicplayer/32x32/cloud.png - musicplayer/32x32/filter.png - musicplayer/32x32/folder.png - musicplayer/32x32/message.png - musicplayer/32x32/music.png - musicplayer/32x32/next.png - musicplayer/32x32/pause.png - musicplayer/32x32/power.png - musicplayer/32x32/previous.png - musicplayer/32x32/repeat.png - musicplayer/32x32/save.png - musicplayer/32x32/settings.png - musicplayer/32x32/shuffle.png - musicplayer/32x32/stop.png - musicplayer/32x32@2/bluetooth.png - musicplayer/32x32@2/cart.png - musicplayer/32x32@2/cloud.png - musicplayer/32x32@2/filter.png - musicplayer/32x32@2/folder.png - musicplayer/32x32@2/grid.png - musicplayer/32x32@2/message.png - musicplayer/32x32@2/music.png - musicplayer/32x32@2/next.png - musicplayer/32x32@2/pause.png - musicplayer/32x32@2/power.png - musicplayer/32x32@2/previous.png - musicplayer/32x32@2/repeat.png - musicplayer/32x32@2/save.png - musicplayer/32x32@2/settings.png - musicplayer/32x32@2/shuffle.png - musicplayer/32x32@2/stop.png - musicplayer/32x32/favorite.png - musicplayer/32x32@2/favorite.png - - Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/bluetooth.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/bluetooth.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cart.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cart.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cloud.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cloud.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/favorite.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/favorite.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/filter.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/filter.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/folder.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/folder.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/message.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/message.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/music.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/music.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/next.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/next.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/pause.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/pause.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/power.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/power.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/previous.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/previous.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/repeat.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/repeat.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/save.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/save.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/settings.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/settings.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/shuffle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/shuffle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/stop.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/stop.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/bluetooth.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/bluetooth.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cart.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cart.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cloud.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cloud.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/favorite.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/favorite.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/filter.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/filter.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/folder.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/folder.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/grid.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/grid.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/message.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/message.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/music.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/music.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/next.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/next.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/pause.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/pause.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/power.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/power.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/previous.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/previous.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/repeat.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/repeat.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/save.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/save.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/settings.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/settings.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/shuffle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/shuffle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/stop.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/stop.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/icons.svg qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/icons.svg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/icons.svg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/icons.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,648 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/index.theme qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/index.theme --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/index.theme 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/index.theme 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -[Icon Theme] -Name=Music Player -Comment=Icon theme for the Qt Quick Controls 2 Music Player Imagine Style Example - -Directories=32x32,32x32@2 - -[32x32] -Size=32 -Type=Fixed - -[32x32@2] -Size=32 -Scale=2 -Type=Fixed Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/images/album-cover.jpg and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/images/album-cover.jpg differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/applicationwindow-background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/applicationwindow-background.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background.9.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/imagine-assets.qrc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/imagine-assets.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/imagine-assets.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/imagine-assets.qrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ - - - applicationwindow-background.png - button-background-checked-hovered.9.png - button-background-checked-hovered@2x.9.png - button-background-checked.9.png - button-background-checked@2x.9.png - button-background-disabled.9.png - button-background-disabled@2x.9.png - button-background-hovered.9.png - button-background-hovered@2x.9.png - button-background-pressed.9.png - button-background-pressed@2x.9.png - button-background.9.png - button-background@2x.9.png - combobox-background-hovered.9.png - combobox-background-hovered@2x.9.png - combobox-background-open.9.png - combobox-background-open@2x.9.png - combobox-background-pressed.9.png - combobox-background-pressed@2x.9.png - combobox-background.9.png - combobox-background@2x.9.png - combobox-indicator-hovered.png - combobox-indicator-hovered@2x.png - combobox-indicator-open.png - combobox-indicator-open@2x.png - combobox-indicator-pressed.png - combobox-indicator-pressed@2x.png - combobox-indicator.png - combobox-indicator@2x.png - combobox-popup.9.png - combobox-popup@2x.9.png - dial-background-hovered.png - dial-background-hovered@2x.png - dial-background-pressed.png - dial-background-pressed@2x.png - dial-background.png - dial-background@2x.png - dial-handle-pressed.png - dial-handle-pressed@2x.png - dial-handle.png - dial-handle@2x.png - frame-background.9.png - frame-background@2x.9.png - itemdelegate-background-checked.9.png - itemdelegate-background-checked@2x.9.png - itemdelegate-background-disabled.9.png - itemdelegate-background-disabled@2x.9.png - itemdelegate-background-hovered.9.png - itemdelegate-background-hovered@2x.9.png - itemdelegate-background-pressed.9.png - itemdelegate-background-pressed@2x.9.png - itemdelegate-background.9.png - itemdelegate-background@2x.9.png - roundbutton-background-checked-hovered.png - roundbutton-background-checked-hovered@2x.png - roundbutton-background-checked.png - roundbutton-background-checked@2x.png - roundbutton-background-disabled.png - roundbutton-background-disabled@2x.png - roundbutton-background-hovered.png - roundbutton-background-hovered@2x.png - roundbutton-background-pressed.png - roundbutton-background-pressed@2x.png - roundbutton-background.png - roundbutton-background@2x.png - scrollbar-handle-interactive-hovered.png - scrollbar-handle-interactive-hovered@2x.png - scrollbar-handle-interactive-pressed.png - scrollbar-handle-interactive-pressed@2x.png - scrollbar-handle-interactive.png - scrollbar-handle-interactive@2x.png - slider-background-horizontal-disabled.9.png - slider-background-horizontal-disabled@2x.9.png - slider-background-horizontal.9.png - slider-background-horizontal@2x.9.png - slider-background-vertical-disabled.9.png - slider-background-vertical-disabled@2x.9.png - slider-background-vertical.9.png - slider-background-vertical@2x.9.png - slider-handle-disabled.png - slider-handle-disabled@2x.png - slider-handle-hovered.png - slider-handle-hovered@2x.png - slider-handle.png - slider-handle@2x.png - slider-progress-horizontal.9.png - slider-progress-horizontal@2x.9.png - slider-progress-vertical-disabled.9.png - slider-progress-vertical-disabled@2x.9.png - slider-progress-vertical.9.png - slider-progress-vertical@2x.9.png - textfield-background-disabled.9.png - textfield-background-disabled@2x.9.png - textfield-background.9.png - textfield-background@2x.9.png - toolbar-background.9.png - toolbar-background@2x.9.png - toolbutton-background-checked-hovered.9.png - toolbutton-background-checked-hovered@2x.9.png - toolbutton-background-checked.9.png - toolbutton-background-checked@2x.9.png - toolbutton-background-hovered.9.png - toolbutton-background-hovered@2x.9.png - toolbutton-background-pressed.9.png - toolbutton-background-pressed@2x.9.png - toolbutton-background.9.png - toolbutton-background@2x.9.png - tooltip-background.9.png - tooltip-background@2x.9.png - - Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background.9.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** 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 -#include -#include -#include - -int main(int argc, char *argv[]) -{ - QGuiApplication::setApplicationName("Music Player"); - QGuiApplication::setOrganizationName("QtProject"); - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - - QGuiApplication app(argc, argv); - - QIcon::setThemeName("musicplayer"); - - QQmlApplicationEngine engine; - engine.load(QUrl("qrc:/musicplayer.qml")); - if (engine.rootObjects().isEmpty()) - return -1; - - return app.exec(); -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/musicplayer.pro qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/musicplayer.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/musicplayer.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/musicplayer.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -TEMPLATE = app -TARGET = musicplayer -QT += quick quickcontrols2 - -SOURCES += \ - musicplayer.cpp - -RESOURCES += \ - icons/icons.qrc \ - images/album-cover.jpg \ - imagine-assets/imagine-assets.qrc \ - qtquickcontrols2.conf \ - musicplayer.qml - -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/imagine/musicplayer -INSTALLS += target diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,466 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.0 - -ApplicationWindow { - id: window - width: 1280 - height: 720 - visible: true - title: "Qt Quick Controls 2 - Imagine Style Example: Music Player" - - Component.onCompleted: { - x = Screen.width / 2 - width / 2 - y = Screen.height / 2 - height / 2 - } - - Shortcut { - sequence: "Ctrl+Q" - onActivated: Qt.quit() - } - - header: ToolBar { - RowLayout { - id: headerRowLayout - anchors.fill: parent - spacing: 0 - - ToolButton { - icon.name: "grid" - } - ToolButton { - icon.name: "settings" - } - ToolButton { - icon.name: "filter" - } - ToolButton { - icon.name: "message" - } - ToolButton { - icon.name: "music" - } - ToolButton { - icon.name: "cloud" - } - ToolButton { - icon.name: "bluetooth" - } - ToolButton { - icon.name: "cart" - } - - Item { - Layout.fillWidth: true - } - - ToolButton { - icon.name: "power" - onClicked: Qt.quit() - } - } - } - - Label { - text: "Qtify" - font.pixelSize: Qt.application.font.pixelSize * 1.3 - anchors.centerIn: header - z: header.z + 1 - } - - RowLayout { - spacing: 115 - anchors.fill: parent - anchors.margins: 70 - - ColumnLayout { - spacing: 0 - Layout.preferredWidth: 230 - - RowLayout { - Layout.maximumHeight: 170 - - ColumnLayout { - Label { - text: "12 dB" - Layout.fillHeight: true - } - Label { - text: "6 dB" - Layout.fillHeight: true - } - Label { - text: "0 dB" - Layout.fillHeight: true - } - Label { - text: "-6 dB" - Layout.fillHeight: true - } - Label { - text: "-12 dB" - Layout.fillHeight: true - } - } - - Repeater { - model: 7 - - Slider { - value: Math.random() - orientation: Qt.Vertical - - Layout.fillWidth: true - Layout.fillHeight: true - } - } - } - - RowLayout { - spacing: 10 - Layout.topMargin: 23 - - ComboBox { - currentIndex: 1 - model: ["Blues", "Classical", "Jazz", "Metal"] - Layout.fillWidth: true - } - - Button { - icon.name: "folder" - } - - Button { - icon.name: "save" - enabled: false - } - } - - Dial { - Layout.alignment: Qt.AlignHCenter - Layout.topMargin: 50 - } - - Label { - text: "Volume" - - Layout.alignment: Qt.AlignHCenter - Layout.topMargin: 12 - } - } - - ColumnLayout { - spacing: 26 - Layout.preferredWidth: 230 - - Item { - Layout.fillWidth: true - Layout.fillHeight: true - - Image { - anchors.fill: parent - fillMode: Image.PreserveAspectCrop - source: "images/album-cover.jpg" - } - } - - Item { - id: songLabelContainer - clip: true - - Layout.fillWidth: true - Layout.preferredHeight: songNameLabel.implicitHeight - - SequentialAnimation { - running: true - loops: Animation.Infinite - - PauseAnimation { - duration: 2000 - } - ParallelAnimation { - XAnimator { - target: songNameLabel - from: 0 - to: songLabelContainer.width - songNameLabel.implicitWidth - duration: 5000 - } - OpacityAnimator { - target: leftGradient - from: 0 - to: 1 - } - } - OpacityAnimator { - target: rightGradient - from: 1 - to: 0 - } - PauseAnimation { - duration: 1000 - } - OpacityAnimator { - target: rightGradient - from: 0 - to: 1 - } - ParallelAnimation { - XAnimator { - target: songNameLabel - from: songLabelContainer.width - songNameLabel.implicitWidth - to: 0 - duration: 5000 - } - OpacityAnimator { - target: leftGradient - from: 0 - to: 1 - } - } - OpacityAnimator { - target: leftGradient - from: 1 - to: 0 - } - } - - Rectangle { - id: leftGradient - gradient: Gradient { - GradientStop { - position: 0 - color: "#dfe4ea" - } - GradientStop { - position: 1 - color: "#00dfe4ea" - } - } - - width: height - height: parent.height - anchors.left: parent.left - z: 1 - rotation: -90 - opacity: 0 - } - - Label { - id: songNameLabel - text: "Edvard Grieg - In the Hall of the Mountain King" - font.pixelSize: Qt.application.font.pixelSize * 1.4 - } - - Rectangle { - id: rightGradient - gradient: Gradient { - GradientStop { - position: 0 - color: "#00dfe4ea" - } - GradientStop { - position: 1 - color: "#dfe4ea" - } - } - - width: height - height: parent.height - anchors.right: parent.right - rotation: -90 - } - } - - RowLayout { - spacing: 8 - Layout.alignment: Qt.AlignHCenter - - RoundButton { - icon.name: "favorite" - icon.width: 32 - icon.height: 32 - } - RoundButton { - icon.name: "stop" - icon.width: 32 - icon.height: 32 - } - RoundButton { - icon.name: "previous" - icon.width: 32 - icon.height: 32 - } - RoundButton { - icon.name: "pause" - icon.width: 32 - icon.height: 32 - } - RoundButton { - icon.name: "next" - icon.width: 32 - icon.height: 32 - } - RoundButton { - icon.name: "repeat" - icon.width: 32 - icon.height: 32 - } - RoundButton { - icon.name: "shuffle" - icon.width: 32 - icon.height: 32 - } - } - - Slider { - id: seekSlider - value: 113 - to: 261 - - Layout.fillWidth: true - - ToolTip { - parent: seekSlider.handle - visible: seekSlider.pressed - text: pad(Math.floor(value / 60)) + ":" + pad(Math.floor(value % 60)) - y: parent.height - - readonly property int value: seekSlider.valueAt(seekSlider.position) - - function pad(number) { - if (number <= 9) - return "0" + number; - return number; - } - } - } - } - - ColumnLayout { - spacing: 16 - Layout.preferredWidth: 230 - - ButtonGroup { - buttons: libraryRowLayout.children - } - - RowLayout { - id: libraryRowLayout - Layout.alignment: Qt.AlignHCenter - - Button { - text: "Files" - checked: true - } - Button { - text: "Playlists" - checkable: true - } - Button { - text: "Favourites" - checkable: true - } - } - - RowLayout { - TextField { - Layout.fillWidth: true - } - Button { - icon.name: "folder" - } - } - - Frame { - id: filesFrame - leftPadding: 1 - rightPadding: 1 - - Layout.fillWidth: true - Layout.fillHeight: true - - ListView { - clip: true - anchors.fill: parent - model: ListModel { - Component.onCompleted: { - for (var i = 0; i < 100; ++i) { - append({ - author: "Author", - album: "Album", - track: "Track 0" + (i % 9 + 1), - }); - } - } - } - delegate: ItemDelegate { - text: model.author + " - " + model.album + " - " + model.track - width: parent.width - } - - ScrollBar.vertical: ScrollBar { - parent: filesFrame - policy: ScrollBar.AlwaysOn - anchors.top: parent.top - anchors.topMargin: filesFrame.topPadding - anchors.right: parent.right - anchors.rightMargin: 1 - anchors.bottom: parent.bottom - anchors.bottomMargin: filesFrame.bottomPadding - } - } - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[Controls] -Style=Imagine - -[Imagine] -Path=:/imagine-assets - -[Imagine\Palette] -Text=#6b7b89 -ButtonText=#6b7b89 -WindowText=#6b7b89 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/quickcontrols2.pro qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/quickcontrols2.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/quickcontrols2.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/quickcontrols2.pro 2018-03-21 07:59:29.000000000 +0000 @@ -6,9 +6,6 @@ contactlist \ sidepanel \ swipetoremove \ - wearable \ - imagine/automotive \ - imagine/musicplayer wearable qtHaveModule(widgets): SUBDIRS += flatstyle diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -27,14 +27,12 @@ /*! \example sidepanel - \keyword Qt Quick Controls - Side Panel - \title Qt Quick Controls - Side Panel - \keyword Qt Quick Controls 2 - Side Panel + \title Qt Quick Controls 2 - Side Panel \ingroup qtquickcontrols2-examples - \brief A persistent side panel with Drawer. + \brief A non-closable persistent side panel with Drawer. - This example demonstrates how \l Drawer can be used as a persistent side - panel. + This example demonstrates how \l Drawer can be used as a non-closable + persistent side panel. \raw HTML
@@ -54,17 +52,17 @@ When the application is in portrait mode, the drawer is an interactive side panel that can be swiped open from the left edge. It appears on - top of the content, blocking user interaction through its modal + top of the content, and blocks user interaction through its modal background. When the application is in landscape mode, the drawer and - the content are laid out side-by-side. + the content are laid out side by side. The current orientation of the application is determined by comparing the width and height of the window: \snippet sidepanel/sidepanel.qml orientation - This is used to determine whether the drawer should be \l {Popup::}{modal} - and \l {Drawer::}{interactive}, and to configure its \l {Drawer::}{position} + This is used to specify whether the drawer is \l {Popup::}{modal} and + \l {Drawer::}{interactive}, and to configure its \l {Drawer::}{position} and \l {Popup::visible}{visibility} accordingly. \quotefromfile sidepanel/sidepanel.qml diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/sidepanel/sidepanel.pro qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/sidepanel/sidepanel.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/sidepanel/sidepanel.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/sidepanel/sidepanel.pro 2018-03-21 07:59:29.000000000 +0000 @@ -6,13 +6,8 @@ sidepanel.cpp RESOURCES += \ - doc/images/qtquickcontrols2-sidepanel-landscape.png \ - doc/images/qtquickcontrols2-sidepanel-portrait.png \ - images/qt-logo@2x.png \ - images/qt-logo@3x.png \ - images/qt-logo@4x.png \ - images/qt-logo.png \ - sidepanel.qml + sidepanel.qml \ + $$files(images/*.png) target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/sidepanel INSTALLS += target diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/sidepanel/sidepanel.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/sidepanel/sidepanel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/sidepanel/sidepanel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/sidepanel/sidepanel.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -27,14 +27,12 @@ /*! \example swipetoremove - \keyword Qt Quick Controls - Swipe to Remove - \title Qt Quick Controls - Swipe to Remove - \keyword Qt Quick Controls 2 - Swipe to Remove + \title Qt Quick Controls 2 - Swipe to Remove \ingroup qtquickcontrols2-examples - \brief Demonstrates removal of list items by swipe gesture. + \brief Demonstrates removing list items by swipe. This example demonstrates how \l SwipeDelegate can be used to implement - removal of list items by swiping. This UI pattern is often used in touch + removal of list items by swipe. This UI pattern is often used in touch user interfaces. \image qtquickcontrols2-swipetoremove.png @@ -48,7 +46,7 @@ The following snippet presents how the logic of removing items is implemented. When the swipe is \l {SwipeDelegate::swipe}{completed}, it - starts a timer that waits a few seconds to let the user undo the remove + starts a timer tha waits a few seconds to let the user undo the remove action. Once the undo timer triggers, the item is removed from the list: \snippet swipetoremove/swipetoremove.qml removal Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/swipetoremove/fonts/fontello.ttf and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/swipetoremove/fonts/fontello.ttf differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/swipetoremove/fonts/LICENSE.txt qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/swipetoremove/fonts/LICENSE.txt --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/swipetoremove/fonts/LICENSE.txt 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/swipetoremove/fonts/LICENSE.txt 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,12 @@ +Font license info + + +## Elusive + + Copyright (C) 2013 by Aristeides Stathopoulos + + Author: Aristeides Stathopoulos + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://aristeides.com/ + + diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/swipetoremove/swipetoremove.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/swipetoremove/swipetoremove.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/swipetoremove/swipetoremove.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/swipetoremove/swipetoremove.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.8 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -26,9 +26,7 @@ ****************************************************************************/ /*! \example texteditor - \keyword Qt Quick Controls - Text Editor - \title Qt Quick Controls - Text Editor - \keyword Qt Quick Controls 2 - Text Editor + \title Qt Quick Controls 2 - Text Editor \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a C++ class to provide a fully-functional rich-text editor application. Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/texteditor/fonts/fontello.ttf and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/texteditor/fonts/fontello.ttf differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/texteditor/qml/texteditor.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/texteditor/qml/texteditor.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/texteditor/qml/texteditor.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/texteditor/qml/texteditor.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.8 +import QtQuick.Controls 2.1 import QtQuick.Window 2.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.8 +import QtQuick.Controls 2.1 +import QtQuick.Controls.Material 2.1 +import QtQuick.Layouts 1.3 import QtQuick.Window 2.0 import io.qt.examples.texteditor 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -27,9 +27,7 @@ /*! \example wearable - \keyword Qt Quick Controls - Wearable Demo - \title Qt Quick Controls - Wearable Demo - \keyword Qt Quick Controls 2 - Wearable Demo + \title Qt Quick Controls 2 - Wearable Demo \ingroup qtquickcontrols2-examples \brief Demonstrates an application launcher designed for wearable devices. @@ -40,7 +38,7 @@ \section1 Structure - The main .qml file, \c wearable.qml, consists of an ApplicationWindow, a StackView + The main .qml file \c wearable.qml consists of an ApplicationWindow, a StackView for a stack-based navigation model, and buttons for interactive navigation. \quotefromfile wearable/wearable.qml @@ -63,9 +61,9 @@ \section1 Styling The demo uses a custom \l {Styling Qt Quick Controls 2}{Qt Quick Controls 2 style} - embedded into the demo's resources. The custom style is implemented for a - few controls only, as it is specific to this particular demo. It uses a - singleton type for various styling attributes, such as fonts and colors. + embedded into the demo's resources. Since the style is specific to this particular + demo, it only needs to implement a few controls. The style also provides a singleton + type that contains various styling attributes, such as fonts and colors. \list \li \c qml/Style/PageIndicator.qml @@ -85,11 +83,10 @@ \section1 Custom Type - The demo application contains a custom button type implemented in - \c qml/NaviButton.qml. The navigation button is used as a home and back - button in \c wearable.qml. \c NaviButton extends the AbstractButton type - with properties that control the slide in and slide out transitions and - the button image. + The demo application contains a custom button type implemented in \c qml/NaviButton.qml. + The navigation button is used as a home and back button in \c wearable.qml. \c NaviButton + extends the standard AbstractButton API with properties that control the slide in and slide + out transitions and the button image. \quotefromfile wearable/qml/NaviButton.qml \skipuntil import "Style" @@ -101,26 +98,12 @@ \skipto } \printuntil /^\}/ - \section1 Icons - - The demo ships a custom icon theme. The icons are bundled into the \c :/icons - folder in the application's resources. The \c index.theme file lists the contents - of the icon theme: - - \quotefile wearable/icons/wearable/index.theme - - Finally, the icon theme is selected in \c main(): - - \snippet wearable/wearable.cpp icons - - The icons are used on the Launcher Page, which is presented below. See - \l {Icons in Qt Quick Controls 2} for more details about icons and themes. - \section1 Launcher Page - The application launcher is implemented using a circular PathView in - \c LauncherPage.qml. Each application is in a separate .qml file, - which is added to the ListModel on the launcher page. + The application launcher, which is specified as the initial content above, is + implemented using a circular PathView in \c LauncherPage.qml. Each application is + contained within its own .qml file, which is listed in a ListModel on the launcher + page. \quotefromfile wearable/qml/LauncherPage.qml \skipto PathView @@ -133,9 +116,6 @@ \skipto "Settings" \printuntil delegate: \dots 8 - \skipto icon.width - \printuntil icon.name - \dots 8 \skipto onClicked: \printto path: \dots @@ -153,28 +133,29 @@ applications, data acquisition is implemented using \l XMLHttpRequest to read from local files. These files were generated by storing responses from remote servers in JSON format. This code can be easily modified to acquire - data from remote servers. + data from real remote servers. \section2 Navigation This application displays a walking route from source to destination. This - route information is obtained using the REST API provided by - \l {https://www.openstreetmap.org/}. The API response is in JSON format, which - is parsed using JavaScript by the application. Currently, it is not possible - to specify the source and destination from within the application, but it can - be added based on the device's capabilities. For example, user input - could be implemented as screens with input fields, or can be communicated - over Bluetooth/Wifi from a paired application running on another device - such as a smart phone or PC. + route is obtained as a response by invoking an API provided by + \l {https://www.openstreetmap.org/}. The response is in JSON format and the + corresponding JavaScript file associated with the application helps interpret + the response. Currently, it is not possible to specify the source and destination + from within the application, but it can be easily added based on the device's + capabilities. For example, user input could be implemented as screens with + input fields, or can be communicated over Bluetooth/Wifi from a paired app + running on another device such as a smart phone or PC. \section2 Weather This application displays weather information such as temperature, sunrise and sunset times, air pressure, and so on. This information is obtained - from \l {https://openweathermap.org/} using its REST API. The API response is - in JSON format, which is parsed using JavaScript by the application. This - application can also be modified by adding screens to obtain weather data for - a given location. + as a response to invoking \l {https://openweathermap.org/}. The response is + in JSON format and the corresponding JavaScript file associated with the + application helps interpret the response. As with the Navigation application, + this application can be modified by adding screens to accept location information + to obtain weather data for a given location. \section2 World Clock @@ -184,7 +165,7 @@ \section2 Others - The remaining applications return static data for now, but they can be + The remaining applications return static data for now, but they can easily be modified to process response data obtained from respective services. \include examples-run.qdocinc Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36/alarms.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36/alarms.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36/fitness.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36/fitness.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36/navigation.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36/navigation.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36/notifications.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36/notifications.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36/settings.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36/settings.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36/weather.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36/weather.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36/worldclock.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36/worldclock.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36@2/alarms.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36@2/alarms.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36@2/fitness.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36@2/fitness.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36@2/navigation.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36@2/navigation.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36@2/notifications.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36@2/notifications.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36@2/settings.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36@2/settings.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36@2/weather.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36@2/weather.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/36x36@2/worldclock.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/36x36@2/worldclock.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/index.theme qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/index.theme --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/icons/wearable/index.theme 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/icons/wearable/index.theme 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -[Icon Theme] -Name=Wearable -Comment=Qt Quick Controls 2 Wearable Demo Icon Theme - -Directories=36x36,36x36@2 - -[36x36] -Size=36 -Type=Fixed - -[36x36@2] -Size=36 -Scale=2 -Type=Fixed Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/images/background-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/images/background-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/images/background-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/images/background-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/images/background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/images/background.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 -import ".." +import QtQuick 2.7 +import QtQuick.Controls 2.0 as QQC2 import "../Style" Item { @@ -65,9 +64,7 @@ ListElement { name: qsTr("Week Ends"); state: false; time: "07:30 AM" } } - SwipeViewPage { - property alias stateSwitch: stateSwitch - + Item { Column { spacing: 30 anchors.centerIn: parent @@ -86,7 +83,7 @@ font.bold: stateSwitch.checked font.pixelSize: stateSwitch.checked ? UIStyle.fontSizeXL : UIStyle.fontSizeL font.letterSpacing: 4 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } Text { @@ -97,7 +94,7 @@ font.italic: true font.bold: true font.letterSpacing: 1 - color: UIStyle.themeColorQtGray2 + color: UIStyle.colorQtGray2 } } } Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Alarms/images/alarms@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Alarms/images/alarms@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Alarms/images/alarms.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Alarms/images/alarms.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 -import "Style" - -Item { - id: root - width: row.implicitWidth + margins * 2 - - readonly property int topMargin: 24 - readonly property int margins: 12 - - Behavior on y { - NumberAnimation {} - } - - Rectangle { - id: demoModeIndicatorBg - anchors.fill: parent - anchors.topMargin: -topMargin - radius: 20 - color: UIStyle.colorRed - } - - Row { - id: row - spacing: 8 - anchors.fill: parent - anchors.leftMargin: margins - anchors.rightMargin: margins - - Image { - source: "Settings/images/demo-mode-white.png" - width: height - height: instructionLabel.height * 2 - anchors.verticalCenter: parent.verticalCenter - } - QQC2.Label { - id: instructionLabel - text: "Tap screen to use" - color: UIStyle.colorQtGray10 - anchors.verticalCenter: parent.verticalCenter - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/DemoMode.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/DemoMode.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/DemoMode.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/DemoMode.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,258 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -import "Style" - -Item { - property StackView stackView - - SequentialAnimation { - id: demoModeAnimation - running: settings.demoMode - - // Set brightness back to normal. - ScriptAction { script: settings.brightness = 0 } - - // Go back to the launcher page. - PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.pop(null) } - PauseAnimation { duration: 2000 } - - // Open the world clock page. - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("WorldClock/WorldClockPage.qml")) } - PauseAnimation { duration: 2000 } - - // Swipe across a few times. - SequentialAnimation { - loops: 6 - - ScriptAction { script: stackView.currentItem.children[0].incrementCurrentIndex() } - PauseAnimation { duration: 2500 } - } - - - // Go back to the launcher page. - ScriptAction { script: stackView.pop(null) } - PauseAnimation { duration: 2000 } - - // Open the navigation page. - ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } - PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Navigation/NavigationPage.qml")) } - PauseAnimation { duration: 2000 } - - // Flick down a few times. - SequentialAnimation { - loops: 6 - - ScriptAction { script: stackView.currentItem.routeListView.incrementCurrentIndex() } - PauseAnimation { duration: 2000 } - } - - - // Go back to the launcher page. - ScriptAction { script: stackView.pop(null) } - PauseAnimation { duration: 2000 } - - // Open the weather page. - ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } - PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Weather/WeatherPage.qml")) } - PauseAnimation { duration: 2000 } - - // Swipe across a few times. - SequentialAnimation { - loops: 4 - - ScriptAction { script: stackView.currentItem.children[0].incrementCurrentIndex() } - PauseAnimation { duration: 2000 } - } - - - // Go back to the launcher page. - ScriptAction { script: stackView.pop(null) } - PauseAnimation { duration: 2000 } - - // Open the fitness page. - ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } - PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Fitness/FitnessPage.qml")) } - PauseAnimation { duration: 2000 } - - // Swipe across a few times. - SequentialAnimation { - loops: 2 - - ScriptAction { script: stackView.currentItem.children[0].incrementCurrentIndex() } - PauseAnimation { duration: 2000 } - } - - - // Go back to the launcher page. - ScriptAction { script: stackView.pop(null) } - PauseAnimation { duration: 2000 } - - // Open the notifications page. - ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } - PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Notifications/NotificationsPage.qml")) } - - // Flick down a few times. - SequentialAnimation { - loops: 3 - - PauseAnimation { duration: 2000 } - ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } - } - - - // Go back to the launcher page. - ScriptAction { script: stackView.pop(null) } - PauseAnimation { duration: 2000 } - - // Open the alarms page. - ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } - PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Alarms/AlarmsPage.qml")) } - PauseAnimation { duration: 2000 } - - // Toggle the switch. - ScriptAction { script: stackView.currentItem.children[0].currentItem.stateSwitch.toggle() } - PauseAnimation { duration: 2000 } - - // Go to the next alarm. - ScriptAction { script: stackView.currentItem.children[0].incrementCurrentIndex() } - PauseAnimation { duration: 2000 } - - // Toggle the switch there too. - ScriptAction { script: stackView.currentItem.children[0].currentItem.stateSwitch.toggle() } - PauseAnimation { duration: 2000 } - - - // Go back to the launcher page. - ScriptAction { script: stackView.pop(null) } - PauseAnimation { duration: 2000 } - - // Open the settings page. - ScriptAction { script: stackView.currentItem.incrementCurrentIndex() } - PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.launched(Qt.resolvedUrl("Settings/SettingsPage.qml")) } - PauseAnimation { duration: 3000 } - - // Toggle the switches. - ScriptAction { script: stackView.currentItem.children[0].currentItem.bluetoothSwitch.toggle() } - PauseAnimation { duration: 1000 } - ScriptAction { script: stackView.currentItem.children[0].currentItem.wirelessSwitch.toggle() } - PauseAnimation { duration: 3000 } - - // Go to the next page. - ScriptAction { script: stackView.currentItem.children[0].incrementCurrentIndex() } - - // Play with the brightness slider. - // First, set it to full brightness so we start in the correct state. - ScriptAction { - script: { - var brightnessSlider = stackView.currentItem.children[0].currentItem.brightnessSlider - brightnessSlider.value = 0 - // increase()/decrease() are not a result of user interaction and - // hence moved() will not be emitted, so we do it ourselves. - brightnessSlider.moved() - } - } - - // Decrease the brightness. - SequentialAnimation { - loops: 3 - - PauseAnimation { duration: 1000 } - ScriptAction { - script: { - var brightnessSlider = stackView.currentItem.children[0].currentItem.brightnessSlider - brightnessSlider.decrease() - brightnessSlider.moved() - } - } - } - - // Increase the brightness back to full. - PauseAnimation { duration: 3000 } - SequentialAnimation { - loops: 3 - - PauseAnimation { duration: 1000 } - ScriptAction { - script: { - var brightnessSlider = stackView.currentItem.children[0].currentItem.brightnessSlider - brightnessSlider.increase() - brightnessSlider.moved() - } - } - } - - // Toggle the dark theme switch. - PauseAnimation { duration: 2000 } - ScriptAction { - script: { - var darkThemeSwitch = stackView.currentItem.children[0].currentItem.darkThemeSwitch - darkThemeSwitch.toggle() - // As above, only proper user interaction results in toggled() being emitted, - // so we do it ourselves. - darkThemeSwitch.toggled() - } - } - PauseAnimation { duration: 4000 } - - // Go back to the launcher page. - ScriptAction { script: stackView.pop(null) } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,19 +48,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 -import ".." +import QtQuick 2.7 +import QtQuick.Controls 2.0 as QQ2 import "../Style" import "fitness.js" as FitnessData Item { - QQC2.SwipeView { + QQ2.SwipeView { id: svFitnessContainer anchors.fill: parent - SwipeViewPage { + Item { id: fitnessPage1 Column { @@ -72,23 +71,23 @@ text: qsTr("Steps: ") + FitnessData.getSteps() font.italic: true font.pixelSize: UIStyle.fontSizeM - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } Image { anchors.horizontalCenter: parent.horizontalCenter - source: UIStyle.themeImagePath("images/man-walking") + source: "images/man-walking.png" } Text { anchors.horizontalCenter: parent.horizontalCenter text: qsTr("Calories: ") + FitnessData.getCalories() font.pixelSize: UIStyle.fontSizeS font.italic: true - color: UIStyle.themeColorQtGray3 + color: UIStyle.colorQtGray3 } } } - SwipeViewPage { + Item { id: fitnessPage2 Column { @@ -102,11 +101,11 @@ + qsTr(" miles") font.italic: true font.pixelSize: UIStyle.fontSizeM - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } Image { anchors.horizontalCenter: parent.horizontalCenter - source: UIStyle.themeImagePath("images/man-running") + source: "images/man-running.png" } Text { anchors.horizontalCenter: parent.horizontalCenter @@ -115,13 +114,13 @@ + qsTr(" mins") font.pixelSize: UIStyle.fontSizeS font.italic: true - color: UIStyle.themeColorQtGray3 + color: UIStyle.colorQtGray3 } } } } - QQC2.PageIndicator { + QQ2.PageIndicator { count: svFitnessContainer.count currentIndex: svFitnessContainer.currentIndex Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/fitness.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/fitness.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-running@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-running@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-running.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-running.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/LauncherPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/LauncherPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/LauncherPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/LauncherPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick 2.7 +import QtQuick.Controls 2.0 as QQC2 import "Style" PathView { @@ -68,57 +68,60 @@ model: ListModel { ListElement { title: qsTr("World Clock") - icon: "worldclock" + icon: "WorldClock/images/worldclock.png" page: "WorldClock/WorldClockPage.qml" } ListElement { title: qsTr("Navigation") - icon: "navigation" + icon: "Navigation/images/navigation.png" page: "Navigation/NavigationPage.qml" } ListElement { title: qsTr("Weather") - icon: "weather" + icon: "Weather/images/weather.png" page: "Weather/WeatherPage.qml" } ListElement { title: qsTr("Fitness") - icon: "fitness" + icon: "Fitness/images/fitness.png" page: "Fitness/FitnessPage.qml" } ListElement { title: qsTr("Notifications") - icon: "notifications" + icon: "Notifications/images/notifications.png" page: "Notifications/NotificationsPage.qml" } ListElement { title: qsTr("Alarm") - icon: "alarms" + icon: "Alarms/images/alarms.png" page: "Alarms/AlarmsPage.qml" } ListElement { title: qsTr("Settings") - icon: "settings" + icon: "Settings/images/settings.png" page: "Settings/SettingsPage.qml" } } - delegate: QQC2.RoundButton { + delegate: QQC2.AbstractButton { width: circularView.itemSize height: circularView.itemSize - property string title: model.title - - icon.width: 36 - icon.height: 36 - icon.name: model.icon + text: model.title opacity: PathView.itemOpacity padding: 12 + contentItem: Image { + source: model.icon + fillMode: Image.Pad + sourceSize.width: parent.availableWidth + sourceSize.height: parent.availableHeight + } + background: Rectangle { radius: width / 2 border.width: 3 - border.color: parent.PathView.isCurrentItem ? UIStyle.colorQtPrimGreen : UIStyle.themeColorQtGray4 + border.color: parent.PathView.isCurrentItem ? UIStyle.colorQtPrimGreen : UIStyle.colorQtGray4 } onClicked: { @@ -177,13 +180,13 @@ visible: currentItem ? currentItem.PathView.itemOpacity === 1.0 : 0 - text: currentItem ? currentItem.title : "" + text: currentItem ? currentItem.text : "" anchors.centerIn: parent anchors.verticalCenterOffset: (circularView.itemSize + height) / 2 font.bold: true font.pixelSize: circularView.itemSize / 3 font.letterSpacing: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/NaviButton.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/NaviButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/NaviButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/NaviButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick 2.7 +import QtQuick.Controls 2.0 as QQC2 import "Style" QQC2.AbstractButton { Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/navigation@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/navigation@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/navigation.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/navigation.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/straight@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/straight@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/images/straight.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/images/straight.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,13 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.7 import "../Style" import "navigation.js" as NavigationData Item { - property alias routeListView: routeView - Column { anchors.fill: parent anchors.margins: 2 @@ -65,7 +63,7 @@ width: parent.width height: titleRow.height - color: UIStyle.themeColorQtGray9 + color: UIStyle.colorQtGray9 Row { id: titleRow @@ -74,7 +72,7 @@ Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/navigation") + source: "images/navigation.png" fillMode: Image.PreserveAspectCrop } Text { @@ -82,7 +80,7 @@ text: qsTr("Walking") font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 2 - color: UIStyle.themeColorQtGray2 + color: UIStyle.colorQtGray2 } } } @@ -96,12 +94,12 @@ width: parent.width height: parent.height - titleRow.height - parent.spacing - property var imageList: [UIStyle.themeImagePath("images/straight"), - UIStyle.themeImagePath("images/leftturn"), - UIStyle.themeImagePath("images/rightturn"), - "images/uturn.png", - "images/start.png", - "images/end.png"] + property var imageList: ["straight.png", + "leftturn.png", + "rightturn.png", + "uturn.png", + "start.png", + "end.png"] clip: true focus: true diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.7 import "../Style" Rectangle { - color: UIStyle.themeColorQtGray8 + color: UIStyle.colorQtGray8 Row { spacing: 5 @@ -62,7 +62,7 @@ Image { id: img anchors.verticalCenter: parent.verticalCenter - source: navImage + source: "images/" + navImage fillMode: Image.PreserveAspectFit } @@ -78,7 +78,7 @@ font.pixelSize: UIStyle.fontSizeS verticalAlignment: Text.AlignVCenter padding: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } Text { @@ -88,7 +88,7 @@ font.pixelSize: UIStyle.fontSizeXS verticalAlignment: Text.AlignVCenter padding: 1 - color: UIStyle.themeColorQtGray2 + color: UIStyle.colorQtGray2 } } } Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/notifications@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/notifications@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/images/notifications.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/images/notifications.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick 2.7 +import QtQuick.Controls 2.0 as QQC2 import "../Style" import "notifications.js" as NotificationData @@ -70,7 +70,7 @@ width: parent.width / 2 anchors.right: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/missedcall") + source: "images/missedcall.png" fillMode: Image.Pad } @@ -85,7 +85,7 @@ Image { anchors.horizontalCenter: parent.horizontalCenter - source: qsTr("images/avatar%1-%2.png").arg(model.gender).arg(UIStyle.darkTheme ? "dark" : "light") + source: qsTr("images/avatar%1.png").arg(model.gender) } Text { @@ -93,7 +93,7 @@ anchors.horizontalCenter: parent.horizontalCenter font.bold: true font.pixelSize: UIStyle.fontSizeS - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } Text { @@ -101,7 +101,7 @@ text: date + " " + time font.pixelSize: UIStyle.fontSizeXS font.italic: true - color: UIStyle.themeColorQtGray2 + color: UIStyle.colorQtGray2 } } } Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/brightness@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/brightness@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/brightness.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/brightness.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/contrast@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/contrast@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/contrast.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/contrast.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-light.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode.svg qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode.svg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode.svg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-white@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-white@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-white.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/demo-mode-white.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/settings@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/settings@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/settings.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/settings.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/theme-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/theme-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/theme-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/theme-light.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/theme.svg qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/theme.svg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/theme.svg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/theme.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/wifi@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/wifi@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/images/wifi.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/images/wifi.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,24 +48,29 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 -import ".." +import QtQuick 2.7 +import QtQuick.Controls 2.0 as QQC2 +import Qt.labs.settings 1.0 import "../Style" Item { + Settings { + id: settings + property alias wireless: wirelessSwitch.checked + property alias bluetooth: bluetoothSwitch.checked + property alias contrast: contrastSlider.value + property alias brightness: brightnessSlider.value + } + QQC2.SwipeView { id: svSettingsContainer anchors.fill: parent - SwipeViewPage { + Item { id: settingsPage1 - property alias bluetoothSwitch: bluetoothSwitch - property alias wirelessSwitch: wirelessSwitch - Column { anchors.centerIn: parent spacing: 25 @@ -74,37 +79,32 @@ spacing: 50 Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/bluetooth") + source: "images/bluetooth.png" } QQC2.Switch { id: bluetoothSwitch anchors.verticalCenter: parent.verticalCenter checked: settings.bluetooth - onToggled: settings.bluetooth = checked } } Row { spacing: 50 Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/wifi") + source: "images/wifi.png" } QQC2.Switch { id: wirelessSwitch anchors.verticalCenter: parent.verticalCenter checked: settings.wireless - onToggled: settings.wireless = checked } } } } - SwipeViewPage { + Item { id: settingsPage2 - property alias brightnessSlider: brightnessSlider - property alias darkThemeSwitch: darkThemeSwitch - Column { anchors.centerIn: parent spacing: 2 @@ -112,7 +112,7 @@ Column { Image { anchors.horizontalCenter: parent.horizontalCenter - source: UIStyle.themeImagePath("images/brightness") + source: "images/brightness.png" } QQC2.Slider { id: brightnessSlider @@ -121,45 +121,21 @@ to: 5 stepSize: 1 value: settings.brightness - onMoved: settings.brightness = value - } - } - Column { - anchors.horizontalCenter: parent.horizontalCenter - - Image { - anchors.horizontalCenter: parent.horizontalCenter - source: UIStyle.themeImagePath("images/theme") - } - QQC2.Switch { - id: darkThemeSwitch - anchors.horizontalCenter: parent.horizontalCenter - checked: settings.darkTheme - onToggled: settings.darkTheme = checked } } - } - } - - SwipeViewPage { - id: settingsPage3 - - Column { - anchors.centerIn: parent - Column { - anchors.horizontalCenter: parent.horizontalCenter - spacing: 6 - + spacing: 2 Image { anchors.horizontalCenter: parent.horizontalCenter - source: UIStyle.themeImagePath("images/demo-mode") + source: "images/contrast.png" } - QQC2.Switch { - id: demoModeSwitch + QQC2.Slider { + id: contrastSlider anchors.horizontalCenter: parent.horizontalCenter - checked: settings.demoMode - onToggled: settings.demoMode = checked + from: 0 + to: 10 + stepSize: 1 + value: settings.contrast } } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.7 +import QtQuick.Templates 2.0 as T import "." T.PageIndicator { @@ -67,7 +67,7 @@ implicitHeight: 8 radius: width / 2 - color: UIStyle.themeColorQtGray3 + color: UIStyle.colorQtGray3 opacity: index === control.currentIndex ? 1.0 : 0.35 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Style/Slider.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Style/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Style/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Style/Slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.7 +import QtQuick.Templates 2.0 as T import "." T.Slider { @@ -66,14 +66,14 @@ radius: 5 color: control.pressed ? "#f0f0f0" : "#f6f6f6" - border.color: UIStyle.themeColorQtGray7 + border.color: UIStyle.colorQtGray7 } background: Rectangle { y: (control.height - height) / 2 height: 4 radius: 2 - color: UIStyle.themeColorQtGray3 + color: UIStyle.colorQtGray3 Rectangle { width: control.visualPosition * parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Style/Switch.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Style/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Style/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Style/Switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.7 +import QtQuick.Templates 2.0 as T import "." T.Switch { @@ -65,7 +65,7 @@ height: 26 radius: 13 - color: control.down ? UIStyle.themeColorQtGray6 : UIStyle.themeColorQtGray10 + color: control.down ? UIStyle.colorQtGray6 : UIStyle.colorQtGray10 border.color: !control.checked ? "#999999" : (control.down ? UIStyle.colorQtAuxGreen2 : UIStyle.colorQtAuxGreen1) @@ -78,9 +78,9 @@ background: Rectangle { radius: 13 - color: control.checked ? UIStyle.colorQtAuxGreen2 : UIStyle.colorRed + color: control.checked ? UIStyle.colorQtAuxGreen2 : "#E6173D" border.color: control.checked ? UIStyle.colorQtAuxGreen2 - : UIStyle.themeColorQtGray6 + : UIStyle.colorQtGray6 } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.7 pragma Singleton @@ -70,9 +70,6 @@ readonly property color colorQtAuxGreen1: "#21be2b" readonly property color colorQtAuxGreen2: "#17a81a" - // Red - readonly property color colorRed: "#e6173d" - // Gray readonly property color colorQtGray1: "#09102b" readonly property color colorQtGray2: "#222840" @@ -84,24 +81,4 @@ readonly property color colorQtGray8: "#b5b7bf" readonly property color colorQtGray9: "#cecfd5" readonly property color colorQtGray10: "#f3f3f4" - - // Light/dark versions of the colors above. - // Some UI elements always use a specific color regardless of theme, - // which is why we have both sets: so that those elements don't need to hard-code the hex string. - readonly property color themeColorQtGray1: darkTheme ? colorQtGray10 : colorQtGray1 - readonly property color themeColorQtGray2: darkTheme ? colorQtGray9 : colorQtGray2 - readonly property color themeColorQtGray3: darkTheme ? colorQtGray8 : colorQtGray3 - readonly property color themeColorQtGray4: darkTheme ? colorQtGray7 : colorQtGray4 - readonly property color themeColorQtGray5: darkTheme ? colorQtGray6 : colorQtGray5 - readonly property color themeColorQtGray6: darkTheme ? colorQtGray5 : colorQtGray6 - readonly property color themeColorQtGray7: darkTheme ? colorQtGray4 : colorQtGray7 - readonly property color themeColorQtGray8: darkTheme ? colorQtGray3 : colorQtGray8 - readonly property color themeColorQtGray9: darkTheme ? colorQtGray2 : colorQtGray9 - readonly property color themeColorQtGray10: darkTheme ? colorQtGray1 : colorQtGray10 - - property bool darkTheme: false - - function themeImagePath(baseImagePath) { - return baseImagePath + (darkTheme ? "-dark" : "-light") + ".png" - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -Item { - // Don't show the item when the StackView that contains us - // is being popped off the stack, as we use an x animation - // and hence would show pages that we shouldn't since we - // also don't have our own background. - visible: SwipeView.isCurrentItem || (SwipeView.view.contentItem.moving && (SwipeView.isPreviousItem || SwipeView.isNextItem)) -} Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/humidity@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/humidity@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/humidity.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/humidity.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/pressure@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/pressure@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/pressure.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/pressure.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunrise@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunrise@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunrise.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunrise.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunset@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunset@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/sunset.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/sunset.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/temperature@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/temperature@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/temperature.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/temperature.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/weather@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/weather@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/weather.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/weather.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/wind@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/wind@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/images/wind.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/images/wind.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 -import ".." +import QtQuick 2.7 +import QtQuick.Controls 2.0 as QQC2 import "../Style" import "weather.js" as WeatherData @@ -60,7 +59,7 @@ anchors.fill: parent - SwipeViewPage { + Item { id: weatherPage1 Row { @@ -69,7 +68,7 @@ Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/temperature") + source: "images/temperature.png" } Column { @@ -85,7 +84,7 @@ + " °F" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } Text { @@ -97,7 +96,7 @@ + " °F" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } Text { @@ -109,13 +108,13 @@ + " °F " : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } } } } - SwipeViewPage { + Item { id: weatherPage2 Column { @@ -129,7 +128,7 @@ Image { id: wImg anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/wind") + source: "images/wind.png" } Text { @@ -141,7 +140,7 @@ + " mph" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } } @@ -152,7 +151,7 @@ Image { id: hImg anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/humidity") + source: "images/humidity.png" } Text { @@ -164,13 +163,13 @@ + " %" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } } } } - SwipeViewPage { + Item { id: weatherPage3 Row { @@ -179,7 +178,7 @@ Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/pressure") + source: "images/pressure.png" } Column { @@ -195,7 +194,7 @@ + " hPa" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } Text { @@ -207,7 +206,7 @@ + " hPa" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } Text { @@ -219,13 +218,13 @@ + " hPa" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } } } } - SwipeViewPage { + Item { id: weatherPage4 Column { @@ -238,7 +237,7 @@ Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/sunrise") + source: "images/sunrise.png" } Text { @@ -250,7 +249,7 @@ : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } } @@ -260,7 +259,7 @@ Image { anchors.verticalCenter: parent.verticalCenter - source: UIStyle.themeImagePath("images/sunset") + source: "images/sunset.png" } Text { @@ -272,7 +271,7 @@ : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 } } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,12 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 -import ".." +import QtQuick 2.7 import "../Style" -SwipeViewPage { +Item { id: clock property int hours @@ -180,7 +178,7 @@ anchors.horizontalCenter: parent.horizontalCenter text: cityName - color: UIStyle.themeColorQtGray1 + color: UIStyle.colorQtGray1 font.pixelSize: UIStyle.fontSizeXS font.letterSpacing: 2 } Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 +import QtQuick 2.7 +import QtQuick.Controls 2.0 as QQC2 import "../Style" Item { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/wearable.cpp qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/wearable.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/wearable.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/wearable.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -51,24 +51,16 @@ #include #include #include -#include int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QCoreApplication::setApplicationName("Wearable"); - QCoreApplication::setOrganizationName("QtProject"); - QGuiApplication app(argc, argv); //! [style] QQuickStyle::setStyle(QStringLiteral("qrc:/qml/Style")); //! [style] - //! [icons] - QIcon::setThemeName(QStringLiteral("wearable")); - //! [icons] - QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/wearable.qml"))); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/wearable.qml qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/wearable.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/wearable.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/wearable.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,41 +48,23 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.3 as QQC2 -import Qt.labs.settings 1.0 +import QtQuick 2.7 +import QtQuick.Controls 2.0 as QQC2 import "qml" import "qml/Style" QQC2.ApplicationWindow { id: window + visible: true + width: 320 height: 320 - title: qsTr("Wearable") - - Settings { - id: settings - property bool wireless - property bool bluetooth - property int brightness - property bool darkTheme - property bool demoMode - } - - Binding { - target: UIStyle - property: "darkTheme" - value: settings.darkTheme - } - // We need the settings object both here and in SettingsPage, - // so for convenience, we declare it as a property of the root object so that - // it will be available to all of the QML files that we load. - property alias settings: settings + title: qsTr("Wearable") background: Image { - source: "images/background-" + (settings.darkTheme ? "dark" : "light") + ".png" + source: "images/background.png" } header: NaviButton { @@ -115,26 +97,4 @@ onLaunched: stackView.push(page) } } - - DemoMode { - stackView: stackView - } - - DemoModeIndicator { - id: demoModeIndicator - y: settings.demoMode ? -height : -height * 2 - anchors.horizontalCenter: parent.horizontalCenter - height: header.height - z: window.header.z + 1 - } - - MouseArea { - enabled: settings.demoMode - anchors.fill: parent - onClicked: { - // Stop demo mode and return to the launcher page. - settings.demoMode = false - stackView.pop(null) - } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/wearable.qrc qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/wearable.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/examples/quickcontrols2/wearable/wearable.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/examples/quickcontrols2/wearable/wearable.qrc 2018-03-21 07:59:29.000000000 +0000 @@ -3,101 +3,61 @@ wearable.qml qml/LauncherPage.qml qml/NaviButton.qml - icons/wearable/index.theme - icons/wearable/36x36/alarms.png - icons/wearable/36x36/fitness.png - icons/wearable/36x36/navigation.png - icons/wearable/36x36/notifications.png - icons/wearable/36x36/settings.png - icons/wearable/36x36/weather.png - icons/wearable/36x36/worldclock.png - icons/wearable/36x36@2/alarms.png - icons/wearable/36x36@2/fitness.png - icons/wearable/36x36@2/navigation.png - icons/wearable/36x36@2/notifications.png - icons/wearable/36x36@2/settings.png - icons/wearable/36x36@2/weather.png - icons/wearable/36x36@2/worldclock.png - images/background-light.png - images/background-dark.png + images/background.png images/back.png images/back@2x.png images/home.png images/home@2x.png qml/Alarms/AlarmsPage.qml + qml/Alarms/images/alarms.png + qml/Alarms/images/alarms@2x.png qml/Fitness/fitness.js qml/Fitness/FitnessPage.qml - qml/Fitness/images/man-running-light.png - qml/Fitness/images/man-running-light@2x.png - qml/Fitness/images/man-walking-light.png - qml/Fitness/images/man-walking-light@2x.png - qml/Fitness/images/man-running-dark.png - qml/Fitness/images/man-running-dark@2x.png - qml/Fitness/images/man-walking-dark.png - qml/Fitness/images/man-walking-dark@2x.png + qml/Fitness/images/fitness.png + qml/Fitness/images/fitness@2x.png + qml/Fitness/images/man-running.png + qml/Fitness/images/man-running@2x.png + qml/Fitness/images/man-walking.png + qml/Fitness/images/man-walking@2x.png qml/Navigation/navigation.js qml/Navigation/NavigationPage.qml qml/Navigation/RouteElement.qml qml/Navigation/walk_route.json qml/Navigation/images/end.png qml/Navigation/images/end@2x.png - qml/Navigation/images/leftturn-light.png - qml/Navigation/images/leftturn-light@2x.png - qml/Navigation/images/leftturn-dark.png - qml/Navigation/images/leftturn-dark@2x.png - qml/Navigation/images/navigation-light.png - qml/Navigation/images/navigation-light@2x.png - qml/Navigation/images/navigation-dark.png - qml/Navigation/images/navigation-dark@2x.png - qml/Navigation/images/rightturn-light.png - qml/Navigation/images/rightturn-light@2x.png - qml/Navigation/images/rightturn-dark.png - qml/Navigation/images/rightturn-dark@2x.png + qml/Navigation/images/leftturn.png + qml/Navigation/images/leftturn@2x.png + qml/Navigation/images/navigation.png + qml/Navigation/images/navigation@2x.png + qml/Navigation/images/rightturn.png + qml/Navigation/images/rightturn@2x.png qml/Navigation/images/start.png qml/Navigation/images/start@2x.png - qml/Navigation/images/straight-light.png - qml/Navigation/images/straight-light@2x.png - qml/Navigation/images/straight-dark.png - qml/Navigation/images/straight-dark@2x.png + qml/Navigation/images/straight.png + qml/Navigation/images/straight@2x.png qml/Navigation/images/uturn.png qml/Navigation/images/uturn@2x.png qml/Notifications/notifications.js qml/Notifications/NotificationsPage.qml - qml/Notifications/images/avatarf-light.png - qml/Notifications/images/avatarf-light@2x.png - qml/Notifications/images/avatarm-light.png - qml/Notifications/images/avatarm-light@2x.png - qml/Notifications/images/missedcall-light.png - qml/Notifications/images/missedcall-light@2x.png - qml/Notifications/images/avatarf-dark.png - qml/Notifications/images/avatarf-dark@2x.png - qml/Notifications/images/avatarm-dark.png - qml/Notifications/images/avatarm-dark@2x.png - qml/Notifications/images/missedcall-dark.png - qml/Notifications/images/missedcall-dark@2x.png + qml/Notifications/images/avatarf.png + qml/Notifications/images/avatarf@2x.png + qml/Notifications/images/avatarm.png + qml/Notifications/images/avatarm@2x.png + qml/Notifications/images/missedcall.png + qml/Notifications/images/missedcall@2x.png + qml/Notifications/images/notifications.png + qml/Notifications/images/notifications@2x.png qml/Settings/SettingsPage.qml - qml/Settings/images/bluetooth-light.png - qml/Settings/images/bluetooth-light@2x.png - qml/Settings/images/brightness-light.png - qml/Settings/images/brightness-light@2x.png - qml/Settings/images/demo-mode-light.png - qml/Settings/images/demo-mode-light@2x.png - qml/Settings/images/demo-mode-dark.png - qml/Settings/images/demo-mode-dark@2x.png - qml/Settings/images/demo-mode-white.png - qml/Settings/images/demo-mode-white@2x.png - qml/Settings/images/theme-light.png - qml/Settings/images/theme-light@2x.png - qml/Settings/images/wifi-light.png - qml/Settings/images/wifi-light@2x.png - qml/Settings/images/bluetooth-dark.png - qml/Settings/images/bluetooth-dark@2x.png - qml/Settings/images/brightness-dark.png - qml/Settings/images/brightness-dark@2x.png - qml/Settings/images/theme-dark.png - qml/Settings/images/theme-dark@2x.png - qml/Settings/images/wifi-dark.png - qml/Settings/images/wifi-dark@2x.png + qml/Settings/images/bluetooth.png + qml/Settings/images/bluetooth@2x.png + qml/Settings/images/brightness.png + qml/Settings/images/brightness@2x.png + qml/Settings/images/contrast.png + qml/Settings/images/contrast@2x.png + qml/Settings/images/settings.png + qml/Settings/images/settings@2x.png + qml/Settings/images/wifi.png + qml/Settings/images/wifi@2x.png qml/Style/qmldir qml/Style/PageIndicator.qml qml/Style/Slider.qml @@ -106,30 +66,20 @@ qml/Weather/weather.js qml/Weather/weather.json qml/Weather/WeatherPage.qml - qml/Weather/images/humidity-light.png - qml/Weather/images/humidity-light@2x.png - qml/Weather/images/pressure-light.png - qml/Weather/images/pressure-light@2x.png - qml/Weather/images/sunrise-light.png - qml/Weather/images/sunrise-light@2x.png - qml/Weather/images/sunset-light.png - qml/Weather/images/sunset-light@2x.png - qml/Weather/images/temperature-light.png - qml/Weather/images/temperature-light@2x.png - qml/Weather/images/wind-light.png - qml/Weather/images/wind-light@2x.png - qml/Weather/images/humidity-dark.png - qml/Weather/images/humidity-dark@2x.png - qml/Weather/images/pressure-dark.png - qml/Weather/images/pressure-dark@2x.png - qml/Weather/images/sunrise-dark.png - qml/Weather/images/sunrise-dark@2x.png - qml/Weather/images/sunset-dark.png - qml/Weather/images/sunset-dark@2x.png - qml/Weather/images/temperature-dark.png - qml/Weather/images/temperature-dark@2x.png - qml/Weather/images/wind-dark.png - qml/Weather/images/wind-dark@2x.png + qml/Weather/images/humidity.png + qml/Weather/images/humidity@2x.png + qml/Weather/images/pressure.png + qml/Weather/images/pressure@2x.png + qml/Weather/images/sunrise.png + qml/Weather/images/sunrise@2x.png + qml/Weather/images/sunset.png + qml/Weather/images/sunset@2x.png + qml/Weather/images/temperature.png + qml/Weather/images/temperature@2x.png + qml/Weather/images/weather.png + qml/Weather/images/weather@2x.png + qml/Weather/images/wind.png + qml/Weather/images/wind@2x.png qml/WorldClock/Clock.qml qml/WorldClock/WorldClockPage.qml qml/WorldClock/images/center.png @@ -148,8 +98,7 @@ qml/WorldClock/images/swissnighthour@2x.png qml/WorldClock/images/swissnightminute.png qml/WorldClock/images/swissnightminute@2x.png - qml/SwipeViewPage.qml - qml/DemoMode.qml - qml/DemoModeIndicator.qml + qml/WorldClock/images/worldclock.png + qml/WorldClock/images/worldclock@2x.png diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickanimatednode_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickanimatednode_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickanimatednode_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickanimatednode_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickanimatednode_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickattachedobject_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickattachedobject_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickattachedobject_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickattachedobject_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickattachedobject_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickchecklabel_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickchecklabel_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickchecklabel_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickchecklabel_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickchecklabel_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickclippedtext_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickclippedtext_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickclippedtext_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickclippedtext_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickclippedtext_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickcolorimage_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickcolorimage_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickcolorimage_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickcolorimage_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickcolorimage_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickcolor_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickcolor_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickcolor_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickcolor_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickcolor_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconimage_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconimage_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconimage_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconimage_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickiconimage_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconimage_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconimage_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconimage_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconimage_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickiconimage_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconlabel_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconlabel_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconlabel_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconlabel_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickiconlabel_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconlabel_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconlabel_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconlabel_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickiconlabel_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickiconlabel_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickitemgroup_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickitemgroup_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickitemgroup_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickitemgroup_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickitemgroup_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickmnemoniclabel_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickmnemoniclabel_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickmnemoniclabel_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickmnemoniclabel_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickmnemoniclabel_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickpaddedrectangle_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickpaddedrectangle_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickpaddedrectangle_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickpaddedrectangle_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickpaddedrectangle_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickplaceholdertext_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickplaceholdertext_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickplaceholdertext_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickplaceholdertext_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickplaceholdertext_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyle_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyle_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyle_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyle_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickstyle_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleplugin_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleplugin_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleplugin_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleplugin_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickstyleplugin_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleselector_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleselector_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleselector_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleselector_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickstyleselector_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleselector_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleselector_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleselector_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquickstyleselector_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquickstyleselector_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquicktumblerview_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquicktumblerview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquicktumblerview_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qquicktumblerview_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qquicktumblerview_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qtquickcontrols2global_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qtquickcontrols2global_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qtquickcontrols2global_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.12.5/QtQuickControls2/private/qtquickcontrols2global_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quickcontrols2/qtquickcontrols2global_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickanimatednode_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickanimatednode_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickanimatednode_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickanimatednode_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickanimatednode_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickclippedtext_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickclippedtext_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickclippedtext_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickclippedtext_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickclippedtext_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickcolorimageprovider_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickcolorimageprovider_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickcolorimageprovider_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickcolorimageprovider_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickcolorimageprovider_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickitemgroup_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickitemgroup_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickitemgroup_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickitemgroup_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickitemgroup_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickpaddedrectangle_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickpaddedrectangle_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickpaddedrectangle_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickpaddedrectangle_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickpaddedrectangle_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickplaceholdertext_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickplaceholdertext_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickplaceholdertext_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickplaceholdertext_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickplaceholdertext_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickproxytheme_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickproxytheme_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickproxytheme_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickproxytheme_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickproxytheme_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleattached_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleattached_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleattached_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleattached_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickstyleattached_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyle_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyle_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyle_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyle_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickstyle_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleplugin_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleplugin_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleplugin_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleplugin_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickstyleplugin_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleselector_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleselector_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleselector_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleselector_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickstyleselector_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleselector_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleselector_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleselector_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquickstyleselector_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquickstyleselector_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquicktumblerview_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquicktumblerview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquicktumblerview_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qquicktumblerview_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qquicktumblerview_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qtquickcontrols2global_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qtquickcontrols2global_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qtquickcontrols2global_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/5.9.5/QtQuickControls2/private/qtquickcontrols2global_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quickcontrols2/qtquickcontrols2global_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/headers.pri qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/headers.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/headers.pri 2019-09-06 12:05:23.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/headers.pri 2018-04-11 07:49:04.000000000 +0000 @@ -1,6 +1,7 @@ -SYNCQT.HEADER_FILES = qquickstyle.h qtquickcontrols2global.h -SYNCQT.GENERATED_HEADER_FILES = QQuickStyle qtquickcontrols2version.h QtQuickControls2Version QtQuickControls2 -SYNCQT.PRIVATE_HEADER_FILES = qquickanimatednode_p.h qquickattachedobject_p.h qquickchecklabel_p.h qquickclippedtext_p.h qquickcolor_p.h qquickcolorimage_p.h qquickiconimage_p.h qquickiconimage_p_p.h qquickiconlabel_p.h qquickiconlabel_p_p.h qquickitemgroup_p.h qquickmnemoniclabel_p.h qquickpaddedrectangle_p.h qquickplaceholdertext_p.h qquickstyle_p.h qquickstyleplugin_p.h qquickstyleselector_p.h qquickstyleselector_p_p.h qquicktumblerview_p.h qtquickcontrols2global_p.h +SYNCQT.HEADER_FILES = qquickstyle.h qtquickcontrols2global.h ../../include/QtQuickControls2/qtquickcontrols2version.h ../../include/QtQuickControls2/QtQuickControls2 +SYNCQT.HEADER_CLASSES = ../../include/QtQuickControls2/QQuickStyle ../../include/QtQuickControls2/QtQuickControls2Version +SYNCQT.PRIVATE_HEADER_FILES = qquickanimatednode_p.h qquickclippedtext_p.h qquickcolorimageprovider_p.h qquickitemgroup_p.h qquickpaddedrectangle_p.h qquickplaceholdertext_p.h qquickproxytheme_p.h qquickstyle_p.h qquickstyleattached_p.h qquickstyleplugin_p.h qquickstyleselector_p.h qquickstyleselector_p_p.h qquicktumblerview_p.h qtquickcontrols2global_p.h +SYNCQT.INJECTED_PRIVATE_HEADER_FILES = SYNCQT.QPA_HEADER_FILES = SYNCQT.CLEAN_HEADER_FILES = qquickstyle.h qtquickcontrols2global.h SYNCQT.INJECTIONS = diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/qtquickcontrols2version.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/qtquickcontrols2version.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickControls2/qtquickcontrols2version.h 2019-09-06 12:05:23.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickControls2/qtquickcontrols2version.h 2018-04-11 07:49:04.000000000 +0000 @@ -2,8 +2,8 @@ #ifndef QT_QTQUICKCONTROLS2_VERSION_H #define QT_QTQUICKCONTROLS2_VERSION_H -#define QTQUICKCONTROLS2_VERSION_STR "5.12.5" +#define QTQUICKCONTROLS2_VERSION_STR "5.9.5" -#define QTQUICKCONTROLS2_VERSION 0x050C05 +#define QTQUICKCONTROLS2_VERSION 0x050905 #endif // QT_QTQUICKCONTROLS2_VERSION_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickabstractbutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickabstractbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickabstractbutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickabstractbutton_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickabstractbutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickabstractbutton_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickabstractbutton_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickabstractbutton_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickabstractbutton_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickabstractbutton_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickactiongroup_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickactiongroup_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickactiongroup_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickactiongroup_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickactiongroup_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickaction_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickaction_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickaction_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickaction_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickaction_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickaction_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickaction_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickaction_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickaction_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickaction_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickapplicationwindow_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickapplicationwindow_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickapplicationwindow_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickapplicationwindow_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickapplicationwindow_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbusyindicator_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbusyindicator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbusyindicator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbusyindicator_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickbusyindicator_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbuttongroup_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbuttongroup_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbuttongroup_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbuttongroup_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickbuttongroup_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbutton_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickbutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbutton_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbutton_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbutton_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickbutton_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickbutton_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcheckbox_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcheckbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcheckbox_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcheckbox_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickcheckbox_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcheckdelegate_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcheckdelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcheckdelegate_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcheckdelegate_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickcheckdelegate_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcombobox_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcombobox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcombobox_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcombobox_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickcombobox_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontainer_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontainer_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontainer_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontainer_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickcontainer_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontainer_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontainer_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontainer_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontainer_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickcontainer_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontentitem_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontentitem_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontentitem_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontentitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickcontentitem_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontrol_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontrol_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontrol_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontrol_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickcontrol_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontrol_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontrol_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontrol_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickcontrol_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickcontrol_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdeferredexecute_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdeferredexecute_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdeferredexecute_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdeferredexecute_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickdeferredexecute_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdeferredpointer_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdeferredpointer_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdeferredpointer_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdeferredpointer_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickdeferredpointer_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdelaybutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdelaybutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdelaybutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdelaybutton_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickdelaybutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickdialogbuttonbox_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickdialogbuttonbox_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialog_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialog_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialog_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialog_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickdialog_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialog_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialog_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialog_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdialog_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickdialog_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdial_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdial_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdial_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdial_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickdial_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdrawer_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdrawer_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdrawer_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdrawer_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickdrawer_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdrawer_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdrawer_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdrawer_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickdrawer_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickdrawer_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickframe_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickframe_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickframe_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickframe_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickframe_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickframe_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickframe_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickframe_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickframe_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickframe_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickgroupbox_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickgroupbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickgroupbox_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickgroupbox_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickgroupbox_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickicon_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickicon_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickicon_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickicon_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickicon_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickitemdelegate_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickitemdelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickitemdelegate_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickitemdelegate_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickitemdelegate_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickitemdelegate_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickitemdelegate_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickitemdelegate_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickitemdelegate_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickitemdelegate_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicklabel_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicklabel_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicklabel_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicklabel_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicklabel_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicklabel_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicklabel_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicklabel_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicklabel_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicklabel_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubaritem_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubaritem_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubaritem_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubaritem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickmenubaritem_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubaritem_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubaritem_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubaritem_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubaritem_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickmenubaritem_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubar_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubar_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickmenubar_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubar_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubar_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubar_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenubar_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickmenubar_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuitem_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuitem_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuitem_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickmenuitem_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuitem_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuitem_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuitem_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuitem_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickmenuitem_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenu_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenu_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenu_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenu_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickmenu_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenu_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenu_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenu_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenu_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickmenu_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuseparator_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuseparator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuseparator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickmenuseparator_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickmenuseparator_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickoverlay_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickoverlay_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickoverlay_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickoverlay_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickoverlay_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickoverlay_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickoverlay_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickoverlay_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickoverlay_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickoverlay_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpageindicator_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpageindicator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpageindicator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpageindicator_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpageindicator_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpage_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpage_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpage_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpage_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpage_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpage_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpage_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpage_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpage_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpage_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpalette_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpalette_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpalette_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpalette_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpalette_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpaletteprovider_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpaletteprovider_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpaletteprovider_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpaletteprovider_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpaletteprovider_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpane_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpane_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpane_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpane_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpane_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpane_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpane_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpane_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpane_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpane_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupanchors_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupanchors_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupanchors_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupanchors_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpopupanchors_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupanchors_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupanchors_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupanchors_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupanchors_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpopupanchors_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupitem_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupitem_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupitem_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopupitem_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpopupitem_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopup_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopup_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopup_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopup_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpopup_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopuppositioner_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopuppositioner_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopuppositioner_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopuppositioner_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpopuppositioner_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopup_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopup_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopup_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpopup_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpopup_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpresshandler_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpresshandler_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpresshandler_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickpresshandler_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickpresshandler_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickprogressbar_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickprogressbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickprogressbar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickprogressbar_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickprogressbar_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickradiobutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickradiobutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickradiobutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickradiobutton_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickradiobutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickradiodelegate_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickradiodelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickradiodelegate_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickradiodelegate_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickradiodelegate_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickrangeslider_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickrangeslider_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickrangeslider_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickrangeslider_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickrangeslider_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickroundbutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickroundbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickroundbutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickroundbutton_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickroundbutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollbar_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollbar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollbar_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickscrollbar_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollbar_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollbar_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollbar_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollbar_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickscrollbar_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollindicator_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollindicator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollindicator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollindicator_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickscrollindicator_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollview_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollview_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickscrollview_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickscrollview_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickshortcutcontext_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickshortcutcontext_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickshortcutcontext_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickshortcutcontext_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickshortcutcontext_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickslider_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickslider_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickslider_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickslider_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickslider_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickspinbox_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickspinbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickspinbox_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickspinbox_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickspinbox_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackelement_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackelement_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackelement_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackelement_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickstackelement_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstacktransition_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstacktransition_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstacktransition_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstacktransition_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickstacktransition_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackview_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackview_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackview_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickstackview_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackview_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackview_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackview_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickstackview_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickstackview_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipedelegate_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipedelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipedelegate_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipedelegate_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickswipedelegate_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipedelegate_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipedelegate_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipedelegate_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipedelegate_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickswipedelegate_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipe_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipe_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipe_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipe_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickswipe_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipeview_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipeview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipeview_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswipeview_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickswipeview_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswitchdelegate_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswitchdelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswitchdelegate_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswitchdelegate_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickswitchdelegate_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswitch_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswitch_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswitch_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickswitch_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickswitch_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktabbar_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktabbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktabbar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktabbar_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktabbar_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktabbutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktabbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktabbutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktabbutton_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktabbutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextarea_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextarea_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextarea_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextarea_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktextarea_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextarea_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextarea_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextarea_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextarea_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktextarea_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextfield_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextfield_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextfield_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextfield_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktextfield_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextfield_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextfield_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextfield_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktextfield_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktextfield_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktheme_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktheme_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktheme_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktheme_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktheme_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktheme_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktheme_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktheme_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktheme_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktheme_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolbar_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolbar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolbar_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktoolbar_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolbutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolbutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolbutton_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktoolbutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolseparator_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolseparator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolseparator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktoolseparator_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktoolseparator_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktooltip_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktooltip_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktooltip_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktooltip_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktooltip_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktumbler_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktumbler_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktumbler_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktumbler_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktumbler_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktumbler_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktumbler_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktumbler_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquicktumbler_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquicktumbler_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickvelocitycalculator_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickvelocitycalculator_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickvelocitycalculator_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qquickvelocitycalculator_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qquickvelocitycalculator_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qtquicktemplates2global_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qtquicktemplates2global_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qtquicktemplates2global_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.12.5/QtQuickTemplates2/private/qtquicktemplates2global_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/quicktemplates2/qtquicktemplates2global_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickabstractbutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickabstractbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickabstractbutton_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickabstractbutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickabstractbutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickabstractbutton_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickabstractbutton_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickabstractbutton_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickabstractbutton_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickabstractbutton_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickapplicationwindow_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickapplicationwindow_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickapplicationwindow_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickapplicationwindow_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickapplicationwindow_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbusyindicator_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbusyindicator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbusyindicator_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbusyindicator_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickbusyindicator_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbuttongroup_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbuttongroup_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbuttongroup_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbuttongroup_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickbuttongroup_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbutton_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickbutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbutton_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbutton_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbutton_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickbutton_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickbutton_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcheckbox_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcheckbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcheckbox_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcheckbox_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickcheckbox_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcheckdelegate_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcheckdelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcheckdelegate_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcheckdelegate_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickcheckdelegate_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcombobox_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcombobox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcombobox_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcombobox_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickcombobox_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontainer_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontainer_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontainer_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontainer_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickcontainer_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontainer_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontainer_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontainer_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontainer_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickcontainer_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontrol_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontrol_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontrol_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontrol_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickcontrol_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontrol_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontrol_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontrol_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickcontrol_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickcontrol_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdeferredexecute_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdeferredexecute_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdeferredexecute_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdeferredexecute_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickdeferredexecute_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdeferredpointer_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdeferredpointer_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdeferredpointer_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdeferredpointer_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickdeferredpointer_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdelaybutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdelaybutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdelaybutton_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdelaybutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickdelaybutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickdialogbuttonbox_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialogbuttonbox_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickdialogbuttonbox_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialog_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialog_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialog_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialog_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickdialog_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialog_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialog_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialog_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdialog_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickdialog_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdial_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdial_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdial_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdial_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickdial_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdrawer_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdrawer_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdrawer_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdrawer_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickdrawer_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdrawer_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdrawer_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdrawer_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickdrawer_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickdrawer_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickframe_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickframe_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickframe_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickframe_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickframe_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickframe_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickframe_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickframe_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickframe_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickframe_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickgroupbox_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickgroupbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickgroupbox_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickgroupbox_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickgroupbox_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickitemdelegate_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickitemdelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickitemdelegate_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickitemdelegate_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickitemdelegate_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickitemdelegate_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickitemdelegate_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickitemdelegate_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickitemdelegate_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickitemdelegate_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicklabel_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicklabel_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicklabel_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicklabel_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicklabel_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicklabel_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicklabel_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicklabel_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicklabel_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicklabel_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenuitem_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenuitem_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenuitem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenuitem_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickmenuitem_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenu_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenu_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenu_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenu_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickmenu_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenu_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenu_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenu_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenu_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickmenu_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenuseparator_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenuseparator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenuseparator_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickmenuseparator_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickmenuseparator_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickoverlay_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickoverlay_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickoverlay_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickoverlay_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickoverlay_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickoverlay_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickoverlay_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickoverlay_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickoverlay_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickoverlay_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpageindicator_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpageindicator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpageindicator_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpageindicator_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickpageindicator_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpagelayout_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpagelayout_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpagelayout_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpagelayout_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickpagelayout_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpage_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpage_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpage_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpage_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickpage_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpane_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpane_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpane_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpane_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickpane_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpane_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpane_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpane_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpane_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickpane_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopupitem_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopupitem_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopupitem_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopupitem_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickpopupitem_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopup_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopup_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopup_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopup_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickpopup_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopuppositioner_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopuppositioner_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopuppositioner_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopuppositioner_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickpopuppositioner_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopup_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopup_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopup_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpopup_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickpopup_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpresshandler_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpresshandler_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpresshandler_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickpresshandler_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickpresshandler_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickprogressbar_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickprogressbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickprogressbar_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickprogressbar_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickprogressbar_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickradiobutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickradiobutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickradiobutton_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickradiobutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickradiobutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickradiodelegate_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickradiodelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickradiodelegate_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickradiodelegate_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickradiodelegate_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickrangeslider_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickrangeslider_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickrangeslider_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickrangeslider_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickrangeslider_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickroundbutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickroundbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickroundbutton_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickroundbutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickroundbutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollbar_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollbar_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollbar_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickscrollbar_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollbar_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollbar_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollbar_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollbar_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickscrollbar_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollindicator_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollindicator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollindicator_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollindicator_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickscrollindicator_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollview_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollview_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickscrollview_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickscrollview_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickshortcutcontext_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickshortcutcontext_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickshortcutcontext_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickshortcutcontext_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickshortcutcontext_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickslider_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickslider_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickslider_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickslider_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickslider_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickspinbox_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickspinbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickspinbox_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickspinbox_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickspinbox_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackelement_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackelement_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackelement_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackelement_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickstackelement_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstacktransition_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstacktransition_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstacktransition_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstacktransition_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickstacktransition_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackview_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackview_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackview_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickstackview_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackview_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackview_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackview_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickstackview_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickstackview_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipedelegate_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipedelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipedelegate_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipedelegate_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickswipedelegate_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipedelegate_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipedelegate_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipedelegate_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipedelegate_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickswipedelegate_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipe_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipe_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipe_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipe_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickswipe_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipeview_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipeview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipeview_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswipeview_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickswipeview_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswitchdelegate_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswitchdelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswitchdelegate_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswitchdelegate_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickswitchdelegate_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswitch_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswitch_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswitch_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickswitch_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickswitch_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktabbar_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktabbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktabbar_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktabbar_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktabbar_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktabbutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktabbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktabbutton_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktabbutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktabbutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextarea_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextarea_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextarea_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextarea_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktextarea_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextarea_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextarea_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextarea_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextarea_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktextarea_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextfield_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextfield_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextfield_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextfield_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktextfield_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextfield_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextfield_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextfield_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktextfield_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktextfield_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolbar_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolbar_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolbar_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktoolbar_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolbutton_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolbutton_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolbutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktoolbutton_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolseparator_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolseparator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolseparator_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktoolseparator_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktoolseparator_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktooltip_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktooltip_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktooltip_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktooltip_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktooltip_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktumbler_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktumbler_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktumbler_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktumbler_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktumbler_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktumbler_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktumbler_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktumbler_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquicktumbler_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquicktumbler_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickvelocitycalculator_p_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickvelocitycalculator_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickvelocitycalculator_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qquickvelocitycalculator_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qquickvelocitycalculator_p_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qtquicktemplates2global_p.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qtquicktemplates2global_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qtquicktemplates2global_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/5.9.5/QtQuickTemplates2/private/qtquicktemplates2global_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/quicktemplates2/qtquicktemplates2global_p.h" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/headers.pri qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/headers.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/headers.pri 2019-09-06 12:05:23.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/headers.pri 2018-04-11 07:49:04.000000000 +0000 @@ -1,6 +1,7 @@ -SYNCQT.HEADER_FILES = -SYNCQT.GENERATED_HEADER_FILES = qtquicktemplates2version.h QtQuickTemplates2Version QtQuickTemplates2 -SYNCQT.PRIVATE_HEADER_FILES = qquickabstractbutton_p.h qquickabstractbutton_p_p.h qquickaction_p.h qquickaction_p_p.h qquickactiongroup_p.h qquickapplicationwindow_p.h qquickbusyindicator_p.h qquickbutton_p.h qquickbutton_p_p.h qquickbuttongroup_p.h qquickcheckbox_p.h qquickcheckdelegate_p.h qquickcombobox_p.h qquickcontainer_p.h qquickcontainer_p_p.h qquickcontentitem_p.h qquickcontrol_p.h qquickcontrol_p_p.h qquickdeferredexecute_p_p.h qquickdeferredpointer_p_p.h qquickdelaybutton_p.h qquickdial_p.h qquickdialog_p.h qquickdialog_p_p.h qquickdialogbuttonbox_p.h qquickdialogbuttonbox_p_p.h qquickdrawer_p.h qquickdrawer_p_p.h qquickframe_p.h qquickframe_p_p.h qquickgroupbox_p.h qquickicon_p.h qquickitemdelegate_p.h qquickitemdelegate_p_p.h qquicklabel_p.h qquicklabel_p_p.h qquickmenu_p.h qquickmenu_p_p.h qquickmenubar_p.h qquickmenubar_p_p.h qquickmenubaritem_p.h qquickmenubaritem_p_p.h qquickmenuitem_p.h qquickmenuitem_p_p.h qquickmenuseparator_p.h qquickoverlay_p.h qquickoverlay_p_p.h qquickpage_p.h qquickpage_p_p.h qquickpageindicator_p.h qquickpalette_p.h qquickpaletteprovider_p.h qquickpane_p.h qquickpane_p_p.h qquickpopup_p.h qquickpopup_p_p.h qquickpopupanchors_p.h qquickpopupanchors_p_p.h qquickpopupitem_p_p.h qquickpopuppositioner_p_p.h qquickpresshandler_p_p.h qquickprogressbar_p.h qquickradiobutton_p.h qquickradiodelegate_p.h qquickrangeslider_p.h qquickroundbutton_p.h qquickscrollbar_p.h qquickscrollbar_p_p.h qquickscrollindicator_p.h qquickscrollview_p.h qquickshortcutcontext_p_p.h qquickslider_p.h qquickspinbox_p.h qquickstackelement_p_p.h qquickstacktransition_p_p.h qquickstackview_p.h qquickstackview_p_p.h qquickswipe_p.h qquickswipedelegate_p.h qquickswipedelegate_p_p.h qquickswipeview_p.h qquickswitch_p.h qquickswitchdelegate_p.h qquicktabbar_p.h qquicktabbutton_p.h qquicktextarea_p.h qquicktextarea_p_p.h qquicktextfield_p.h qquicktextfield_p_p.h qquicktheme_p.h qquicktheme_p_p.h qquicktoolbar_p.h qquicktoolbutton_p.h qquicktoolseparator_p.h qquicktooltip_p.h qquicktumbler_p.h qquicktumbler_p_p.h qquickvelocitycalculator_p_p.h qtquicktemplates2global_p.h +SYNCQT.HEADER_FILES = ../../include/QtQuickTemplates2/qtquicktemplates2version.h ../../include/QtQuickTemplates2/QtQuickTemplates2 +SYNCQT.HEADER_CLASSES = ../../include/QtQuickTemplates2/QtQuickTemplates2Version +SYNCQT.PRIVATE_HEADER_FILES = qquickabstractbutton_p.h qquickabstractbutton_p_p.h qquickapplicationwindow_p.h qquickbusyindicator_p.h qquickbutton_p.h qquickbutton_p_p.h qquickbuttongroup_p.h qquickcheckbox_p.h qquickcheckdelegate_p.h qquickcombobox_p.h qquickcontainer_p.h qquickcontainer_p_p.h qquickcontrol_p.h qquickcontrol_p_p.h qquickdeferredexecute_p_p.h qquickdeferredpointer_p_p.h qquickdelaybutton_p.h qquickdial_p.h qquickdialog_p.h qquickdialog_p_p.h qquickdialogbuttonbox_p.h qquickdialogbuttonbox_p_p.h qquickdrawer_p.h qquickdrawer_p_p.h qquickframe_p.h qquickframe_p_p.h qquickgroupbox_p.h qquickitemdelegate_p.h qquickitemdelegate_p_p.h qquicklabel_p.h qquicklabel_p_p.h qquickmenu_p.h qquickmenu_p_p.h qquickmenuitem_p.h qquickmenuseparator_p.h qquickoverlay_p.h qquickoverlay_p_p.h qquickpage_p.h qquickpageindicator_p.h qquickpagelayout_p_p.h qquickpane_p.h qquickpane_p_p.h qquickpopup_p.h qquickpopup_p_p.h qquickpopupitem_p_p.h qquickpopuppositioner_p_p.h qquickpresshandler_p_p.h qquickprogressbar_p.h qquickradiobutton_p.h qquickradiodelegate_p.h qquickrangeslider_p.h qquickroundbutton_p.h qquickscrollbar_p.h qquickscrollbar_p_p.h qquickscrollindicator_p.h qquickscrollview_p.h qquickshortcutcontext_p_p.h qquickslider_p.h qquickspinbox_p.h qquickstackelement_p_p.h qquickstacktransition_p_p.h qquickstackview_p.h qquickstackview_p_p.h qquickswipe_p.h qquickswipedelegate_p.h qquickswipedelegate_p_p.h qquickswipeview_p.h qquickswitch_p.h qquickswitchdelegate_p.h qquicktabbar_p.h qquicktabbutton_p.h qquicktextarea_p.h qquicktextarea_p_p.h qquicktextfield_p.h qquicktextfield_p_p.h qquicktoolbar_p.h qquicktoolbutton_p.h qquicktoolseparator_p.h qquicktooltip_p.h qquicktumbler_p.h qquicktumbler_p_p.h qquickvelocitycalculator_p_p.h qtquicktemplates2global_p.h +SYNCQT.INJECTED_PRIVATE_HEADER_FILES = SYNCQT.QPA_HEADER_FILES = SYNCQT.CLEAN_HEADER_FILES = SYNCQT.INJECTIONS = diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/qtquicktemplates2version.h qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/qtquicktemplates2version.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/include/QtQuickTemplates2/qtquicktemplates2version.h 2019-09-06 12:05:23.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/include/QtQuickTemplates2/qtquicktemplates2version.h 2018-04-11 07:49:04.000000000 +0000 @@ -2,8 +2,8 @@ #ifndef QT_QTQUICKTEMPLATES2_VERSION_H #define QT_QTQUICKTEMPLATES2_VERSION_H -#define QTQUICKTEMPLATES2_VERSION_STR "5.12.5" +#define QTQUICKTEMPLATES2_VERSION_STR "5.9.5" -#define QTQUICKTEMPLATES2_VERSION 0x050C05 +#define QTQUICKTEMPLATES2_VERSION 0x050905 #endif // QT_QTQUICKTEMPLATES2_VERSION_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/.qmake.conf qtquickcontrols2-opensource-src-5.9.5/.qmake.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/.qmake.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/.qmake.conf 2018-03-21 07:59:29.000000000 +0000 @@ -4,4 +4,4 @@ QQC2_SOURCE_TREE = $$PWD -MODULE_VERSION = 5.12.5 +MODULE_VERSION = 5.9.5 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/.QT-ENTERPRISE-LICENSE-AGREEMENT qtquickcontrols2-opensource-src-5.9.5/.QT-ENTERPRISE-LICENSE-AGREEMENT --- qtquickcontrols2-opensource-src-5.12.5+dfsg/.QT-ENTERPRISE-LICENSE-AGREEMENT 2019-09-06 12:05:25.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/.QT-ENTERPRISE-LICENSE-AGREEMENT 1970-01-01 00:00:00.000000000 +0000 @@ -1,1089 +0,0 @@ -QT LICENSE AGREEMENT -Agreement version 4.1 -This License Agreement (“Agreement”) is a legal agreement between The Qt Company -(as defined below) and the Licensee (as defined below) for the license of -Licensed Software (as defined below). Capitalized terms used herein are defined -in Section 1. -WHEREAS: - -(A) Licensee wishes to use the Licensed Software for the purpose of developing - and distributing Applications and/or Devices; and -(B) The Qt Company is willing to grant the Licensee a right to use Licensed - Software for such purpose pursuant to term and conditions of this Agreement. - -NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: - -1. DEFINITIONS -“Affiliate” of a Party shall mean an entity (i) which is directly or indirectly -controlling such Party; (ii) which is under the same direct or indirect -ownership or control as such Party; or (iii) which is directly or indirectly -owned or controlled by such Party. For these purposes, an entity shall be -treated as being controlled by another if that other entity has fifty percent -(50 %) or more of the votes in such entity, is able to direct its affairs and/or -to control the composition of its board of directors or equivalent body. - -“Add-on Products” shall mean The Qt Company’s specific add-on software products -(for example Qt Safe Renderer, Qt for Automation, Qt Application Manager), which -are not licensed as part of The Qt Company’s standard offering, but shall be -included into the scope of Licensed Software only if so specifically agreed -between the Parties. - -“Applications” shall mean Licensee's software products created using the -Licensed Software, which may include the Redistributables, or part thereof. - -“Contractor(s)” shall mean third party consultants, distributors and contractors -performing services to a Party under applicable contractual arrangement. - -“Customer(s)” shall mean Licensee’s end users to whom Licensee, directly or -indirectly, distributes copies of the Redistributables. - -“Deployment Platforms” shall mean operating systems specified in the License -Certificate, in which the Redistributables can be distributed pursuant to the -terms and conditions of this Agreement. - -“Designated User(s)” shall mean the employee(s) of Licensee or Licensee’s -Affiliates acting within the scope of their employment or Licensee's Contractors -acting within the scope of their services for Licensee and on behalf of -Licensee. Designated Users shall be named in the License Certificate. - -“Development License” shall mean the license needed by the Licensee for each -Designated User to use the Licensed Software under the license grant described -in Section 3.1 of this Agreement. Development Licenses are available separately -for Qt for Application Development (desktop) and Qt for Device Creation -(embedded) products, each product having its designated scope and purpose of -use. Distribution Licenses are always connected to Qt for Device Creation -product only. - -“Development Platforms” shall mean those operating systems specified in the -License Certificate, in which the Licensed Software can be used under the -Development License, but not distributed in any form or used for any other -purpose. - -“Devices” shall mean hardware devices or products that 1) are manufactured -and/or distributed by the Licensee or its Affiliates or Contractors, and 2) -(i) incorporate or integrate the Redistributables or parts thereof; or (ii) do -not incorporate or integrate the Redistributables at the time of distribution, -but where, when used by a Customer, the main user interface or substantial -functionality of such device is provided by Application(s) or otherwise depends -on the Licensed Software. Devices shall be specified in Appendix 2 or in a -quote. - -“Distribution License(s)” shall mean the license required for distribution of -Redistributables in connection with Devices pursuant to license grant described -in Section 3.3 of this Agreement. - -“Distribution License Packs” shall mean set of prepaid Distribution Licenses for -distribution of Redistributables, as defined in The Qt Company’s standard price -list, quote, Purchase Order confirmation or in an appendix hereto, as the case -may be. - -“Intellectual Property Rights” shall mean patents (including utility models), -design patents, and designs (whether or not capable of registration), chip -topography rights and other like protection, copyrights, trademarks, service -marks, trade names, logos or other words or symbols and any other form of -statutory protection of any kind and applications for any of the foregoing as -well as any trade secrets. - -“License Certificate” shall mean a certificate generated by The Qt Company for -each Designated User respectively upon them downloading the Licensed Software. -License Certificate will be available under respective Designated User’s Qt -Account at account.qt.io and it will specify the Designated User, the -Development Platforms, Deployment Platforms and the License Term. The terms of -the License Certificate are considered part of this Agreement and shall be -updated from time to time to reflect any agreed changes to the foregoing terms -relating to Designated User’s rights to the Licensed Software. - -“License Fee” shall mean the fee charged to the Licensee for rights granted -under the terms of this Agreement. - -“License Term” shall mean the agreed validity period of the Development License -of the respective Designated User, during which time the Designated User is -entitled to use the Licensed Software, as set forth in the respective License -Certificate. - -“Licensed Software” shall mean either -(i) Qt for Application Development or -(ii) Qt for Device Creation, and/or -(iii) Qt 3D Studio, and/or -(iv) Qt Design Studio, and/or -(v) selected Add-on Products, if any, depending on which product(s) the - Licensee has purchased under this Agreement, - -as well as corresponding online or electronic documentation, associated media -and printed materials, including the source code, example programs and the -documentation, licensed to the Licensee under this Agreement. Licensed Software -does not include Third Party Software (as defined in Section 4) or Open Source -Qt. The Qt Company may, in the course of its development activities, at its free -and absolute discretion and without any obligation to send or publish any -notifications to the Licensee or in general, make changes, additions or -deletions in the components and functionalities of the Licensed Software, -provided that no such changes, additions or deletions will affect the already -released version of the Licensed Software, but only upcoming version(s). - -“Licensee” shall mean the individual or legal entity that is party to this -Agreement, as identified on the signature page hereof. - -“Licensee’s Records” shall mean books and records that are likely to contain -information bearing on Licensee’s compliance with this Agreement or the payments -due to The Qt Company under this Agreement, including, but not limited to: -assembly logs, sales records and distribution records. - -“Modified Software” shall have the meaning as set forth in Section 2.3. - -“Online Services” shall mean any services or access to systems made available by -The Qt Company to the Licensee over the Internet relating to the Licensed -Software or for the purpose of use by the Licensee of the Licensed Software or -Support. Use of any such Online Services is discretionary for the Licensee and -some of them may be subject to additional fees. - -“Open Source Qt” shall mean the non-commercial Qt computer software products, -licensed under the terms of the GNU Lesser General Public License, version 2.1 -or later (“LGPL”) or the GNU General Public License, version 2.0 or later -(“GPL”). For clarity, Open Source Qt shall not be provided nor governed under -this Agreement. - -”Party” or “Parties” shall mean Licensee and/or The Qt Company. - -“Qt 3D Studio” shall mean all versions of The Qt Company’s Qt 3D Studio, a 3D -user interface design and development environment for rapid designing and -prototyping of animated user interfaces. - -“Qt Design Studio” shall mean all versions of The Qt Company’s Qt Design Studio -tool, a 2D user interface design and development environment for rapid designing -and prototyping of animated user interfaces. - -“Qt for Application Development” shall mean The Qt Company’s productized -offering, which consist of all versions of -(i) Qt Toolkit, and -(ii) Qt Tools/Applications. - -“Qt for Device Creation” shall mean The Qt Company’s productized offering, -which consist of all versions of -(i) Qt for Application Development, and -(ii) Software components specific to embedded software development as set forth - in Appendix 1, Sections 1b and 1d. - -“Qt Toolkit” shall mean the modules defined in Appendix 1, Section 1a. - -“Qt Tools/Applications” shall mean the tools defined in Appendix 1, Section 1c. - -"Redistributables" shall mean the portions of the Licensed Software set forth in -Appendix 1, Section 2 that may be distributed pursuant to the terms of this -Agreement in object code form only, including any relevant documentation. Where -relevant, any reference to Licensed Software in this Agreement shall include and -refer also to Redistributables. - -“Renewal Term” shall mean an extension of previous License Term as agreed -between the Parties. - -“Submitted Modified Software” shall have the meaning as set forth in -Section 2.3. - -“Support” shall mean standard developer support that is provided by The Qt -Company to assist Designated Users in using the Licensed Software in accordance -with The Qt Company’s standard support terms and as further defined in -Section 8 hereunder. - -“Taxes” shall have the meaning set forth in Section 10.5. - -“Term” shall have the meaning set forth in Section 12. - -“The Qt Company” shall mean: -(i) in the event Licensee is an individual residing in the United States or a - legal entity incorporated in the United States or having its headquarters - in the United States, The Qt Company Inc., a Delaware corporation with its - office at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, - USA.; or -(ii) in the event the Licensee is an individual residing outside of the United - States or a legal entity incorporated outside of the United States or - having its registered office outside of the United States, The Qt Company - Ltd., a Finnish company with its registered office at Bertel Jungin aukio - D3A, 02600 Espoo, Finland. - -"Third Party Software " shall have the meaning set forth in Section 4. - -“Updates” shall mean a release or version of the Licensed Software containing -bug fixes, error corrections and other changes that are generally made available -to users of the Licensed Software that have contracted for Support. Updates are -generally depicted as a change to the digits following the decimal in the -Licensed Software version number. The Qt Company shall make Updates available to -the Licensee under the Support. Updates shall be considered as part of the -Licensed Software hereunder. - -“Upgrades” shall mean a release or version of the Licensed Software containing -enhancements and new features and are generally depicted as a change to the -first digit of the Licensed Software version number. In the event Upgrades are -provided to the Licensee under this Agreement, they shall be considered as part -of the Licensed Software hereunder. - -2. OWNERSHIP -2.1 Ownership of The Qt Company -The Licensed Software is protected by copyright laws and international copyright -treaties, as well as other intellectual property laws and treaties. The Licensed -Software is licensed, not sold. All The Qt Company's Intellectual Property -Rights are and shall remain the exclusive property of The Qt Company or its -licensors respectively. - -2.2 Ownership of Licensee -All the Licensee's Intellectual Property Rights are and shall remain the -exclusive property of the Licensee or its licensors respectively. All -Intellectual Property Rights to the Modified Software, Applications and Devices -shall remain with the Licensee and no rights thereto shall be granted by the -Licensee to The Qt Company under this Agreement (except as set forth in Section -2.3 below). - -2.3 Modified Software -Licensee may create bug-fixes, error corrections, patches or modifications to -the Licensed Software (“Modified Software”). Such Modified Software may break -the source or binary compatibility with the Licensed Software (including without -limitation through changing the application programming interfaces ("API") or by -adding, changing or deleting any variable, method, or class signature in the -Licensed Software and/or any inter-process protocols, services or standards in -the Licensed Software libraries). To the extent that Licensee’s Modified -Software so breaks source or binary compatibility with the Licensed Software, -Licensee acknowledges that The Qt Company's ability to provide Support may be -prevented or limited and Licensee's ability to make use of Updates may be -restricted. Licensee may, at its sole and absolute discretion, choose to submit -Modified Software to The Qt Company (“Submitted Modified Software”) in -connection with Licensee’s Support request, service request or otherwise. In the -event Licensee does so, then, Licensee hereby grants The Qt Company a -sublicensable, assignable, irrevocable, perpetual, worldwide, non-exclusive, -royalty-free and fully paid-up license, under all of Licensee’s Intellectual -Property Rights, to reproduce, adapt, translate, modify, and prepare derivative -works of, publicly display, publicly perform, sublicense, make available and -distribute such Submitted Modified Software as The Qt Company sees fit at its -free and absolute discretion. - -3. LICENSES GRANTED -3.1 Development with Licensed Software -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable license, valid for the -License Term, to use, modify and copy the Licensed Software by Designated Users -on the Development Platforms for the sole purposes of designing, developing, -demonstrating and testing Application(s) and/or Devices, and to provide thereto -related support and other related services to end-user Customers. Licensee may -install copies of the Licensed Software on an unlimited number of computers -provided that (i) only the Designated Users may use the Licensed Software, and -(ii) all Designated Users must have a valid Development License to use Licensed -Software. Licensee may at any time designate another Designated User to replace -a then-current Designated User by notifying The Qt Company in writing, provided -that any Designated User may be replaced only once during any six-month period. -Upon expiry of the initially agreed License Term, the respective License Terms -shall be automatically extended to one or more Renewal Term(s), unless and until -either Party notifies the other Party in writing that it does not wish to -continue the License Term, such notification to be provided to the other Party -no less than ninety (90) days before expiry of the respective License Term. -Unless otherwise agreed between the Parties, Renewal Term shall be of equal -length with the initial Term. Any such Renewal Term shall be subject to License -Fees agreed between the Parties or, if no advance agreement exists, subject to -The Qt Company’s standard pricing applicable at the commencement date of any -such Renewal Term. - -3.2 Distribution of Applications -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through its Contractors, Redistributables as installed, -incorporated or integrated into Applications for execution on the Deployment -Platforms, and (ii) grant sublicenses to Redistributables, as distributed -hereunder, for Customers solely for Customer’s internal use and to the extent -necessary in order for the Customers to use the Applications for their -respective intended purposes. -Right to distribute the Redistributables as part of an Application as provided -herein is not royalty-bearing but is conditional upon the Licensee having paid -the agreed Development Licenses from The Qt Company before distributing any -Redistributables to Customers. - -3.3 Distribution of Devices -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through one or more tiers of Contractors, -Redistributables as installed, incorporated or integrated, or intended to be -installed, incorporated or integrated into Devices for execution on the -Deployment Platforms, and (ii) grant sublicenses to Redistributables, as -distributed hereunder, for Customers solely for Customer’s internal use and to -the extent necessary in order for the Customers to use the Devices for their -respective intended purposes. -Right to distribute the Redistributables with Devices as provided herein is -conditional upon the Licensee having purchased and paid the appropriate amount -of Development Licenses for Qt for Device Creation product and Distribution -Licenses from The Qt Company before distributing any Redistributables to -Customers. - -3.4 Further Requirements -The licenses granted above in this Section 3 by The Qt Company to Licensee are -conditional and subject to Licensee's compliance with the following terms: -(i) Licensee shall not remove or alter any copyright, trademark or other - proprietary rights notice contained in any portion of the Licensed - Software; -(ii) Applications must add primary and substantial functionality to the - Licensed Software; -(iii) Applications may not pass on functionality which in any way makes it - possible for others to create software with the Licensed Software; - provided however that Licensee may use the Licensed Software's scripting - and QML ("Qt Quick") functionality solely in order to enable scripting, - themes and styles that augment the functionality and appearance of the - Application(s) without adding primary and substantial functionality to - the Application(s); -(iv) Applications must not compete with the Licensed Software; -(v) Licensee shall not use The Qt Company's or any of its suppliers' names, - logos, or trademarks to market Applications, except that Licensee may use - “Built with Qt” logo to indicate that Application(s) was developed using - the Licensed Software; -(vi) Licensee shall not distribute, sublicense or disclose source code of - Licensed Software to any third party (provided however that Licensee may - appoint employee(s) of Contractors as Designated Users to use Licensed - Software pursuant to this Agreement). Such right may be available for the - Licensee subject to a separate software development kit (“SDK”) license - agreement to be concluded with The Qt Company; -(vii) Licensee shall not grant the Customers a right to (i) make copies of the - Redistributables except when and to the extent required to use the - Applications and/or Devices for their intended purpose, (ii) modify the - Redistributables or create derivative works thereof, (iii) decompile, - disassemble or otherwise reverse engineer Redistributables, or (iv) - redistribute any copy or portion of the Redistributables to any third - party, except as part of the onward sale of the Device on which the - Redistributables are installed; -(viii) Licensee shall not and shall cause that its Affiliates or Contractors - shall not a) in any way combine, incorporate or integrate Licensed - Software with, or use Licensed Software for creation of, any software - created with or incorporating Open Source Qt, or b) incorporate or - integrate Applications into a hardware device or product other than a - Device, unless Licensee has received an advance written permission from - The Qt Company to do so. Absent such written permission, any and all - distribution by the Licensee during the Term of a hardware device or - product a) which incorporate or integrate any part of Licensed Software - or Open Source Qt; or b) where the main user interface or substantial - functionality is provided by software built with Licensed Software or - Open Source Qt or otherwise depends on the Licensed Software or Open - Source Qt, shall be considered as a Device distribution under this - Agreement and dependent on compliance thereof (including but not limited - to obligation to pay applicable License Fees for such distribution). - Notwithstanding what is provided above in this sub-section (viii), - Licensee is entitled to use and combine Qt 3D Studio and/or Qt Design - Studio with Open Source Qt (“Combination”) for its internal evaluation - purposes, provided that Licensee shall in no way transfer, publish, - disclose, display or otherwise make available any software or work - resulting from such Combination; -(ix) Licensee shall cause all of its Affiliates and Contractors entitled to - make use of the licenses granted under this Agreement, to be - contractually bound to comply with the relevant terms of this Agreement - and not to use the Licensed Software beyond the terms hereof and for any - purposes other than operating within the scope of their services for - Licensee. Licensee shall be responsible for any and all actions and - omissions of its Affiliates and Contractors relating to the Licensed - Software and use thereof (including but not limited to payment of all - applicable License Fees); -(x) Except when and to the extent explicitly provided in this Section 3, - Licensee shall not transfer, publish, disclose, display or otherwise - make available the Licensed Software; -; and -(xi) Licensee shall not attempt or enlist a third party to conduct or attempt - to conduct any of the above. - -Above terms shall not be applicable if and to the extent they conflict with any -mandatory provisions of any applicable laws. Any use of Licensed Software beyond -the provisions of this Agreement is strictly prohibited and requires an -additional license from The Qt Company. - -4. THIRD PARTY SOFTWARE -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. Third -Party Software does not comprise part of the Licensed Software. In some cases, -access to Third Party Software may be included in the Licensed Software. Such -Third Party Software will be listed in the ".../src/3rdparty" source tree -delivered with the Licensed Software or documented in the Licensed Software, as -such may be amended from time to time. Licensee acknowledges that use or -distribution of Third Party Software is in all respects subject to applicable -license terms of applicable third party right holders. - -5. PRE-RELEASE CODE -The Licensed Software may contain pre-release code and functionality marked or -otherwise stated as “Technology Preview”, “Alpha”, “Beta” or similar -designation. Such pre-release code may be present in order to provide -experimental support for new platforms or preliminary versions of one or more -new functionalities. The pre-release code may not be at the level of performance -and compatibility of a final, generally available, product offering of the -Licensed Software. The pre-release parts of the Licensed Software may not -operate correctly, may contain errors and may be substantially modified by The -Qt Company prior to the first commercial product release, if any. The Qt Company -is under no obligation to make pre-release code commercially available, or -provide any Support or Updates relating thereto. The Qt Company assumes no -liability whatsoever regarding any pre-release code, but any use thereof is -exclusively at Licensee’s own risk and expense. For clarity, Licensee is -entitled to use such pre-release code pursuant to Section 3, just like other -Licensed Software, provided however that in the event Add-on Products are -included and available as such pre-release code, Licensee’s right to use such -Add-on Products is nevertheless subject to and conditional upon conclusion of -separate agreement with The Qt Company. - -6. LIMITED WARRANTY AND WARRANTY DISCLAIMER -The Qt Company hereby represents and warrants that it has the power and -authority to grant the rights and licenses granted to Licensee under this -Agreement. Except as set forth above, the Licensed Software is licensed to -Licensee "as is" and Licensee’s exclusive remedy and The Qt Company’s entire -liability for errors in the Licensed Software shall be limited, at The Qt -Company’s option, to correction of the error, replacement of the Licensed -Software or return of the applicable fees paid for the defective Licensed -Software for the time period during which the License is not able to utilize the -Licensed Software under the terms of this Agreement. - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF -ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER -WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND -NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT -WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE’S REQUIREMENTS OR THAT -IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE -UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE -RISK OF AND RESPONSIBILITY OF LICENSEE. - -7. INDEMNIFICATION AND LIMITATION OF LIABILITY -7.1 Limitation of Liability -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, -LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, -CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, -HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES -SPECIFICALLY AGREE THAT LICENSEE’S OBLIGATION TO PAY LICENSE AND OTHER FEES -CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE CONSIDERED -AS A DIRECT DAMAGE. EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL -MISCONDUCT, AND (II) BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY -APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY’S TOTAL AGGREGATE LIABILITY UNDER -THIS AGREEMENT EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT -COMPANY FROM LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY -PRECEDING THE EVENT RESULTING IN SUCH LIABILITY. THE PROVISIONS OF THIS SECTION -7 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN THE QT COMPANY AND LICENSEE -AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET FORTH HEREIN IN DETERMINING -WHETHER TO ENTER INTO THIS AGREEMENT. - -7.2 Licensee´s Indemnification -Licensee shall indemnify and hold harmless The Qt Company from and against any -claim, injury, judgment, settlement, loss or expense, including attorneys' fees -related to: (a) Licensee’s misrepresentation in connection with The Qt Company -or the Licensed Software or breach of this Agreement, (b) the Application or -Device (except where such cause of liability is solely attributable to the -Licensed Software). - -8. SUPPORT, UPDATES AND ONLINE SERVICES -Upon due payment of the agreed License Fees the Licensee will be eligible to -receive Support and Updates and to use the Online Services during the License -Term, provided, however, that in the event the License Term is longer than 36 -months, Support is provided only for the first 12 months, unless the Parties -specifically otherwise agree. Unless otherwise decided by The Company at its -free and absolute discretion, Upgrades will not be included in the Support but -may be available subject to additional fees. From time to time The Qt Company -may change the Support terms, provided that during the respective ongoing -License Term the level of Support provided by The Qt Company may not be reduced -without the consent of the Licensee. Unless otherwise agreed, The Qt Company -shall not be responsible for providing any service or support to Customers. - -9. CONFIDENTIALITY -Each Party acknowledges that during the Term of this Agreement each Party may -receive information about the other Party's business, business methods, business -plans, customers, business relations, technology, and other information, -including the terms of this Agreement, that is confidential and of great value -to the other Party, and the value of which would be significantly reduced if -disclosed to third parties (“Confidential Information”). Accordingly, when a -Party (the “Receiving Party”) receives Confidential Information from the other -Party (the “Disclosing Party”), the Receiving Party shall only disclose such -information to employees and Contractors on a need to know basis, and shall -cause its employees and employees of its Affiliates to: (i) maintain any and all -Confidential Information in confidence; (ii) not disclose the Confidential -Information to a third party without the Disclosing Party's prior written -approval; and (iii) not, directly or indirectly, use the Confidential -Information for any purpose other than for exercising its rights and fulfilling -its responsibilities pursuant to this Agreement. Each Party shall take -reasonable measures to protect the Confidential Information of the other Party, -which measures shall not be less than the measures taken by such Party to -protect its own confidential and proprietary information. Obligation of -confidentiality shall not apply to information that (i) is or becomes generally -known to the public through no act or omission of the Receiving Party; (ii) was -in the Receiving Party's lawful possession prior to the disclosure hereunder and -was not subject to limitations on disclosure or use; (iii) is developed -independently by employees or Contractors of the Receiving Party or other -persons working for the Receiving Party who have not had access to the -Confidential Information of the Disclosing Party, as proven by the written -records of the Receiving Party; (iv) is lawfully disclosed to the Receiving -Party without restrictions, by a third party not under an obligation of -confidentiality; or (v) the Receiving Party is legally compelled to disclose, in -which case the Receiving Party shall notify the Disclosing Party of such -compelled disclosure and assert the privileged and confidential nature of the -information and cooperate fully with the Disclosing Party to limit the scope of -disclosure and the dissemination of disclosed Confidential Information to the -minimum extent necessary. The obligations under this Section 9 shall continue to -remain in force for a period of five (5) years after the last disclosure, and, -with respect to trade secrets, for so long as such trade secrets are protected -under applicable trade secret laws. - -10. FEES, DELIVERY AND PAYMENT -10.1 License Fees -License Fees are described in The Qt Company’s standard price list, quote or -Purchase Order confirmation or in an appendix hereto, as the case may be. The -License Fees shall not be refunded or claimed as a credit in any event or for -any reason whatsoever. - -10.2 Ordering Licenses -Licensee may purchase Development Licenses and Distribution Licenses pursuant to -agreed pricing terms or, if no specific pricing terms have been agreed upon, at -The Qt Company's standard pricing terms applicable at the time of purchase. -Licensee shall submit all purchase orders for Development Licenses and -Distribution Licenses to The Qt Company by email or any other method acceptable -to The Qt Company (each such order is referred to herein as a “Purchase Order”) -for confirmation, whereupon the Purchase Order shall become binding between the -Parties. - -10.3 Distribution License Packs -Unless otherwise agreed, Distribution Licenses shall be purchased by way of -Distribution License Packs. Upon due payment of the ordered Distribution License -Pack(s), the Licensee will have an account of Distribution Licenses available -for installing, bundling or integrating (all jointly “installing”) the -Redistributables with the Devices or for otherwise distributing the -Redistributables in accordance with this Agreement. Each time Licensee -“installs” or distributes a copy of Redistributables, then one Distribution -License is used, and Licensee’s account of available Distribution Licenses is -decreased accordingly. Licensee may “install” copies of the Redistributables so -long as Licensee has Distribution Licenses remaining on its account. -Redistributables will be deemed to have been “installed” into a Device when one -of the following circumstances shall have occurred: a) the Redistributables have -been loaded onto the Device and used outside of the Licensee’s premises or b) -the Device has been fully tested and placed into Licensee's inventory (or sold) -for the first time (i.e., Licensee will not be required to use (or pay for) more -than one Distribution License for each individual Device, e.g. in a situation -where a Device is returned to Licensee's inventory after delivery to a -distributor or sale to a Customer). In addition, if Licensee includes a back-up -copy of the Redistributables on a CD-ROM or other storage medium along with the -product, that backup copy of the Redistributables will not be deemed to have -been “installed” and will not require an additional Distribution License. - -10.4 Payment Terms -License Fees and any other charges under this Agreement shall be paid by -Licensee no later than thirty (30) days from the date of the applicable invoice -from The Qt Company. The Qt Company will submit an invoice to Licensee after the -date of this Agreement and/or after The Qt Company receives a Purchase Order -from Licensee. A late payment charge of the lower of (a) one percent per month; -or (b) the interest rate stipulated by applicable law, shall be charged on any -unpaid balances that remain past due. The Qt Company shall have the right to -suspend, terminate or withhold grants of all rights to the Licensed Software -hereunder, including but not limited to the Developer License, Distribution -License, and Support, should Licensee fail to make payment in timely fashion. - -10.5 Taxes -All License Fees and other charges payable hereunder are gross amounts but -exclusive of any value added tax, use tax, sales tax and other taxes, duties or -tariffs (“Taxes”). Such applicable Taxes shall be paid by Licensee, or, where -applicable, in lieu of payment of such Taxes, Licensee shall provide an -exemption certificate to The Qt Company and any applicable authority. - -11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS -11.1 Licensee’s Record-keeping -Licensee shall at all times maintain accurate and up-to-date written records of -Licensee’s activities related to the use of Licensed Software and distribution -of Redistributables. The records shall be adequate to determine Licensee’s -compliance with the provisions of this Agreement and to demonstrate the number -of Designated Users and Redistributables distributed by Licensee. The records -shall conform to good accounting practices reasonably acceptable to The Qt -Company. Licensee shall, within thirty (30) days from receiving The Qt Company’s -request to that effect, deliver to The Qt Company a report on Licensee’s usage -of Licensed Software, such report to contain information, in sufficient detail, -on (i) amount of users working with Licensed Software, (ii) copies of -Redistributables distributed by Licensee during that calendar quarter, (iii) -number of undistributed copies of Redistributables and corresponding number of -unused Distribution Licenses remaining on Licensee’s account, and (iv) any other -information as The Qt Company may reasonably require from time to time. - -11.2. The Qt Company’s Audit Rights -The Qt Company or an independent auditor acting on behalf of The Qt Company’s, -may, upon at least five (5) business days’ prior written notice and at its -expense, audit Licensee with respect to the use of the Redistributables, but not -more frequently than once during each 6-month period. Such audit may be -conducted by mail, electronic means or through an in-person visit to Licensee’s -place of business. Any such in-person audit shall be conducted during regular -business hours at Licensee's facilities and shall not unreasonably interfere -with Licensee's business activities. The Qt Company or the independent auditor -acting on behalf of The Qt Company shall be entitled to inspect Licensee’s -Records. All such Licensee’s Records and use thereof shall be subject to an -obligation of confidentiality under this Agreement. If an audit reveals that -Licensee is using the Licensed Software beyond scope of the licenses Licensee -has paid for, Licensee agrees to immediately pay The Qt Company any amounts owed -for such unauthorized use. -In addition, in the event the audit reveals a material violation of the terms of -this Agreement (underpayment of more than 5% of License Fees shall always be -deemed a material violation for purposes of this section), then the Licensee -shall pay The Qt Company's reasonable cost of conducting such audit. - -12 TERM AND TERMINATION -12.1 Term -This Agreement shall enter into force upon due acceptance by both Parties and -remain in force for as long as there is any Development License(s) in force -(“Term”), unless and until terminated pursuant to the terms of this Section 12. - -12.2 Termination by The Qt Company -The Qt Company shall have the right to terminate this Agreement upon thirty (30) -days prior written notice if the Licensee is in material breach of any -obligation of this Agreement and fails to remedy such breach within such notice -period. - -12.3 Mutual Right to Terminate -Either Party shall have the right to terminate this Agreement immediately upon -written notice in the event that the other Party becomes insolvent, files for -any form of bankruptcy, makes any assignment for the benefit of creditors, has a -receiver, administrative receiver or officer appointed over the whole or a -substantial part of its assets, ceases to conduct business, or an act equivalent -to any of the above occurs under the laws of the jurisdiction of the other -Party. - -12.4 Parties´ Rights and Duties upon Termination -Upon expiry or termination of the Agreement Licensee shall cease and shall cause -all Designated Users (including those of its Affiliates’ and Contractors’) to -cease using the Licensed Software and distribution of the Redistributables under -this Agreement. -Notwithstanding the above, in the event the Agreement expires or is terminated: -(i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses possessed - by the Licensee at such date shall be extended to be valid in perpetuity - under the terms of this Agreement and Licensee is entitled to purchase - additional licenses as set forth in Section 10.2; or -(ii) for reason other than by The Qt Company pursuant to item (i) above or - pursuant to Section 12.2, then the Licensee is entitled, for a period of - six (6) months after the effective date of termination, to continue - distribution of Devices under the Distribution Licenses paid but unused at - such effective date of termination. Upon any such termination the Licensee - shall destroy or return to The Qt Company all copies of the Licensed - Software and all related materials and will certify the same to The Qt - Company upon its request, provided however that Licensee may retain and - exploit such copies of the Licensed Software as it may reasonably require - in providing continued support to Customers. -Expiry or termination of this Agreement for any reason whatsoever shall not -relieve Licensee of its obligation to pay any License Fees accrued or payable to -The Qt Company prior to the effective date of termination, and Licensee shall -immediately pay to The Qt Company all such fees upon the effective date of -termination. Termination of this Agreement shall not affect any rights of -Customers to continue use of Applications and Devices (and therein incorporated -Redistributables). - -12.5 Extension in case of bankruptcy -In the event The Qt Company is declared bankrupt under a final, non-cancellable -decision by relevant court of law, and this Agreement is not, at the date of -expiry of the Development License(s) pursuant to Section 3.1, assigned to party, -who has assumed The Qt Company’s position as a legitimate licensor of Licensed -Software under this Agreement, then all valid licenses possessed by the Licensee -at such date of expiry, and which the Licensee has not notified for expiry, -shall be extended to be valid in perpetuity under the terms of this Agreement. - -13. GOVERNING LAW AND LEGAL VENUE -In the event this Agreement is in the name of The Qt Company Inc., a Delaware -Corporation, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of the State of California, USA, excluding its choice of law - provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any dispute, claim or controversy arising out of or relating to this - Agreement or the breach, termination, enforcement, interpretation or - validity thereof, including the determination of the scope or - applicability of this Agreement to arbitrate, shall be determined by - arbitration in San Francisco, USA, before one arbitrator. The arbitration - shall be administered by JAMS pursuant to JAMS' Streamlined Arbitration - Rules and Procedures. Judgment on the Award may be entered in any court - having jurisdiction. This Section shall not preclude parties from seeking - provisional remedies in aid of arbitration from a court of appropriate - jurisdiction. -In the event this Agreement is in the name of The Qt Company Ltd., a Finnish -Company, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of Finland, excluding its choice of law provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any disputes, controversy or claim arising out of or relating to this - Agreement, or the breach, termination or validity thereof shall be shall - be finally settled by arbitration in accordance with the Arbitration Rules - of Finland Chamber of Commerce. The arbitration tribunal shall consist of - one (1), or if either Party so requires, of three (3), arbitrators. The - award shall be final and binding and enforceable in any court of competent - jurisdiction. The arbitration shall be held in Helsinki, Finland and the - process shall be conducted in the English language. This Section shall not - preclude parties from seeking provisional remedies in aid of arbitration - from a court of appropriate jurisdiction. - -14. GENERAL PROVISIONS -14.1 No Assignment -Except in the case of a merger or sale of substantially all of its corporate -assets, Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the prior written -consent of The Qt Company, which shall not be unreasonably withheld or delayed. -The Qt Company shall be entitled to freely assign or transfer any of its rights, -benefits or obligations under this Agreement. - -14.2 No Third Party Representations -Licensee shall make no representations or warranties concerning the Licensed -Software on behalf of The Qt Company. Any representation or warranty Licensee -makes or purports to make on The Qt Company’s behalf shall be void as to The Qt -Company. - -14.3 Surviving Sections -Any terms and conditions that by their nature or otherwise reasonably should -survive termination of this Agreement shall so be deemed to survive. - -14.4 Entire Agreement -This Agreement, the exhibits hereto, the License Certificate and any applicable -Purchase Order constitute the complete agreement between the Parties and -supersedes all prior or contemporaneous discussions, representations, and -proposals, written or oral, with respect to the subject matters discussed -herein. -In the event of any conflict or inconsistency between this Agreement and any -Purchase Order, the terms of this Agreement will prevail over the terms of the -Purchase Order with respect to such conflict or inconsistency. -Parties specifically acknowledge and agree that this Agreement prevails over any -click-to-accept or similar agreements the Designated Users may need to accept -online upon download of the Licensed Software, as may be required by The Qt -Company’s applicable processes relating to Licensed Software. - -14.5 Modifications -No modification of this Agreement shall be effective unless contained in a -writing executed by an authorized representative of each Party. No term or -condition contained in Licensee's Purchase Order shall apply unless expressly -accepted by The Qt Company in writing. - -14.6 Force Majeure -Except for the payment obligations hereunder, neither Party shall be liable to -the other for any delay or non-performance of its obligations hereunder in the -event and to the extent that such delay or non-performance is due to an event of -act of God, terrorist attack or other similar unforeseeable catastrophic event -that prevents either Party for fulfilling its obligations under this Agreement -and which such Party cannot avoid or circumvent (“Force Majeure Event”). If the -Force Majeure Event results in a delay or non-performance of a Party for a -period of three (3) months or longer, then either Party shall have the right to -terminate this Agreement with immediate effect without any liability (except for -the obligations of payment arising prior to the event of Force Majeure) towards -the other Party. - -14.7 Notices -Any notice given by one Party to the other shall be deemed properly given and -deemed received if specifically acknowledged by the receiving Party in writing -or when successfully delivered to the recipient by hand, fax, or special courier -during normal business hours on a business day to the addresses specified for -each Party on the signature page. Each communication and document made or -delivered by one Party to the other Party pursuant to this Agreement shall be in -the English language. - -14.8 Export Control -Licensee acknowledges that the Redistributables may be subject to export control -restrictions under the applicable laws of respective countries. Licensee shall -fully comply with all applicable export license restrictions and requirements as -well as with all laws and regulations relating to the Redistributables and -exercise of licenses hereunder and shall procure all necessary governmental -authorizations, including without limitation, all necessary licenses, approvals, -permissions or consents, where necessary for the re-exportation of the -Redistributables, Applications and/or Devices. - -14.9 No Implied License -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, shall -remain with The Qt Company and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with any -other software or hardware not delivered by The Qt Company under this Agreement. - -14.10 Attorney Fees -The prevailing Party in any action to enforce this Agreement shall be entitled -to recover its attorney’s fees and costs in connection with such action. - -14.11 Severability -If any provision of this Agreement shall be adjudged by any court of competent -jurisdiction to be unenforceable or invalid, that provision shall be limited or -eliminated to the minimum extent necessary so that this Agreement shall -otherwise remain in full force and effect and enforceable. - - - -APPENDICES -The Agreement includes Appendix 1 as shown below. In addition, the Agreement may -include one or more of the Appendices 3-5 listed below depending on the -product(s) purchased by the Licensee, what is stated in the quote or invoice, -and/or what is stated on the License Certificate. - -  -APPENDIX 1: LICENSED SOFTWARE -1a. Licensed Software - Qt Toolkit -Module Description -Qt Core Core non-graphical classes used by other modules. -Qt GUI Base classes for graphical user interface (GUI) - components. -Qt Multimedia Classes for audio, video and camera functionality. -Qt Multimedia Widgets Widget-based classes for implementing multimedia - functionality. -Qt Network Classes to make network programming easier and more - portable. -Qt QML Classes for QML and JavaScript languages. -Qt Quick A declarative framework for building highly dynamic - applications with custom user interfaces. -Qt Quick Controls 2 Provides lightweight QML types for creating - performant user interfaces for desktop, embedded, and - mobile devices. -Qt Quick Dialogs Types for creating and interacting with system - dialogs from a Qt Quick application. -Qt Quick Layouts Layouts are items that are used to arrange Qt Quick 2 - based items in the user interface. -Qt Quick Test A unit test framework for QML applications. -Qt SQL Classes for database integration using SQL. -Qt Test Classes for unit testing Qt applications and - libraries. -Qt Widgets Classes to extend Qt GUI with C++ widgets. -Active Qt Classes for applications which use ActiveX and COM -Qt 3D Functionality for near-realtime simulation systems - with support for 2D and 3D rendering. -Qt Android Extras Provides platform-specific APIs for Android. -Qt Bluetooth Provides access to Bluetooth hardware. -Qt Canvas 3D Enables OpenGL-like 3D drawing calls from Qt Quick - applications using JavaScript. -Qt Concurrent Classes for writing multi-threaded programs without - using low-level threading primitives. -Qt D-Bus Classes for inter-process communication over the - D-Bus protocol. -Qt Gamepad Enables Qt applications to support the use of gamepad - hardware. -Qt Graphical Effects Graphical effects for use with Qt Quick 2. -Qt Help Classes for integrating documentation into - applications, similar to Qt Assistant. -Qt Image Formats Plugins for additional image formats: TIFF, MNG, TGA, - WBMP. -Qt Location Displays map, navigation, and place content in a QML - application. -Qt Mac Extras Provides platform-specific APIs for macOS. -Qt Network Authorization Provides support for OAuth-based authorization to - online services. -Qt NFC Provides access to Near-Field communication (NFC) - hardware. -Qt Platform Headers Provides classes that encapsulate platform-specific - information. -Qt Positioning Provides access to position, satellite and area - monitoring classes. -Qt Print Support Classes to make printing easier and more portable. -Qt Purchasing Enables in-app purchase of products in Qt - applications. -Qt for Python Python bindings for Qt. -Qt Quick Controls Reusable Qt Quick based UI controls to create classic - desktop-style user interfaces. -Qt Quick Extras Provides a specialized set of controls that can be - used to build interfaces in Qt Quick. -Qt Quick Widgets Provides a C++ widget class for displaying a Qt - Quick user interface. -Qt SCXML Provides classes and tools for creating state - machines from SCXML files. -Qt Sensors Provides access to sensor hardware and motion gesture - recognition. -Qt Serial Bus Provides access to serial industrial bus interface. -Qt Serial Port Provides access to hardware and virtual serial ports. -Qt Speech Provides support for accessibility features such as - text-to-speech. -Qt SVG Classes for displaying the contents of SVG files. -Qt UI Tools Classes for loading QWidget based forms created in Qt - Designer dynamically, at runtime. -Qt WebChannel Provides access to QObject or QML objects from HTML - clients for seamless integration of Qt applications - with HTML/JavaScript clients. -Qt WebEngine Classes and functions for embedding web content in - applications using the Chromium browser project. -Qt WebSockets Provides WebSocket communication. -Qt WebView Displays web content in a QML application by using - APIs native to the platform. -Qt Windows Extras Provides platform-specific APIs for Windows. -Qt X11 Extras Provides platform-specific APIs for X11. -Qt XML C++ implementations of SAX and DOM. -Qt XML Patterns Support for XPath, XQuery, XSLT and XML schema - validation. -Qt Wayland Compositor Provides a framework to develop a Wayland compositor. -Qt Charts UI Components for displaying charts. -Qt Data Visualization UI Components for creating 3D data visualizations. -Qt Virtual Keyboard A framework for implementing different input methods - as well as a QML virtual keyboard. - -1b. Licensed software – Embedded software development libraries -Module Description -Boot 2 Qt stack Yocto based Embedded Linux stack for selected - target hardware -Qt OTA Client-side capability for device image - updates Over The Air. -Device Utilities Collection of API’s to manage the device; - E.g. display, WiFi and Bluetooth settings. -Qt Debugging Bridge (QDB) Daemon Enables host-target deployment, debugging, - profiling and other features over USB. Up to - developer to decide if this is left in the - final solution. - -1c. Licensed Software - Qt Tools/Applications -Tool Description -Qt Creator The integrated development environment for Qt. -Qt Designer Qt tool for designing and building graphical user interfaces. -Qt Linguist Tool used to add translations to Qt applications. -Qt Assistant Tool for viewing online documentation in Qt help-file format. -Qmake Utility tool used to automate the generation of make files. -uic User interface compiler for the Qt GUI toolkit. -rcc Resource compiler used for embedding resources into Qt - applications. -lupdate Tool that finds the translatable strings in the specified source, - header and Qt Designer interface files, and produces or updates - translation files. -lrelease Tool that produces translation files in the compact binary format - used by localized Qt applications. -qlalr Qt parser generator tool. -qdoc Configurable documentation generation tool. -qmlscene QML launcher tool -qmlviewer QML launcher tool - -1d. Licensed software –Qt Tools/Applications specific to embedded software -development -Tool Description -Target toolchains Cross compilation toolchains for - supported target devices and operating - systems -Qt Debugging Bridge (QDB) Host Tools Enables deployment, debugging, - profiling and other features over USB - from development host PC to target - device. -qtconfig-gui Qt Lite Configurator tool graphical - interface -Qt Emulator Qt emulator - -2. Parts of the Licensed Software that are permitted for distribution in -object-code form only (“Redistributables”) under this Agreement: - -2a. Qt for Application Development -(i) The Licensed Software's Qt Toolkit libraries defined in 1a -(ii) The Licensed Software's installer framework - -2b. Qt for Device Creation -(i) Qt for Application Development Redistributables defined in 2a -(ii) The Licensed Software’s Embedded software development libraries defined in - 1b - -2c. Qt 3D Studio -The Licensed Software’s Qt 3D Studio Runtime (“Qt53DStudioRuntime2”) - - -APPENDIX 3: ADDITIONS TO LICENSED SOFTWARE -In addition to what is provided under the definition of the Licensed Software, -Parties agree that Licensed Software shall also include the following additional -software products of The Qt Company if included in the quote / invoice: -Qt for Automation - - MQTT software protocol libraries - - KNX software protocol libraries - - OPCUA (open source backend) - - OPCUA (Unified Automation backend) -Qt Safe Renderer - - Qt Safe Renderer library -Qt Application Manager - - Qt Application Manager library with Qt Creator integration - -All the above is considered as Redistributables and subject to applicable -provisions and limitations including but not limited to what is defined in -Section 3. - - -APPENDIX 4: SMALL BUSINESS AND START-UP APPENDIX -The provisions of this Appendix 4 are applicable for Start-up Companies and for -the Evaluation Term. -For the purpose of this Appendix 4, the following additional definitions shall -be applicable: - “Trial Term” shall mean a period of twelve (12) months. - “Start-up Company” means a company with a maximum annual revenue, including - funding, equivalent to 100,000 USD (in applicable currency) during a respective - calendar year, as evidenced by duly audited records of the Licensee and - approved by The Qt Company. - -During the Trial Term, Section 3 shall apply with following modifications -(“Trial Term Modifications”): - - Licenses granted under Sections 3.1 and 3.2 shall be free of any charge. For - clarity, License for distribution of Devices pursuant to Section 3.3 is - subject to applicable License Fee for necessary Distribution Licenses; - - Development License under Section 3.1 is limited to a maximum of three (3) - Designated Users; and - - Support is available subject to availability, as judged by The Qt Company at - its free and absolute discretion. - -Upon expiry of the Trial Term: - a) This Appendix 4 is terminated, Trial Term Modifications cease to remain in - force, Licensee’s Development Licenses shall be automatically converted into - licenses subject to a License Fee (in the amount specified in the quote or - in Appendix 2 and payable with a 30-day payment term) and Licensee’s rights - and obligations under this Agreement shall continue to remain in force under - the standard provisions of the Agreement, unless the Licensee notifies The - Qt Company in writing no less than ninety (90) days before such expiry date - that Licensee does not agree to such continuance, in which event the - Agreement, and all rights of the Licensee thereunder, shall expire; provided - however that - b) in the event the Licensee still qualifies as a Start-up Company, the - Licensee has an option (“Option”), instead of what is stated in item a) - above, to extend the Trial Term renewal is limited to one time and total - duration of Trial Terms thus to 24 months after the effective date. Licensee - shall notify The Qt Company in writing no less than ninety (90) days before - the expiry date, if Licensee wish to exercise the Option. - - -APPENDIX 5: NON-COMMERCIAL USE APPENDIX -The provisions of this Appendix 5 are applicable for non-commercial use of the -Licensed Software by the Licensee. -For the purpose of this Appendix 5, the following additional definitions -(replacing the relevant definition of the Agreement, where applicable) shall be -applicable: - “Demo Units” shall mean (i) hardware development platform, which incorporates - the Licensed Software along with Licensee’s software and/or hardware, and - (ii) prototype versions of Applications or Devices. - “Designated User(s)” shall mean the employees and students of the Licensee. - “Licensee Products” shall mean Applications and/or Devices. - “Permitted Purpose” shall mean (i) Licensee’s internal evaluation and testing - of Licensed Software, (ii) building Demo Units as well as (iii) educational - use. - “Term” shall mean a period of twelve (12) months or any such other period as - may be agreed between the Parties. - -For the purpose of this Appendix 5, the following changes shall be agreed with -respect to relevant Sections of the Agreement: - I. Recital (A) shall be replaced in its entirety to read as follows: “(A) - Licensee wishes to use the Licensed Software for the Permitted Purpose.” - II. Section 3.1 shall be replaced in its entirety to read as follows: - “The Qt Company grants to Licensee a personal, non-exclusive, - non-transferable, revocable, royalty-free license, valid for the Term, to - use, modify and copy the Licensed Software solely for the Permitted - Purpose. Licensee may install copies of the Licensed Software on an - unlimited number of computers provided that only Designated Users may use - the Licensed Software. Licensee may demonstrate the Demo Units, provided - that such demonstrations must be conducted by Licensee, and the Demo Units - must remain in Licensee’s possession and under Licensee’s control at all - times. For clarity, this Agreement does not (i) entitle Licensee to use - Licensed Software to create Applications or Devices (other than prototypes - thereof) or (ii) carry any distribution rights to Licensee, but such - rights are subject to and conditional upon conclusion of a separate - license agreement with The Qt Company.” - III. Sections 3.2, 3.3, 8 and 10 shall be deleted. - IV. Section 3.4 shall be replaced in its entirety to read as follows: - “Licensee shall not: - - remove or alter any copyright, trademark or other proprietary rights - notice contained in any portion of the Licensed Software; - - transfer, publish, sublicense, disclose, display or otherwise make - the Licensed Software available to any third party (except that - Licensee may demonstrate the Demo Units pursuant to Section 3.1); - - in any way combine, incorporate or integrate Licensed Software with, or - use Licensed Software for creation of, any software created with or - incorporating Open Source Qt; - Licensee shall cause all Designated Users who make use of the licenses - granted under this Agreement, to be contractually bound to comply with - the relevant terms of this Agreement and not to use the Licensed - Software beyond the terms hereof. Licensee shall be responsible for any - and all actions and omissions of its Designated Users relating to the - Licensed Software and use thereof. Any use of Licensed Software beyond - the provisions of this Agreement is strictly prohibited and requires an - additional license from The Qt Company.” - V. Section 12 shall be replaced in its entirety to read as follows: - “This Agreement shall enter into force upon due acceptance by both Parties - and remain in force for the Term, unless and until terminated pursuant to - the terms of Section 12. Upon termination of the Agreement, Licensee shall - cease using the Licensed Software. All other copies of Licensed Software - in the possession or control of Licensee must be erased or destroyed. An - officer of Licensee must, upon request, promptly deliver to The Qt Company - a written confirmation that this has occurred.” - -Except for the modifications specified above, this Appendix carries no change to -the terms of the Agreement which shall remain in full force. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT qtquickcontrols2-opensource-src-5.9.5/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT --- qtquickcontrols2-opensource-src-5.12.5+dfsg/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 2019-09-06 12:05:25.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/.QT-FOR-APPLICATION-DEVELOPMENT-LICENSE-AGREEMENT 1970-01-01 00:00:00.000000000 +0000 @@ -1,1089 +0,0 @@ -QT LICENSE AGREEMENT -Agreement version 4.1 -This License Agreement (“Agreement”) is a legal agreement between The Qt Company -(as defined below) and the Licensee (as defined below) for the license of -Licensed Software (as defined below). Capitalized terms used herein are defined -in Section 1. -WHEREAS: - -(A) Licensee wishes to use the Licensed Software for the purpose of developing - and distributing Applications and/or Devices; and -(B) The Qt Company is willing to grant the Licensee a right to use Licensed - Software for such purpose pursuant to term and conditions of this Agreement. - -NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: - -1. DEFINITIONS -“Affiliate” of a Party shall mean an entity (i) which is directly or indirectly -controlling such Party; (ii) which is under the same direct or indirect -ownership or control as such Party; or (iii) which is directly or indirectly -owned or controlled by such Party. For these purposes, an entity shall be -treated as being controlled by another if that other entity has fifty percent -(50 %) or more of the votes in such entity, is able to direct its affairs and/or -to control the composition of its board of directors or equivalent body. - -“Add-on Products” shall mean The Qt Company’s specific add-on software products -(for example Qt Safe Renderer, Qt for Automation, Qt Application Manager), which -are not licensed as part of The Qt Company’s standard offering, but shall be -included into the scope of Licensed Software only if so specifically agreed -between the Parties. - -“Applications” shall mean Licensee's software products created using the -Licensed Software, which may include the Redistributables, or part thereof. - -“Contractor(s)” shall mean third party consultants, distributors and contractors -performing services to a Party under applicable contractual arrangement. - -“Customer(s)” shall mean Licensee’s end users to whom Licensee, directly or -indirectly, distributes copies of the Redistributables. - -“Deployment Platforms” shall mean operating systems specified in the License -Certificate, in which the Redistributables can be distributed pursuant to the -terms and conditions of this Agreement. - -“Designated User(s)” shall mean the employee(s) of Licensee or Licensee’s -Affiliates acting within the scope of their employment or Licensee's Contractors -acting within the scope of their services for Licensee and on behalf of -Licensee. Designated Users shall be named in the License Certificate. - -“Development License” shall mean the license needed by the Licensee for each -Designated User to use the Licensed Software under the license grant described -in Section 3.1 of this Agreement. Development Licenses are available separately -for Qt for Application Development (desktop) and Qt for Device Creation -(embedded) products, each product having its designated scope and purpose of -use. Distribution Licenses are always connected to Qt for Device Creation -product only. - -“Development Platforms” shall mean those operating systems specified in the -License Certificate, in which the Licensed Software can be used under the -Development License, but not distributed in any form or used for any other -purpose. - -“Devices” shall mean hardware devices or products that 1) are manufactured -and/or distributed by the Licensee or its Affiliates or Contractors, and 2) -(i) incorporate or integrate the Redistributables or parts thereof; or (ii) do -not incorporate or integrate the Redistributables at the time of distribution, -but where, when used by a Customer, the main user interface or substantial -functionality of such device is provided by Application(s) or otherwise depends -on the Licensed Software. Devices shall be specified in Appendix 2 or in a -quote. - -“Distribution License(s)” shall mean the license required for distribution of -Redistributables in connection with Devices pursuant to license grant described -in Section 3.3 of this Agreement. - -“Distribution License Packs” shall mean set of prepaid Distribution Licenses for -distribution of Redistributables, as defined in The Qt Company’s standard price -list, quote, Purchase Order confirmation or in an appendix hereto, as the case -may be. - -“Intellectual Property Rights” shall mean patents (including utility models), -design patents, and designs (whether or not capable of registration), chip -topography rights and other like protection, copyrights, trademarks, service -marks, trade names, logos or other words or symbols and any other form of -statutory protection of any kind and applications for any of the foregoing as -well as any trade secrets. - -“License Certificate” shall mean a certificate generated by The Qt Company for -each Designated User respectively upon them downloading the Licensed Software. -License Certificate will be available under respective Designated User’s Qt -Account at account.qt.io and it will specify the Designated User, the -Development Platforms, Deployment Platforms and the License Term. The terms of -the License Certificate are considered part of this Agreement and shall be -updated from time to time to reflect any agreed changes to the foregoing terms -relating to Designated User’s rights to the Licensed Software. - -“License Fee” shall mean the fee charged to the Licensee for rights granted -under the terms of this Agreement. - -“License Term” shall mean the agreed validity period of the Development License -of the respective Designated User, during which time the Designated User is -entitled to use the Licensed Software, as set forth in the respective License -Certificate. - -“Licensed Software” shall mean either -(i) Qt for Application Development or -(ii) Qt for Device Creation, and/or -(iii) Qt 3D Studio, and/or -(iv) Qt Design Studio, and/or -(v) selected Add-on Products, if any, depending on which product(s) the - Licensee has purchased under this Agreement, - -as well as corresponding online or electronic documentation, associated media -and printed materials, including the source code, example programs and the -documentation, licensed to the Licensee under this Agreement. Licensed Software -does not include Third Party Software (as defined in Section 4) or Open Source -Qt. The Qt Company may, in the course of its development activities, at its free -and absolute discretion and without any obligation to send or publish any -notifications to the Licensee or in general, make changes, additions or -deletions in the components and functionalities of the Licensed Software, -provided that no such changes, additions or deletions will affect the already -released version of the Licensed Software, but only upcoming version(s). - -“Licensee” shall mean the individual or legal entity that is party to this -Agreement, as identified on the signature page hereof. - -“Licensee’s Records” shall mean books and records that are likely to contain -information bearing on Licensee’s compliance with this Agreement or the payments -due to The Qt Company under this Agreement, including, but not limited to: -assembly logs, sales records and distribution records. - -“Modified Software” shall have the meaning as set forth in Section 2.3. - -“Online Services” shall mean any services or access to systems made available by -The Qt Company to the Licensee over the Internet relating to the Licensed -Software or for the purpose of use by the Licensee of the Licensed Software or -Support. Use of any such Online Services is discretionary for the Licensee and -some of them may be subject to additional fees. - -“Open Source Qt” shall mean the non-commercial Qt computer software products, -licensed under the terms of the GNU Lesser General Public License, version 2.1 -or later (“LGPL”) or the GNU General Public License, version 2.0 or later -(“GPL”). For clarity, Open Source Qt shall not be provided nor governed under -this Agreement. - -”Party” or “Parties” shall mean Licensee and/or The Qt Company. - -“Qt 3D Studio” shall mean all versions of The Qt Company’s Qt 3D Studio, a 3D -user interface design and development environment for rapid designing and -prototyping of animated user interfaces. - -“Qt Design Studio” shall mean all versions of The Qt Company’s Qt Design Studio -tool, a 2D user interface design and development environment for rapid designing -and prototyping of animated user interfaces. - -“Qt for Application Development” shall mean The Qt Company’s productized -offering, which consist of all versions of -(i) Qt Toolkit, and -(ii) Qt Tools/Applications. - -“Qt for Device Creation” shall mean The Qt Company’s productized offering, -which consist of all versions of -(i) Qt for Application Development, and -(ii) Software components specific to embedded software development as set forth - in Appendix 1, Sections 1b and 1d. - -“Qt Toolkit” shall mean the modules defined in Appendix 1, Section 1a. - -“Qt Tools/Applications” shall mean the tools defined in Appendix 1, Section 1c. - -"Redistributables" shall mean the portions of the Licensed Software set forth in -Appendix 1, Section 2 that may be distributed pursuant to the terms of this -Agreement in object code form only, including any relevant documentation. Where -relevant, any reference to Licensed Software in this Agreement shall include and -refer also to Redistributables. - -“Renewal Term” shall mean an extension of previous License Term as agreed -between the Parties. - -“Submitted Modified Software” shall have the meaning as set forth in -Section 2.3. - -“Support” shall mean standard developer support that is provided by The Qt -Company to assist Designated Users in using the Licensed Software in accordance -with The Qt Company’s standard support terms and as further defined in -Section 8 hereunder. - -“Taxes” shall have the meaning set forth in Section 10.5. - -“Term” shall have the meaning set forth in Section 12. - -“The Qt Company” shall mean: -(i) in the event Licensee is an individual residing in the United States or a - legal entity incorporated in the United States or having its headquarters - in the United States, The Qt Company Inc., a Delaware corporation with its - office at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, - USA.; or -(ii) in the event the Licensee is an individual residing outside of the United - States or a legal entity incorporated outside of the United States or - having its registered office outside of the United States, The Qt Company - Ltd., a Finnish company with its registered office at Bertel Jungin aukio - D3A, 02600 Espoo, Finland. - -"Third Party Software " shall have the meaning set forth in Section 4. - -“Updates” shall mean a release or version of the Licensed Software containing -bug fixes, error corrections and other changes that are generally made available -to users of the Licensed Software that have contracted for Support. Updates are -generally depicted as a change to the digits following the decimal in the -Licensed Software version number. The Qt Company shall make Updates available to -the Licensee under the Support. Updates shall be considered as part of the -Licensed Software hereunder. - -“Upgrades” shall mean a release or version of the Licensed Software containing -enhancements and new features and are generally depicted as a change to the -first digit of the Licensed Software version number. In the event Upgrades are -provided to the Licensee under this Agreement, they shall be considered as part -of the Licensed Software hereunder. - -2. OWNERSHIP -2.1 Ownership of The Qt Company -The Licensed Software is protected by copyright laws and international copyright -treaties, as well as other intellectual property laws and treaties. The Licensed -Software is licensed, not sold. All The Qt Company's Intellectual Property -Rights are and shall remain the exclusive property of The Qt Company or its -licensors respectively. - -2.2 Ownership of Licensee -All the Licensee's Intellectual Property Rights are and shall remain the -exclusive property of the Licensee or its licensors respectively. All -Intellectual Property Rights to the Modified Software, Applications and Devices -shall remain with the Licensee and no rights thereto shall be granted by the -Licensee to The Qt Company under this Agreement (except as set forth in Section -2.3 below). - -2.3 Modified Software -Licensee may create bug-fixes, error corrections, patches or modifications to -the Licensed Software (“Modified Software”). Such Modified Software may break -the source or binary compatibility with the Licensed Software (including without -limitation through changing the application programming interfaces ("API") or by -adding, changing or deleting any variable, method, or class signature in the -Licensed Software and/or any inter-process protocols, services or standards in -the Licensed Software libraries). To the extent that Licensee’s Modified -Software so breaks source or binary compatibility with the Licensed Software, -Licensee acknowledges that The Qt Company's ability to provide Support may be -prevented or limited and Licensee's ability to make use of Updates may be -restricted. Licensee may, at its sole and absolute discretion, choose to submit -Modified Software to The Qt Company (“Submitted Modified Software”) in -connection with Licensee’s Support request, service request or otherwise. In the -event Licensee does so, then, Licensee hereby grants The Qt Company a -sublicensable, assignable, irrevocable, perpetual, worldwide, non-exclusive, -royalty-free and fully paid-up license, under all of Licensee’s Intellectual -Property Rights, to reproduce, adapt, translate, modify, and prepare derivative -works of, publicly display, publicly perform, sublicense, make available and -distribute such Submitted Modified Software as The Qt Company sees fit at its -free and absolute discretion. - -3. LICENSES GRANTED -3.1 Development with Licensed Software -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable license, valid for the -License Term, to use, modify and copy the Licensed Software by Designated Users -on the Development Platforms for the sole purposes of designing, developing, -demonstrating and testing Application(s) and/or Devices, and to provide thereto -related support and other related services to end-user Customers. Licensee may -install copies of the Licensed Software on an unlimited number of computers -provided that (i) only the Designated Users may use the Licensed Software, and -(ii) all Designated Users must have a valid Development License to use Licensed -Software. Licensee may at any time designate another Designated User to replace -a then-current Designated User by notifying The Qt Company in writing, provided -that any Designated User may be replaced only once during any six-month period. -Upon expiry of the initially agreed License Term, the respective License Terms -shall be automatically extended to one or more Renewal Term(s), unless and until -either Party notifies the other Party in writing that it does not wish to -continue the License Term, such notification to be provided to the other Party -no less than ninety (90) days before expiry of the respective License Term. -Unless otherwise agreed between the Parties, Renewal Term shall be of equal -length with the initial Term. Any such Renewal Term shall be subject to License -Fees agreed between the Parties or, if no advance agreement exists, subject to -The Qt Company’s standard pricing applicable at the commencement date of any -such Renewal Term. - -3.2 Distribution of Applications -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through its Contractors, Redistributables as installed, -incorporated or integrated into Applications for execution on the Deployment -Platforms, and (ii) grant sublicenses to Redistributables, as distributed -hereunder, for Customers solely for Customer’s internal use and to the extent -necessary in order for the Customers to use the Applications for their -respective intended purposes. -Right to distribute the Redistributables as part of an Application as provided -herein is not royalty-bearing but is conditional upon the Licensee having paid -the agreed Development Licenses from The Qt Company before distributing any -Redistributables to Customers. - -3.3 Distribution of Devices -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through one or more tiers of Contractors, -Redistributables as installed, incorporated or integrated, or intended to be -installed, incorporated or integrated into Devices for execution on the -Deployment Platforms, and (ii) grant sublicenses to Redistributables, as -distributed hereunder, for Customers solely for Customer’s internal use and to -the extent necessary in order for the Customers to use the Devices for their -respective intended purposes. -Right to distribute the Redistributables with Devices as provided herein is -conditional upon the Licensee having purchased and paid the appropriate amount -of Development Licenses for Qt for Device Creation product and Distribution -Licenses from The Qt Company before distributing any Redistributables to -Customers. - -3.4 Further Requirements -The licenses granted above in this Section 3 by The Qt Company to Licensee are -conditional and subject to Licensee's compliance with the following terms: -(i) Licensee shall not remove or alter any copyright, trademark or other - proprietary rights notice contained in any portion of the Licensed - Software; -(ii) Applications must add primary and substantial functionality to the - Licensed Software; -(iii) Applications may not pass on functionality which in any way makes it - possible for others to create software with the Licensed Software; - provided however that Licensee may use the Licensed Software's scripting - and QML ("Qt Quick") functionality solely in order to enable scripting, - themes and styles that augment the functionality and appearance of the - Application(s) without adding primary and substantial functionality to - the Application(s); -(iv) Applications must not compete with the Licensed Software; -(v) Licensee shall not use The Qt Company's or any of its suppliers' names, - logos, or trademarks to market Applications, except that Licensee may use - “Built with Qt” logo to indicate that Application(s) was developed using - the Licensed Software; -(vi) Licensee shall not distribute, sublicense or disclose source code of - Licensed Software to any third party (provided however that Licensee may - appoint employee(s) of Contractors as Designated Users to use Licensed - Software pursuant to this Agreement). Such right may be available for the - Licensee subject to a separate software development kit (“SDK”) license - agreement to be concluded with The Qt Company; -(vii) Licensee shall not grant the Customers a right to (i) make copies of the - Redistributables except when and to the extent required to use the - Applications and/or Devices for their intended purpose, (ii) modify the - Redistributables or create derivative works thereof, (iii) decompile, - disassemble or otherwise reverse engineer Redistributables, or (iv) - redistribute any copy or portion of the Redistributables to any third - party, except as part of the onward sale of the Device on which the - Redistributables are installed; -(viii) Licensee shall not and shall cause that its Affiliates or Contractors - shall not a) in any way combine, incorporate or integrate Licensed - Software with, or use Licensed Software for creation of, any software - created with or incorporating Open Source Qt, or b) incorporate or - integrate Applications into a hardware device or product other than a - Device, unless Licensee has received an advance written permission from - The Qt Company to do so. Absent such written permission, any and all - distribution by the Licensee during the Term of a hardware device or - product a) which incorporate or integrate any part of Licensed Software - or Open Source Qt; or b) where the main user interface or substantial - functionality is provided by software built with Licensed Software or - Open Source Qt or otherwise depends on the Licensed Software or Open - Source Qt, shall be considered as a Device distribution under this - Agreement and dependent on compliance thereof (including but not limited - to obligation to pay applicable License Fees for such distribution). - Notwithstanding what is provided above in this sub-section (viii), - Licensee is entitled to use and combine Qt 3D Studio and/or Qt Design - Studio with Open Source Qt (“Combination”) for its internal evaluation - purposes, provided that Licensee shall in no way transfer, publish, - disclose, display or otherwise make available any software or work - resulting from such Combination; -(ix) Licensee shall cause all of its Affiliates and Contractors entitled to - make use of the licenses granted under this Agreement, to be - contractually bound to comply with the relevant terms of this Agreement - and not to use the Licensed Software beyond the terms hereof and for any - purposes other than operating within the scope of their services for - Licensee. Licensee shall be responsible for any and all actions and - omissions of its Affiliates and Contractors relating to the Licensed - Software and use thereof (including but not limited to payment of all - applicable License Fees); -(x) Except when and to the extent explicitly provided in this Section 3, - Licensee shall not transfer, publish, disclose, display or otherwise - make available the Licensed Software; -; and -(xi) Licensee shall not attempt or enlist a third party to conduct or attempt - to conduct any of the above. - -Above terms shall not be applicable if and to the extent they conflict with any -mandatory provisions of any applicable laws. Any use of Licensed Software beyond -the provisions of this Agreement is strictly prohibited and requires an -additional license from The Qt Company. - -4. THIRD PARTY SOFTWARE -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. Third -Party Software does not comprise part of the Licensed Software. In some cases, -access to Third Party Software may be included in the Licensed Software. Such -Third Party Software will be listed in the ".../src/3rdparty" source tree -delivered with the Licensed Software or documented in the Licensed Software, as -such may be amended from time to time. Licensee acknowledges that use or -distribution of Third Party Software is in all respects subject to applicable -license terms of applicable third party right holders. - -5. PRE-RELEASE CODE -The Licensed Software may contain pre-release code and functionality marked or -otherwise stated as “Technology Preview”, “Alpha”, “Beta” or similar -designation. Such pre-release code may be present in order to provide -experimental support for new platforms or preliminary versions of one or more -new functionalities. The pre-release code may not be at the level of performance -and compatibility of a final, generally available, product offering of the -Licensed Software. The pre-release parts of the Licensed Software may not -operate correctly, may contain errors and may be substantially modified by The -Qt Company prior to the first commercial product release, if any. The Qt Company -is under no obligation to make pre-release code commercially available, or -provide any Support or Updates relating thereto. The Qt Company assumes no -liability whatsoever regarding any pre-release code, but any use thereof is -exclusively at Licensee’s own risk and expense. For clarity, Licensee is -entitled to use such pre-release code pursuant to Section 3, just like other -Licensed Software, provided however that in the event Add-on Products are -included and available as such pre-release code, Licensee’s right to use such -Add-on Products is nevertheless subject to and conditional upon conclusion of -separate agreement with The Qt Company. - -6. LIMITED WARRANTY AND WARRANTY DISCLAIMER -The Qt Company hereby represents and warrants that it has the power and -authority to grant the rights and licenses granted to Licensee under this -Agreement. Except as set forth above, the Licensed Software is licensed to -Licensee "as is" and Licensee’s exclusive remedy and The Qt Company’s entire -liability for errors in the Licensed Software shall be limited, at The Qt -Company’s option, to correction of the error, replacement of the Licensed -Software or return of the applicable fees paid for the defective Licensed -Software for the time period during which the License is not able to utilize the -Licensed Software under the terms of this Agreement. - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF -ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER -WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND -NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT -WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE’S REQUIREMENTS OR THAT -IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE -UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE -RISK OF AND RESPONSIBILITY OF LICENSEE. - -7. INDEMNIFICATION AND LIMITATION OF LIABILITY -7.1 Limitation of Liability -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, -LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, -CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, -HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES -SPECIFICALLY AGREE THAT LICENSEE’S OBLIGATION TO PAY LICENSE AND OTHER FEES -CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE CONSIDERED -AS A DIRECT DAMAGE. EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL -MISCONDUCT, AND (II) BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY -APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY’S TOTAL AGGREGATE LIABILITY UNDER -THIS AGREEMENT EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT -COMPANY FROM LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY -PRECEDING THE EVENT RESULTING IN SUCH LIABILITY. THE PROVISIONS OF THIS SECTION -7 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN THE QT COMPANY AND LICENSEE -AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET FORTH HEREIN IN DETERMINING -WHETHER TO ENTER INTO THIS AGREEMENT. - -7.2 Licensee´s Indemnification -Licensee shall indemnify and hold harmless The Qt Company from and against any -claim, injury, judgment, settlement, loss or expense, including attorneys' fees -related to: (a) Licensee’s misrepresentation in connection with The Qt Company -or the Licensed Software or breach of this Agreement, (b) the Application or -Device (except where such cause of liability is solely attributable to the -Licensed Software). - -8. SUPPORT, UPDATES AND ONLINE SERVICES -Upon due payment of the agreed License Fees the Licensee will be eligible to -receive Support and Updates and to use the Online Services during the License -Term, provided, however, that in the event the License Term is longer than 36 -months, Support is provided only for the first 12 months, unless the Parties -specifically otherwise agree. Unless otherwise decided by The Company at its -free and absolute discretion, Upgrades will not be included in the Support but -may be available subject to additional fees. From time to time The Qt Company -may change the Support terms, provided that during the respective ongoing -License Term the level of Support provided by The Qt Company may not be reduced -without the consent of the Licensee. Unless otherwise agreed, The Qt Company -shall not be responsible for providing any service or support to Customers. - -9. CONFIDENTIALITY -Each Party acknowledges that during the Term of this Agreement each Party may -receive information about the other Party's business, business methods, business -plans, customers, business relations, technology, and other information, -including the terms of this Agreement, that is confidential and of great value -to the other Party, and the value of which would be significantly reduced if -disclosed to third parties (“Confidential Information”). Accordingly, when a -Party (the “Receiving Party”) receives Confidential Information from the other -Party (the “Disclosing Party”), the Receiving Party shall only disclose such -information to employees and Contractors on a need to know basis, and shall -cause its employees and employees of its Affiliates to: (i) maintain any and all -Confidential Information in confidence; (ii) not disclose the Confidential -Information to a third party without the Disclosing Party's prior written -approval; and (iii) not, directly or indirectly, use the Confidential -Information for any purpose other than for exercising its rights and fulfilling -its responsibilities pursuant to this Agreement. Each Party shall take -reasonable measures to protect the Confidential Information of the other Party, -which measures shall not be less than the measures taken by such Party to -protect its own confidential and proprietary information. Obligation of -confidentiality shall not apply to information that (i) is or becomes generally -known to the public through no act or omission of the Receiving Party; (ii) was -in the Receiving Party's lawful possession prior to the disclosure hereunder and -was not subject to limitations on disclosure or use; (iii) is developed -independently by employees or Contractors of the Receiving Party or other -persons working for the Receiving Party who have not had access to the -Confidential Information of the Disclosing Party, as proven by the written -records of the Receiving Party; (iv) is lawfully disclosed to the Receiving -Party without restrictions, by a third party not under an obligation of -confidentiality; or (v) the Receiving Party is legally compelled to disclose, in -which case the Receiving Party shall notify the Disclosing Party of such -compelled disclosure and assert the privileged and confidential nature of the -information and cooperate fully with the Disclosing Party to limit the scope of -disclosure and the dissemination of disclosed Confidential Information to the -minimum extent necessary. The obligations under this Section 9 shall continue to -remain in force for a period of five (5) years after the last disclosure, and, -with respect to trade secrets, for so long as such trade secrets are protected -under applicable trade secret laws. - -10. FEES, DELIVERY AND PAYMENT -10.1 License Fees -License Fees are described in The Qt Company’s standard price list, quote or -Purchase Order confirmation or in an appendix hereto, as the case may be. The -License Fees shall not be refunded or claimed as a credit in any event or for -any reason whatsoever. - -10.2 Ordering Licenses -Licensee may purchase Development Licenses and Distribution Licenses pursuant to -agreed pricing terms or, if no specific pricing terms have been agreed upon, at -The Qt Company's standard pricing terms applicable at the time of purchase. -Licensee shall submit all purchase orders for Development Licenses and -Distribution Licenses to The Qt Company by email or any other method acceptable -to The Qt Company (each such order is referred to herein as a “Purchase Order”) -for confirmation, whereupon the Purchase Order shall become binding between the -Parties. - -10.3 Distribution License Packs -Unless otherwise agreed, Distribution Licenses shall be purchased by way of -Distribution License Packs. Upon due payment of the ordered Distribution License -Pack(s), the Licensee will have an account of Distribution Licenses available -for installing, bundling or integrating (all jointly “installing”) the -Redistributables with the Devices or for otherwise distributing the -Redistributables in accordance with this Agreement. Each time Licensee -“installs” or distributes a copy of Redistributables, then one Distribution -License is used, and Licensee’s account of available Distribution Licenses is -decreased accordingly. Licensee may “install” copies of the Redistributables so -long as Licensee has Distribution Licenses remaining on its account. -Redistributables will be deemed to have been “installed” into a Device when one -of the following circumstances shall have occurred: a) the Redistributables have -been loaded onto the Device and used outside of the Licensee’s premises or b) -the Device has been fully tested and placed into Licensee's inventory (or sold) -for the first time (i.e., Licensee will not be required to use (or pay for) more -than one Distribution License for each individual Device, e.g. in a situation -where a Device is returned to Licensee's inventory after delivery to a -distributor or sale to a Customer). In addition, if Licensee includes a back-up -copy of the Redistributables on a CD-ROM or other storage medium along with the -product, that backup copy of the Redistributables will not be deemed to have -been “installed” and will not require an additional Distribution License. - -10.4 Payment Terms -License Fees and any other charges under this Agreement shall be paid by -Licensee no later than thirty (30) days from the date of the applicable invoice -from The Qt Company. The Qt Company will submit an invoice to Licensee after the -date of this Agreement and/or after The Qt Company receives a Purchase Order -from Licensee. A late payment charge of the lower of (a) one percent per month; -or (b) the interest rate stipulated by applicable law, shall be charged on any -unpaid balances that remain past due. The Qt Company shall have the right to -suspend, terminate or withhold grants of all rights to the Licensed Software -hereunder, including but not limited to the Developer License, Distribution -License, and Support, should Licensee fail to make payment in timely fashion. - -10.5 Taxes -All License Fees and other charges payable hereunder are gross amounts but -exclusive of any value added tax, use tax, sales tax and other taxes, duties or -tariffs (“Taxes”). Such applicable Taxes shall be paid by Licensee, or, where -applicable, in lieu of payment of such Taxes, Licensee shall provide an -exemption certificate to The Qt Company and any applicable authority. - -11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS -11.1 Licensee’s Record-keeping -Licensee shall at all times maintain accurate and up-to-date written records of -Licensee’s activities related to the use of Licensed Software and distribution -of Redistributables. The records shall be adequate to determine Licensee’s -compliance with the provisions of this Agreement and to demonstrate the number -of Designated Users and Redistributables distributed by Licensee. The records -shall conform to good accounting practices reasonably acceptable to The Qt -Company. Licensee shall, within thirty (30) days from receiving The Qt Company’s -request to that effect, deliver to The Qt Company a report on Licensee’s usage -of Licensed Software, such report to contain information, in sufficient detail, -on (i) amount of users working with Licensed Software, (ii) copies of -Redistributables distributed by Licensee during that calendar quarter, (iii) -number of undistributed copies of Redistributables and corresponding number of -unused Distribution Licenses remaining on Licensee’s account, and (iv) any other -information as The Qt Company may reasonably require from time to time. - -11.2. The Qt Company’s Audit Rights -The Qt Company or an independent auditor acting on behalf of The Qt Company’s, -may, upon at least five (5) business days’ prior written notice and at its -expense, audit Licensee with respect to the use of the Redistributables, but not -more frequently than once during each 6-month period. Such audit may be -conducted by mail, electronic means or through an in-person visit to Licensee’s -place of business. Any such in-person audit shall be conducted during regular -business hours at Licensee's facilities and shall not unreasonably interfere -with Licensee's business activities. The Qt Company or the independent auditor -acting on behalf of The Qt Company shall be entitled to inspect Licensee’s -Records. All such Licensee’s Records and use thereof shall be subject to an -obligation of confidentiality under this Agreement. If an audit reveals that -Licensee is using the Licensed Software beyond scope of the licenses Licensee -has paid for, Licensee agrees to immediately pay The Qt Company any amounts owed -for such unauthorized use. -In addition, in the event the audit reveals a material violation of the terms of -this Agreement (underpayment of more than 5% of License Fees shall always be -deemed a material violation for purposes of this section), then the Licensee -shall pay The Qt Company's reasonable cost of conducting such audit. - -12 TERM AND TERMINATION -12.1 Term -This Agreement shall enter into force upon due acceptance by both Parties and -remain in force for as long as there is any Development License(s) in force -(“Term”), unless and until terminated pursuant to the terms of this Section 12. - -12.2 Termination by The Qt Company -The Qt Company shall have the right to terminate this Agreement upon thirty (30) -days prior written notice if the Licensee is in material breach of any -obligation of this Agreement and fails to remedy such breach within such notice -period. - -12.3 Mutual Right to Terminate -Either Party shall have the right to terminate this Agreement immediately upon -written notice in the event that the other Party becomes insolvent, files for -any form of bankruptcy, makes any assignment for the benefit of creditors, has a -receiver, administrative receiver or officer appointed over the whole or a -substantial part of its assets, ceases to conduct business, or an act equivalent -to any of the above occurs under the laws of the jurisdiction of the other -Party. - -12.4 Parties´ Rights and Duties upon Termination -Upon expiry or termination of the Agreement Licensee shall cease and shall cause -all Designated Users (including those of its Affiliates’ and Contractors’) to -cease using the Licensed Software and distribution of the Redistributables under -this Agreement. -Notwithstanding the above, in the event the Agreement expires or is terminated: -(i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses possessed - by the Licensee at such date shall be extended to be valid in perpetuity - under the terms of this Agreement and Licensee is entitled to purchase - additional licenses as set forth in Section 10.2; or -(ii) for reason other than by The Qt Company pursuant to item (i) above or - pursuant to Section 12.2, then the Licensee is entitled, for a period of - six (6) months after the effective date of termination, to continue - distribution of Devices under the Distribution Licenses paid but unused at - such effective date of termination. Upon any such termination the Licensee - shall destroy or return to The Qt Company all copies of the Licensed - Software and all related materials and will certify the same to The Qt - Company upon its request, provided however that Licensee may retain and - exploit such copies of the Licensed Software as it may reasonably require - in providing continued support to Customers. -Expiry or termination of this Agreement for any reason whatsoever shall not -relieve Licensee of its obligation to pay any License Fees accrued or payable to -The Qt Company prior to the effective date of termination, and Licensee shall -immediately pay to The Qt Company all such fees upon the effective date of -termination. Termination of this Agreement shall not affect any rights of -Customers to continue use of Applications and Devices (and therein incorporated -Redistributables). - -12.5 Extension in case of bankruptcy -In the event The Qt Company is declared bankrupt under a final, non-cancellable -decision by relevant court of law, and this Agreement is not, at the date of -expiry of the Development License(s) pursuant to Section 3.1, assigned to party, -who has assumed The Qt Company’s position as a legitimate licensor of Licensed -Software under this Agreement, then all valid licenses possessed by the Licensee -at such date of expiry, and which the Licensee has not notified for expiry, -shall be extended to be valid in perpetuity under the terms of this Agreement. - -13. GOVERNING LAW AND LEGAL VENUE -In the event this Agreement is in the name of The Qt Company Inc., a Delaware -Corporation, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of the State of California, USA, excluding its choice of law - provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any dispute, claim or controversy arising out of or relating to this - Agreement or the breach, termination, enforcement, interpretation or - validity thereof, including the determination of the scope or - applicability of this Agreement to arbitrate, shall be determined by - arbitration in San Francisco, USA, before one arbitrator. The arbitration - shall be administered by JAMS pursuant to JAMS' Streamlined Arbitration - Rules and Procedures. Judgment on the Award may be entered in any court - having jurisdiction. This Section shall not preclude parties from seeking - provisional remedies in aid of arbitration from a court of appropriate - jurisdiction. -In the event this Agreement is in the name of The Qt Company Ltd., a Finnish -Company, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of Finland, excluding its choice of law provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any disputes, controversy or claim arising out of or relating to this - Agreement, or the breach, termination or validity thereof shall be shall - be finally settled by arbitration in accordance with the Arbitration Rules - of Finland Chamber of Commerce. The arbitration tribunal shall consist of - one (1), or if either Party so requires, of three (3), arbitrators. The - award shall be final and binding and enforceable in any court of competent - jurisdiction. The arbitration shall be held in Helsinki, Finland and the - process shall be conducted in the English language. This Section shall not - preclude parties from seeking provisional remedies in aid of arbitration - from a court of appropriate jurisdiction. - -14. GENERAL PROVISIONS -14.1 No Assignment -Except in the case of a merger or sale of substantially all of its corporate -assets, Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the prior written -consent of The Qt Company, which shall not be unreasonably withheld or delayed. -The Qt Company shall be entitled to freely assign or transfer any of its rights, -benefits or obligations under this Agreement. - -14.2 No Third Party Representations -Licensee shall make no representations or warranties concerning the Licensed -Software on behalf of The Qt Company. Any representation or warranty Licensee -makes or purports to make on The Qt Company’s behalf shall be void as to The Qt -Company. - -14.3 Surviving Sections -Any terms and conditions that by their nature or otherwise reasonably should -survive termination of this Agreement shall so be deemed to survive. - -14.4 Entire Agreement -This Agreement, the exhibits hereto, the License Certificate and any applicable -Purchase Order constitute the complete agreement between the Parties and -supersedes all prior or contemporaneous discussions, representations, and -proposals, written or oral, with respect to the subject matters discussed -herein. -In the event of any conflict or inconsistency between this Agreement and any -Purchase Order, the terms of this Agreement will prevail over the terms of the -Purchase Order with respect to such conflict or inconsistency. -Parties specifically acknowledge and agree that this Agreement prevails over any -click-to-accept or similar agreements the Designated Users may need to accept -online upon download of the Licensed Software, as may be required by The Qt -Company’s applicable processes relating to Licensed Software. - -14.5 Modifications -No modification of this Agreement shall be effective unless contained in a -writing executed by an authorized representative of each Party. No term or -condition contained in Licensee's Purchase Order shall apply unless expressly -accepted by The Qt Company in writing. - -14.6 Force Majeure -Except for the payment obligations hereunder, neither Party shall be liable to -the other for any delay or non-performance of its obligations hereunder in the -event and to the extent that such delay or non-performance is due to an event of -act of God, terrorist attack or other similar unforeseeable catastrophic event -that prevents either Party for fulfilling its obligations under this Agreement -and which such Party cannot avoid or circumvent (“Force Majeure Event”). If the -Force Majeure Event results in a delay or non-performance of a Party for a -period of three (3) months or longer, then either Party shall have the right to -terminate this Agreement with immediate effect without any liability (except for -the obligations of payment arising prior to the event of Force Majeure) towards -the other Party. - -14.7 Notices -Any notice given by one Party to the other shall be deemed properly given and -deemed received if specifically acknowledged by the receiving Party in writing -or when successfully delivered to the recipient by hand, fax, or special courier -during normal business hours on a business day to the addresses specified for -each Party on the signature page. Each communication and document made or -delivered by one Party to the other Party pursuant to this Agreement shall be in -the English language. - -14.8 Export Control -Licensee acknowledges that the Redistributables may be subject to export control -restrictions under the applicable laws of respective countries. Licensee shall -fully comply with all applicable export license restrictions and requirements as -well as with all laws and regulations relating to the Redistributables and -exercise of licenses hereunder and shall procure all necessary governmental -authorizations, including without limitation, all necessary licenses, approvals, -permissions or consents, where necessary for the re-exportation of the -Redistributables, Applications and/or Devices. - -14.9 No Implied License -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, shall -remain with The Qt Company and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with any -other software or hardware not delivered by The Qt Company under this Agreement. - -14.10 Attorney Fees -The prevailing Party in any action to enforce this Agreement shall be entitled -to recover its attorney’s fees and costs in connection with such action. - -14.11 Severability -If any provision of this Agreement shall be adjudged by any court of competent -jurisdiction to be unenforceable or invalid, that provision shall be limited or -eliminated to the minimum extent necessary so that this Agreement shall -otherwise remain in full force and effect and enforceable. - - - -APPENDICES -The Agreement includes Appendix 1 as shown below. In addition, the Agreement may -include one or more of the Appendices 3-5 listed below depending on the -product(s) purchased by the Licensee, what is stated in the quote or invoice, -and/or what is stated on the License Certificate. - -  -APPENDIX 1: LICENSED SOFTWARE -1a. Licensed Software - Qt Toolkit -Module Description -Qt Core Core non-graphical classes used by other modules. -Qt GUI Base classes for graphical user interface (GUI) - components. -Qt Multimedia Classes for audio, video and camera functionality. -Qt Multimedia Widgets Widget-based classes for implementing multimedia - functionality. -Qt Network Classes to make network programming easier and more - portable. -Qt QML Classes for QML and JavaScript languages. -Qt Quick A declarative framework for building highly dynamic - applications with custom user interfaces. -Qt Quick Controls 2 Provides lightweight QML types for creating - performant user interfaces for desktop, embedded, and - mobile devices. -Qt Quick Dialogs Types for creating and interacting with system - dialogs from a Qt Quick application. -Qt Quick Layouts Layouts are items that are used to arrange Qt Quick 2 - based items in the user interface. -Qt Quick Test A unit test framework for QML applications. -Qt SQL Classes for database integration using SQL. -Qt Test Classes for unit testing Qt applications and - libraries. -Qt Widgets Classes to extend Qt GUI with C++ widgets. -Active Qt Classes for applications which use ActiveX and COM -Qt 3D Functionality for near-realtime simulation systems - with support for 2D and 3D rendering. -Qt Android Extras Provides platform-specific APIs for Android. -Qt Bluetooth Provides access to Bluetooth hardware. -Qt Canvas 3D Enables OpenGL-like 3D drawing calls from Qt Quick - applications using JavaScript. -Qt Concurrent Classes for writing multi-threaded programs without - using low-level threading primitives. -Qt D-Bus Classes for inter-process communication over the - D-Bus protocol. -Qt Gamepad Enables Qt applications to support the use of gamepad - hardware. -Qt Graphical Effects Graphical effects for use with Qt Quick 2. -Qt Help Classes for integrating documentation into - applications, similar to Qt Assistant. -Qt Image Formats Plugins for additional image formats: TIFF, MNG, TGA, - WBMP. -Qt Location Displays map, navigation, and place content in a QML - application. -Qt Mac Extras Provides platform-specific APIs for macOS. -Qt Network Authorization Provides support for OAuth-based authorization to - online services. -Qt NFC Provides access to Near-Field communication (NFC) - hardware. -Qt Platform Headers Provides classes that encapsulate platform-specific - information. -Qt Positioning Provides access to position, satellite and area - monitoring classes. -Qt Print Support Classes to make printing easier and more portable. -Qt Purchasing Enables in-app purchase of products in Qt - applications. -Qt for Python Python bindings for Qt. -Qt Quick Controls Reusable Qt Quick based UI controls to create classic - desktop-style user interfaces. -Qt Quick Extras Provides a specialized set of controls that can be - used to build interfaces in Qt Quick. -Qt Quick Widgets Provides a C++ widget class for displaying a Qt - Quick user interface. -Qt SCXML Provides classes and tools for creating state - machines from SCXML files. -Qt Sensors Provides access to sensor hardware and motion gesture - recognition. -Qt Serial Bus Provides access to serial industrial bus interface. -Qt Serial Port Provides access to hardware and virtual serial ports. -Qt Speech Provides support for accessibility features such as - text-to-speech. -Qt SVG Classes for displaying the contents of SVG files. -Qt UI Tools Classes for loading QWidget based forms created in Qt - Designer dynamically, at runtime. -Qt WebChannel Provides access to QObject or QML objects from HTML - clients for seamless integration of Qt applications - with HTML/JavaScript clients. -Qt WebEngine Classes and functions for embedding web content in - applications using the Chromium browser project. -Qt WebSockets Provides WebSocket communication. -Qt WebView Displays web content in a QML application by using - APIs native to the platform. -Qt Windows Extras Provides platform-specific APIs for Windows. -Qt X11 Extras Provides platform-specific APIs for X11. -Qt XML C++ implementations of SAX and DOM. -Qt XML Patterns Support for XPath, XQuery, XSLT and XML schema - validation. -Qt Wayland Compositor Provides a framework to develop a Wayland compositor. -Qt Charts UI Components for displaying charts. -Qt Data Visualization UI Components for creating 3D data visualizations. -Qt Virtual Keyboard A framework for implementing different input methods - as well as a QML virtual keyboard. - -1b. Licensed software – Embedded software development libraries -Module Description -Boot 2 Qt stack Yocto based Embedded Linux stack for selected - target hardware -Qt OTA Client-side capability for device image - updates Over The Air. -Device Utilities Collection of API’s to manage the device; - E.g. display, WiFi and Bluetooth settings. -Qt Debugging Bridge (QDB) Daemon Enables host-target deployment, debugging, - profiling and other features over USB. Up to - developer to decide if this is left in the - final solution. - -1c. Licensed Software - Qt Tools/Applications -Tool Description -Qt Creator The integrated development environment for Qt. -Qt Designer Qt tool for designing and building graphical user interfaces. -Qt Linguist Tool used to add translations to Qt applications. -Qt Assistant Tool for viewing online documentation in Qt help-file format. -Qmake Utility tool used to automate the generation of make files. -uic User interface compiler for the Qt GUI toolkit. -rcc Resource compiler used for embedding resources into Qt - applications. -lupdate Tool that finds the translatable strings in the specified source, - header and Qt Designer interface files, and produces or updates - translation files. -lrelease Tool that produces translation files in the compact binary format - used by localized Qt applications. -qlalr Qt parser generator tool. -qdoc Configurable documentation generation tool. -qmlscene QML launcher tool -qmlviewer QML launcher tool - -1d. Licensed software –Qt Tools/Applications specific to embedded software -development -Tool Description -Target toolchains Cross compilation toolchains for - supported target devices and operating - systems -Qt Debugging Bridge (QDB) Host Tools Enables deployment, debugging, - profiling and other features over USB - from development host PC to target - device. -qtconfig-gui Qt Lite Configurator tool graphical - interface -Qt Emulator Qt emulator - -2. Parts of the Licensed Software that are permitted for distribution in -object-code form only (“Redistributables”) under this Agreement: - -2a. Qt for Application Development -(i) The Licensed Software's Qt Toolkit libraries defined in 1a -(ii) The Licensed Software's installer framework - -2b. Qt for Device Creation -(i) Qt for Application Development Redistributables defined in 2a -(ii) The Licensed Software’s Embedded software development libraries defined in - 1b - -2c. Qt 3D Studio -The Licensed Software’s Qt 3D Studio Runtime (“Qt53DStudioRuntime2”) - - -APPENDIX 3: ADDITIONS TO LICENSED SOFTWARE -In addition to what is provided under the definition of the Licensed Software, -Parties agree that Licensed Software shall also include the following additional -software products of The Qt Company if included in the quote / invoice: -Qt for Automation - - MQTT software protocol libraries - - KNX software protocol libraries - - OPCUA (open source backend) - - OPCUA (Unified Automation backend) -Qt Safe Renderer - - Qt Safe Renderer library -Qt Application Manager - - Qt Application Manager library with Qt Creator integration - -All the above is considered as Redistributables and subject to applicable -provisions and limitations including but not limited to what is defined in -Section 3. - - -APPENDIX 4: SMALL BUSINESS AND START-UP APPENDIX -The provisions of this Appendix 4 are applicable for Start-up Companies and for -the Evaluation Term. -For the purpose of this Appendix 4, the following additional definitions shall -be applicable: - “Trial Term” shall mean a period of twelve (12) months. - “Start-up Company” means a company with a maximum annual revenue, including - funding, equivalent to 100,000 USD (in applicable currency) during a respective - calendar year, as evidenced by duly audited records of the Licensee and - approved by The Qt Company. - -During the Trial Term, Section 3 shall apply with following modifications -(“Trial Term Modifications”): - - Licenses granted under Sections 3.1 and 3.2 shall be free of any charge. For - clarity, License for distribution of Devices pursuant to Section 3.3 is - subject to applicable License Fee for necessary Distribution Licenses; - - Development License under Section 3.1 is limited to a maximum of three (3) - Designated Users; and - - Support is available subject to availability, as judged by The Qt Company at - its free and absolute discretion. - -Upon expiry of the Trial Term: - a) This Appendix 4 is terminated, Trial Term Modifications cease to remain in - force, Licensee’s Development Licenses shall be automatically converted into - licenses subject to a License Fee (in the amount specified in the quote or - in Appendix 2 and payable with a 30-day payment term) and Licensee’s rights - and obligations under this Agreement shall continue to remain in force under - the standard provisions of the Agreement, unless the Licensee notifies The - Qt Company in writing no less than ninety (90) days before such expiry date - that Licensee does not agree to such continuance, in which event the - Agreement, and all rights of the Licensee thereunder, shall expire; provided - however that - b) in the event the Licensee still qualifies as a Start-up Company, the - Licensee has an option (“Option”), instead of what is stated in item a) - above, to extend the Trial Term renewal is limited to one time and total - duration of Trial Terms thus to 24 months after the effective date. Licensee - shall notify The Qt Company in writing no less than ninety (90) days before - the expiry date, if Licensee wish to exercise the Option. - - -APPENDIX 5: NON-COMMERCIAL USE APPENDIX -The provisions of this Appendix 5 are applicable for non-commercial use of the -Licensed Software by the Licensee. -For the purpose of this Appendix 5, the following additional definitions -(replacing the relevant definition of the Agreement, where applicable) shall be -applicable: - “Demo Units” shall mean (i) hardware development platform, which incorporates - the Licensed Software along with Licensee’s software and/or hardware, and - (ii) prototype versions of Applications or Devices. - “Designated User(s)” shall mean the employees and students of the Licensee. - “Licensee Products” shall mean Applications and/or Devices. - “Permitted Purpose” shall mean (i) Licensee’s internal evaluation and testing - of Licensed Software, (ii) building Demo Units as well as (iii) educational - use. - “Term” shall mean a period of twelve (12) months or any such other period as - may be agreed between the Parties. - -For the purpose of this Appendix 5, the following changes shall be agreed with -respect to relevant Sections of the Agreement: - I. Recital (A) shall be replaced in its entirety to read as follows: “(A) - Licensee wishes to use the Licensed Software for the Permitted Purpose.” - II. Section 3.1 shall be replaced in its entirety to read as follows: - “The Qt Company grants to Licensee a personal, non-exclusive, - non-transferable, revocable, royalty-free license, valid for the Term, to - use, modify and copy the Licensed Software solely for the Permitted - Purpose. Licensee may install copies of the Licensed Software on an - unlimited number of computers provided that only Designated Users may use - the Licensed Software. Licensee may demonstrate the Demo Units, provided - that such demonstrations must be conducted by Licensee, and the Demo Units - must remain in Licensee’s possession and under Licensee’s control at all - times. For clarity, this Agreement does not (i) entitle Licensee to use - Licensed Software to create Applications or Devices (other than prototypes - thereof) or (ii) carry any distribution rights to Licensee, but such - rights are subject to and conditional upon conclusion of a separate - license agreement with The Qt Company.” - III. Sections 3.2, 3.3, 8 and 10 shall be deleted. - IV. Section 3.4 shall be replaced in its entirety to read as follows: - “Licensee shall not: - - remove or alter any copyright, trademark or other proprietary rights - notice contained in any portion of the Licensed Software; - - transfer, publish, sublicense, disclose, display or otherwise make - the Licensed Software available to any third party (except that - Licensee may demonstrate the Demo Units pursuant to Section 3.1); - - in any way combine, incorporate or integrate Licensed Software with, or - use Licensed Software for creation of, any software created with or - incorporating Open Source Qt; - Licensee shall cause all Designated Users who make use of the licenses - granted under this Agreement, to be contractually bound to comply with - the relevant terms of this Agreement and not to use the Licensed - Software beyond the terms hereof. Licensee shall be responsible for any - and all actions and omissions of its Designated Users relating to the - Licensed Software and use thereof. Any use of Licensed Software beyond - the provisions of this Agreement is strictly prohibited and requires an - additional license from The Qt Company.” - V. Section 12 shall be replaced in its entirety to read as follows: - “This Agreement shall enter into force upon due acceptance by both Parties - and remain in force for the Term, unless and until terminated pursuant to - the terms of Section 12. Upon termination of the Agreement, Licensee shall - cease using the Licensed Software. All other copies of Licensed Software - in the possession or control of Licensee must be erased or destroyed. An - officer of Licensee must, upon request, promptly deliver to The Qt Company - a written confirmation that this has occurred.” - -Except for the modifications specified above, this Appendix carries no change to -the terms of the Agreement which shall remain in full force. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT qtquickcontrols2-opensource-src-5.9.5/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT --- qtquickcontrols2-opensource-src-5.12.5+dfsg/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 2019-09-06 12:05:25.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/.QT-FOR-AUTOMATION-LICENSE-AGREEMENT 1970-01-01 00:00:00.000000000 +0000 @@ -1,1089 +0,0 @@ -QT LICENSE AGREEMENT -Agreement version 4.1 -This License Agreement (“Agreement”) is a legal agreement between The Qt Company -(as defined below) and the Licensee (as defined below) for the license of -Licensed Software (as defined below). Capitalized terms used herein are defined -in Section 1. -WHEREAS: - -(A) Licensee wishes to use the Licensed Software for the purpose of developing - and distributing Applications and/or Devices; and -(B) The Qt Company is willing to grant the Licensee a right to use Licensed - Software for such purpose pursuant to term and conditions of this Agreement. - -NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: - -1. DEFINITIONS -“Affiliate” of a Party shall mean an entity (i) which is directly or indirectly -controlling such Party; (ii) which is under the same direct or indirect -ownership or control as such Party; or (iii) which is directly or indirectly -owned or controlled by such Party. For these purposes, an entity shall be -treated as being controlled by another if that other entity has fifty percent -(50 %) or more of the votes in such entity, is able to direct its affairs and/or -to control the composition of its board of directors or equivalent body. - -“Add-on Products” shall mean The Qt Company’s specific add-on software products -(for example Qt Safe Renderer, Qt for Automation, Qt Application Manager), which -are not licensed as part of The Qt Company’s standard offering, but shall be -included into the scope of Licensed Software only if so specifically agreed -between the Parties. - -“Applications” shall mean Licensee's software products created using the -Licensed Software, which may include the Redistributables, or part thereof. - -“Contractor(s)” shall mean third party consultants, distributors and contractors -performing services to a Party under applicable contractual arrangement. - -“Customer(s)” shall mean Licensee’s end users to whom Licensee, directly or -indirectly, distributes copies of the Redistributables. - -“Deployment Platforms” shall mean operating systems specified in the License -Certificate, in which the Redistributables can be distributed pursuant to the -terms and conditions of this Agreement. - -“Designated User(s)” shall mean the employee(s) of Licensee or Licensee’s -Affiliates acting within the scope of their employment or Licensee's Contractors -acting within the scope of their services for Licensee and on behalf of -Licensee. Designated Users shall be named in the License Certificate. - -“Development License” shall mean the license needed by the Licensee for each -Designated User to use the Licensed Software under the license grant described -in Section 3.1 of this Agreement. Development Licenses are available separately -for Qt for Application Development (desktop) and Qt for Device Creation -(embedded) products, each product having its designated scope and purpose of -use. Distribution Licenses are always connected to Qt for Device Creation -product only. - -“Development Platforms” shall mean those operating systems specified in the -License Certificate, in which the Licensed Software can be used under the -Development License, but not distributed in any form or used for any other -purpose. - -“Devices” shall mean hardware devices or products that 1) are manufactured -and/or distributed by the Licensee or its Affiliates or Contractors, and 2) -(i) incorporate or integrate the Redistributables or parts thereof; or (ii) do -not incorporate or integrate the Redistributables at the time of distribution, -but where, when used by a Customer, the main user interface or substantial -functionality of such device is provided by Application(s) or otherwise depends -on the Licensed Software. Devices shall be specified in Appendix 2 or in a -quote. - -“Distribution License(s)” shall mean the license required for distribution of -Redistributables in connection with Devices pursuant to license grant described -in Section 3.3 of this Agreement. - -“Distribution License Packs” shall mean set of prepaid Distribution Licenses for -distribution of Redistributables, as defined in The Qt Company’s standard price -list, quote, Purchase Order confirmation or in an appendix hereto, as the case -may be. - -“Intellectual Property Rights” shall mean patents (including utility models), -design patents, and designs (whether or not capable of registration), chip -topography rights and other like protection, copyrights, trademarks, service -marks, trade names, logos or other words or symbols and any other form of -statutory protection of any kind and applications for any of the foregoing as -well as any trade secrets. - -“License Certificate” shall mean a certificate generated by The Qt Company for -each Designated User respectively upon them downloading the Licensed Software. -License Certificate will be available under respective Designated User’s Qt -Account at account.qt.io and it will specify the Designated User, the -Development Platforms, Deployment Platforms and the License Term. The terms of -the License Certificate are considered part of this Agreement and shall be -updated from time to time to reflect any agreed changes to the foregoing terms -relating to Designated User’s rights to the Licensed Software. - -“License Fee” shall mean the fee charged to the Licensee for rights granted -under the terms of this Agreement. - -“License Term” shall mean the agreed validity period of the Development License -of the respective Designated User, during which time the Designated User is -entitled to use the Licensed Software, as set forth in the respective License -Certificate. - -“Licensed Software” shall mean either -(i) Qt for Application Development or -(ii) Qt for Device Creation, and/or -(iii) Qt 3D Studio, and/or -(iv) Qt Design Studio, and/or -(v) selected Add-on Products, if any, depending on which product(s) the - Licensee has purchased under this Agreement, - -as well as corresponding online or electronic documentation, associated media -and printed materials, including the source code, example programs and the -documentation, licensed to the Licensee under this Agreement. Licensed Software -does not include Third Party Software (as defined in Section 4) or Open Source -Qt. The Qt Company may, in the course of its development activities, at its free -and absolute discretion and without any obligation to send or publish any -notifications to the Licensee or in general, make changes, additions or -deletions in the components and functionalities of the Licensed Software, -provided that no such changes, additions or deletions will affect the already -released version of the Licensed Software, but only upcoming version(s). - -“Licensee” shall mean the individual or legal entity that is party to this -Agreement, as identified on the signature page hereof. - -“Licensee’s Records” shall mean books and records that are likely to contain -information bearing on Licensee’s compliance with this Agreement or the payments -due to The Qt Company under this Agreement, including, but not limited to: -assembly logs, sales records and distribution records. - -“Modified Software” shall have the meaning as set forth in Section 2.3. - -“Online Services” shall mean any services or access to systems made available by -The Qt Company to the Licensee over the Internet relating to the Licensed -Software or for the purpose of use by the Licensee of the Licensed Software or -Support. Use of any such Online Services is discretionary for the Licensee and -some of them may be subject to additional fees. - -“Open Source Qt” shall mean the non-commercial Qt computer software products, -licensed under the terms of the GNU Lesser General Public License, version 2.1 -or later (“LGPL”) or the GNU General Public License, version 2.0 or later -(“GPL”). For clarity, Open Source Qt shall not be provided nor governed under -this Agreement. - -”Party” or “Parties” shall mean Licensee and/or The Qt Company. - -“Qt 3D Studio” shall mean all versions of The Qt Company’s Qt 3D Studio, a 3D -user interface design and development environment for rapid designing and -prototyping of animated user interfaces. - -“Qt Design Studio” shall mean all versions of The Qt Company’s Qt Design Studio -tool, a 2D user interface design and development environment for rapid designing -and prototyping of animated user interfaces. - -“Qt for Application Development” shall mean The Qt Company’s productized -offering, which consist of all versions of -(i) Qt Toolkit, and -(ii) Qt Tools/Applications. - -“Qt for Device Creation” shall mean The Qt Company’s productized offering, -which consist of all versions of -(i) Qt for Application Development, and -(ii) Software components specific to embedded software development as set forth - in Appendix 1, Sections 1b and 1d. - -“Qt Toolkit” shall mean the modules defined in Appendix 1, Section 1a. - -“Qt Tools/Applications” shall mean the tools defined in Appendix 1, Section 1c. - -"Redistributables" shall mean the portions of the Licensed Software set forth in -Appendix 1, Section 2 that may be distributed pursuant to the terms of this -Agreement in object code form only, including any relevant documentation. Where -relevant, any reference to Licensed Software in this Agreement shall include and -refer also to Redistributables. - -“Renewal Term” shall mean an extension of previous License Term as agreed -between the Parties. - -“Submitted Modified Software” shall have the meaning as set forth in -Section 2.3. - -“Support” shall mean standard developer support that is provided by The Qt -Company to assist Designated Users in using the Licensed Software in accordance -with The Qt Company’s standard support terms and as further defined in -Section 8 hereunder. - -“Taxes” shall have the meaning set forth in Section 10.5. - -“Term” shall have the meaning set forth in Section 12. - -“The Qt Company” shall mean: -(i) in the event Licensee is an individual residing in the United States or a - legal entity incorporated in the United States or having its headquarters - in the United States, The Qt Company Inc., a Delaware corporation with its - office at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, - USA.; or -(ii) in the event the Licensee is an individual residing outside of the United - States or a legal entity incorporated outside of the United States or - having its registered office outside of the United States, The Qt Company - Ltd., a Finnish company with its registered office at Bertel Jungin aukio - D3A, 02600 Espoo, Finland. - -"Third Party Software " shall have the meaning set forth in Section 4. - -“Updates” shall mean a release or version of the Licensed Software containing -bug fixes, error corrections and other changes that are generally made available -to users of the Licensed Software that have contracted for Support. Updates are -generally depicted as a change to the digits following the decimal in the -Licensed Software version number. The Qt Company shall make Updates available to -the Licensee under the Support. Updates shall be considered as part of the -Licensed Software hereunder. - -“Upgrades” shall mean a release or version of the Licensed Software containing -enhancements and new features and are generally depicted as a change to the -first digit of the Licensed Software version number. In the event Upgrades are -provided to the Licensee under this Agreement, they shall be considered as part -of the Licensed Software hereunder. - -2. OWNERSHIP -2.1 Ownership of The Qt Company -The Licensed Software is protected by copyright laws and international copyright -treaties, as well as other intellectual property laws and treaties. The Licensed -Software is licensed, not sold. All The Qt Company's Intellectual Property -Rights are and shall remain the exclusive property of The Qt Company or its -licensors respectively. - -2.2 Ownership of Licensee -All the Licensee's Intellectual Property Rights are and shall remain the -exclusive property of the Licensee or its licensors respectively. All -Intellectual Property Rights to the Modified Software, Applications and Devices -shall remain with the Licensee and no rights thereto shall be granted by the -Licensee to The Qt Company under this Agreement (except as set forth in Section -2.3 below). - -2.3 Modified Software -Licensee may create bug-fixes, error corrections, patches or modifications to -the Licensed Software (“Modified Software”). Such Modified Software may break -the source or binary compatibility with the Licensed Software (including without -limitation through changing the application programming interfaces ("API") or by -adding, changing or deleting any variable, method, or class signature in the -Licensed Software and/or any inter-process protocols, services or standards in -the Licensed Software libraries). To the extent that Licensee’s Modified -Software so breaks source or binary compatibility with the Licensed Software, -Licensee acknowledges that The Qt Company's ability to provide Support may be -prevented or limited and Licensee's ability to make use of Updates may be -restricted. Licensee may, at its sole and absolute discretion, choose to submit -Modified Software to The Qt Company (“Submitted Modified Software”) in -connection with Licensee’s Support request, service request or otherwise. In the -event Licensee does so, then, Licensee hereby grants The Qt Company a -sublicensable, assignable, irrevocable, perpetual, worldwide, non-exclusive, -royalty-free and fully paid-up license, under all of Licensee’s Intellectual -Property Rights, to reproduce, adapt, translate, modify, and prepare derivative -works of, publicly display, publicly perform, sublicense, make available and -distribute such Submitted Modified Software as The Qt Company sees fit at its -free and absolute discretion. - -3. LICENSES GRANTED -3.1 Development with Licensed Software -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable license, valid for the -License Term, to use, modify and copy the Licensed Software by Designated Users -on the Development Platforms for the sole purposes of designing, developing, -demonstrating and testing Application(s) and/or Devices, and to provide thereto -related support and other related services to end-user Customers. Licensee may -install copies of the Licensed Software on an unlimited number of computers -provided that (i) only the Designated Users may use the Licensed Software, and -(ii) all Designated Users must have a valid Development License to use Licensed -Software. Licensee may at any time designate another Designated User to replace -a then-current Designated User by notifying The Qt Company in writing, provided -that any Designated User may be replaced only once during any six-month period. -Upon expiry of the initially agreed License Term, the respective License Terms -shall be automatically extended to one or more Renewal Term(s), unless and until -either Party notifies the other Party in writing that it does not wish to -continue the License Term, such notification to be provided to the other Party -no less than ninety (90) days before expiry of the respective License Term. -Unless otherwise agreed between the Parties, Renewal Term shall be of equal -length with the initial Term. Any such Renewal Term shall be subject to License -Fees agreed between the Parties or, if no advance agreement exists, subject to -The Qt Company’s standard pricing applicable at the commencement date of any -such Renewal Term. - -3.2 Distribution of Applications -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through its Contractors, Redistributables as installed, -incorporated or integrated into Applications for execution on the Deployment -Platforms, and (ii) grant sublicenses to Redistributables, as distributed -hereunder, for Customers solely for Customer’s internal use and to the extent -necessary in order for the Customers to use the Applications for their -respective intended purposes. -Right to distribute the Redistributables as part of an Application as provided -herein is not royalty-bearing but is conditional upon the Licensee having paid -the agreed Development Licenses from The Qt Company before distributing any -Redistributables to Customers. - -3.3 Distribution of Devices -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through one or more tiers of Contractors, -Redistributables as installed, incorporated or integrated, or intended to be -installed, incorporated or integrated into Devices for execution on the -Deployment Platforms, and (ii) grant sublicenses to Redistributables, as -distributed hereunder, for Customers solely for Customer’s internal use and to -the extent necessary in order for the Customers to use the Devices for their -respective intended purposes. -Right to distribute the Redistributables with Devices as provided herein is -conditional upon the Licensee having purchased and paid the appropriate amount -of Development Licenses for Qt for Device Creation product and Distribution -Licenses from The Qt Company before distributing any Redistributables to -Customers. - -3.4 Further Requirements -The licenses granted above in this Section 3 by The Qt Company to Licensee are -conditional and subject to Licensee's compliance with the following terms: -(i) Licensee shall not remove or alter any copyright, trademark or other - proprietary rights notice contained in any portion of the Licensed - Software; -(ii) Applications must add primary and substantial functionality to the - Licensed Software; -(iii) Applications may not pass on functionality which in any way makes it - possible for others to create software with the Licensed Software; - provided however that Licensee may use the Licensed Software's scripting - and QML ("Qt Quick") functionality solely in order to enable scripting, - themes and styles that augment the functionality and appearance of the - Application(s) without adding primary and substantial functionality to - the Application(s); -(iv) Applications must not compete with the Licensed Software; -(v) Licensee shall not use The Qt Company's or any of its suppliers' names, - logos, or trademarks to market Applications, except that Licensee may use - “Built with Qt” logo to indicate that Application(s) was developed using - the Licensed Software; -(vi) Licensee shall not distribute, sublicense or disclose source code of - Licensed Software to any third party (provided however that Licensee may - appoint employee(s) of Contractors as Designated Users to use Licensed - Software pursuant to this Agreement). Such right may be available for the - Licensee subject to a separate software development kit (“SDK”) license - agreement to be concluded with The Qt Company; -(vii) Licensee shall not grant the Customers a right to (i) make copies of the - Redistributables except when and to the extent required to use the - Applications and/or Devices for their intended purpose, (ii) modify the - Redistributables or create derivative works thereof, (iii) decompile, - disassemble or otherwise reverse engineer Redistributables, or (iv) - redistribute any copy or portion of the Redistributables to any third - party, except as part of the onward sale of the Device on which the - Redistributables are installed; -(viii) Licensee shall not and shall cause that its Affiliates or Contractors - shall not a) in any way combine, incorporate or integrate Licensed - Software with, or use Licensed Software for creation of, any software - created with or incorporating Open Source Qt, or b) incorporate or - integrate Applications into a hardware device or product other than a - Device, unless Licensee has received an advance written permission from - The Qt Company to do so. Absent such written permission, any and all - distribution by the Licensee during the Term of a hardware device or - product a) which incorporate or integrate any part of Licensed Software - or Open Source Qt; or b) where the main user interface or substantial - functionality is provided by software built with Licensed Software or - Open Source Qt or otherwise depends on the Licensed Software or Open - Source Qt, shall be considered as a Device distribution under this - Agreement and dependent on compliance thereof (including but not limited - to obligation to pay applicable License Fees for such distribution). - Notwithstanding what is provided above in this sub-section (viii), - Licensee is entitled to use and combine Qt 3D Studio and/or Qt Design - Studio with Open Source Qt (“Combination”) for its internal evaluation - purposes, provided that Licensee shall in no way transfer, publish, - disclose, display or otherwise make available any software or work - resulting from such Combination; -(ix) Licensee shall cause all of its Affiliates and Contractors entitled to - make use of the licenses granted under this Agreement, to be - contractually bound to comply with the relevant terms of this Agreement - and not to use the Licensed Software beyond the terms hereof and for any - purposes other than operating within the scope of their services for - Licensee. Licensee shall be responsible for any and all actions and - omissions of its Affiliates and Contractors relating to the Licensed - Software and use thereof (including but not limited to payment of all - applicable License Fees); -(x) Except when and to the extent explicitly provided in this Section 3, - Licensee shall not transfer, publish, disclose, display or otherwise - make available the Licensed Software; -; and -(xi) Licensee shall not attempt or enlist a third party to conduct or attempt - to conduct any of the above. - -Above terms shall not be applicable if and to the extent they conflict with any -mandatory provisions of any applicable laws. Any use of Licensed Software beyond -the provisions of this Agreement is strictly prohibited and requires an -additional license from The Qt Company. - -4. THIRD PARTY SOFTWARE -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. Third -Party Software does not comprise part of the Licensed Software. In some cases, -access to Third Party Software may be included in the Licensed Software. Such -Third Party Software will be listed in the ".../src/3rdparty" source tree -delivered with the Licensed Software or documented in the Licensed Software, as -such may be amended from time to time. Licensee acknowledges that use or -distribution of Third Party Software is in all respects subject to applicable -license terms of applicable third party right holders. - -5. PRE-RELEASE CODE -The Licensed Software may contain pre-release code and functionality marked or -otherwise stated as “Technology Preview”, “Alpha”, “Beta” or similar -designation. Such pre-release code may be present in order to provide -experimental support for new platforms or preliminary versions of one or more -new functionalities. The pre-release code may not be at the level of performance -and compatibility of a final, generally available, product offering of the -Licensed Software. The pre-release parts of the Licensed Software may not -operate correctly, may contain errors and may be substantially modified by The -Qt Company prior to the first commercial product release, if any. The Qt Company -is under no obligation to make pre-release code commercially available, or -provide any Support or Updates relating thereto. The Qt Company assumes no -liability whatsoever regarding any pre-release code, but any use thereof is -exclusively at Licensee’s own risk and expense. For clarity, Licensee is -entitled to use such pre-release code pursuant to Section 3, just like other -Licensed Software, provided however that in the event Add-on Products are -included and available as such pre-release code, Licensee’s right to use such -Add-on Products is nevertheless subject to and conditional upon conclusion of -separate agreement with The Qt Company. - -6. LIMITED WARRANTY AND WARRANTY DISCLAIMER -The Qt Company hereby represents and warrants that it has the power and -authority to grant the rights and licenses granted to Licensee under this -Agreement. Except as set forth above, the Licensed Software is licensed to -Licensee "as is" and Licensee’s exclusive remedy and The Qt Company’s entire -liability for errors in the Licensed Software shall be limited, at The Qt -Company’s option, to correction of the error, replacement of the Licensed -Software or return of the applicable fees paid for the defective Licensed -Software for the time period during which the License is not able to utilize the -Licensed Software under the terms of this Agreement. - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF -ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER -WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND -NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT -WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE’S REQUIREMENTS OR THAT -IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE -UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE -RISK OF AND RESPONSIBILITY OF LICENSEE. - -7. INDEMNIFICATION AND LIMITATION OF LIABILITY -7.1 Limitation of Liability -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, -LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, -CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, -HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES -SPECIFICALLY AGREE THAT LICENSEE’S OBLIGATION TO PAY LICENSE AND OTHER FEES -CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE CONSIDERED -AS A DIRECT DAMAGE. EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL -MISCONDUCT, AND (II) BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY -APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY’S TOTAL AGGREGATE LIABILITY UNDER -THIS AGREEMENT EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT -COMPANY FROM LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY -PRECEDING THE EVENT RESULTING IN SUCH LIABILITY. THE PROVISIONS OF THIS SECTION -7 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN THE QT COMPANY AND LICENSEE -AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET FORTH HEREIN IN DETERMINING -WHETHER TO ENTER INTO THIS AGREEMENT. - -7.2 Licensee´s Indemnification -Licensee shall indemnify and hold harmless The Qt Company from and against any -claim, injury, judgment, settlement, loss or expense, including attorneys' fees -related to: (a) Licensee’s misrepresentation in connection with The Qt Company -or the Licensed Software or breach of this Agreement, (b) the Application or -Device (except where such cause of liability is solely attributable to the -Licensed Software). - -8. SUPPORT, UPDATES AND ONLINE SERVICES -Upon due payment of the agreed License Fees the Licensee will be eligible to -receive Support and Updates and to use the Online Services during the License -Term, provided, however, that in the event the License Term is longer than 36 -months, Support is provided only for the first 12 months, unless the Parties -specifically otherwise agree. Unless otherwise decided by The Company at its -free and absolute discretion, Upgrades will not be included in the Support but -may be available subject to additional fees. From time to time The Qt Company -may change the Support terms, provided that during the respective ongoing -License Term the level of Support provided by The Qt Company may not be reduced -without the consent of the Licensee. Unless otherwise agreed, The Qt Company -shall not be responsible for providing any service or support to Customers. - -9. CONFIDENTIALITY -Each Party acknowledges that during the Term of this Agreement each Party may -receive information about the other Party's business, business methods, business -plans, customers, business relations, technology, and other information, -including the terms of this Agreement, that is confidential and of great value -to the other Party, and the value of which would be significantly reduced if -disclosed to third parties (“Confidential Information”). Accordingly, when a -Party (the “Receiving Party”) receives Confidential Information from the other -Party (the “Disclosing Party”), the Receiving Party shall only disclose such -information to employees and Contractors on a need to know basis, and shall -cause its employees and employees of its Affiliates to: (i) maintain any and all -Confidential Information in confidence; (ii) not disclose the Confidential -Information to a third party without the Disclosing Party's prior written -approval; and (iii) not, directly or indirectly, use the Confidential -Information for any purpose other than for exercising its rights and fulfilling -its responsibilities pursuant to this Agreement. Each Party shall take -reasonable measures to protect the Confidential Information of the other Party, -which measures shall not be less than the measures taken by such Party to -protect its own confidential and proprietary information. Obligation of -confidentiality shall not apply to information that (i) is or becomes generally -known to the public through no act or omission of the Receiving Party; (ii) was -in the Receiving Party's lawful possession prior to the disclosure hereunder and -was not subject to limitations on disclosure or use; (iii) is developed -independently by employees or Contractors of the Receiving Party or other -persons working for the Receiving Party who have not had access to the -Confidential Information of the Disclosing Party, as proven by the written -records of the Receiving Party; (iv) is lawfully disclosed to the Receiving -Party without restrictions, by a third party not under an obligation of -confidentiality; or (v) the Receiving Party is legally compelled to disclose, in -which case the Receiving Party shall notify the Disclosing Party of such -compelled disclosure and assert the privileged and confidential nature of the -information and cooperate fully with the Disclosing Party to limit the scope of -disclosure and the dissemination of disclosed Confidential Information to the -minimum extent necessary. The obligations under this Section 9 shall continue to -remain in force for a period of five (5) years after the last disclosure, and, -with respect to trade secrets, for so long as such trade secrets are protected -under applicable trade secret laws. - -10. FEES, DELIVERY AND PAYMENT -10.1 License Fees -License Fees are described in The Qt Company’s standard price list, quote or -Purchase Order confirmation or in an appendix hereto, as the case may be. The -License Fees shall not be refunded or claimed as a credit in any event or for -any reason whatsoever. - -10.2 Ordering Licenses -Licensee may purchase Development Licenses and Distribution Licenses pursuant to -agreed pricing terms or, if no specific pricing terms have been agreed upon, at -The Qt Company's standard pricing terms applicable at the time of purchase. -Licensee shall submit all purchase orders for Development Licenses and -Distribution Licenses to The Qt Company by email or any other method acceptable -to The Qt Company (each such order is referred to herein as a “Purchase Order”) -for confirmation, whereupon the Purchase Order shall become binding between the -Parties. - -10.3 Distribution License Packs -Unless otherwise agreed, Distribution Licenses shall be purchased by way of -Distribution License Packs. Upon due payment of the ordered Distribution License -Pack(s), the Licensee will have an account of Distribution Licenses available -for installing, bundling or integrating (all jointly “installing”) the -Redistributables with the Devices or for otherwise distributing the -Redistributables in accordance with this Agreement. Each time Licensee -“installs” or distributes a copy of Redistributables, then one Distribution -License is used, and Licensee’s account of available Distribution Licenses is -decreased accordingly. Licensee may “install” copies of the Redistributables so -long as Licensee has Distribution Licenses remaining on its account. -Redistributables will be deemed to have been “installed” into a Device when one -of the following circumstances shall have occurred: a) the Redistributables have -been loaded onto the Device and used outside of the Licensee’s premises or b) -the Device has been fully tested and placed into Licensee's inventory (or sold) -for the first time (i.e., Licensee will not be required to use (or pay for) more -than one Distribution License for each individual Device, e.g. in a situation -where a Device is returned to Licensee's inventory after delivery to a -distributor or sale to a Customer). In addition, if Licensee includes a back-up -copy of the Redistributables on a CD-ROM or other storage medium along with the -product, that backup copy of the Redistributables will not be deemed to have -been “installed” and will not require an additional Distribution License. - -10.4 Payment Terms -License Fees and any other charges under this Agreement shall be paid by -Licensee no later than thirty (30) days from the date of the applicable invoice -from The Qt Company. The Qt Company will submit an invoice to Licensee after the -date of this Agreement and/or after The Qt Company receives a Purchase Order -from Licensee. A late payment charge of the lower of (a) one percent per month; -or (b) the interest rate stipulated by applicable law, shall be charged on any -unpaid balances that remain past due. The Qt Company shall have the right to -suspend, terminate or withhold grants of all rights to the Licensed Software -hereunder, including but not limited to the Developer License, Distribution -License, and Support, should Licensee fail to make payment in timely fashion. - -10.5 Taxes -All License Fees and other charges payable hereunder are gross amounts but -exclusive of any value added tax, use tax, sales tax and other taxes, duties or -tariffs (“Taxes”). Such applicable Taxes shall be paid by Licensee, or, where -applicable, in lieu of payment of such Taxes, Licensee shall provide an -exemption certificate to The Qt Company and any applicable authority. - -11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS -11.1 Licensee’s Record-keeping -Licensee shall at all times maintain accurate and up-to-date written records of -Licensee’s activities related to the use of Licensed Software and distribution -of Redistributables. The records shall be adequate to determine Licensee’s -compliance with the provisions of this Agreement and to demonstrate the number -of Designated Users and Redistributables distributed by Licensee. The records -shall conform to good accounting practices reasonably acceptable to The Qt -Company. Licensee shall, within thirty (30) days from receiving The Qt Company’s -request to that effect, deliver to The Qt Company a report on Licensee’s usage -of Licensed Software, such report to contain information, in sufficient detail, -on (i) amount of users working with Licensed Software, (ii) copies of -Redistributables distributed by Licensee during that calendar quarter, (iii) -number of undistributed copies of Redistributables and corresponding number of -unused Distribution Licenses remaining on Licensee’s account, and (iv) any other -information as The Qt Company may reasonably require from time to time. - -11.2. The Qt Company’s Audit Rights -The Qt Company or an independent auditor acting on behalf of The Qt Company’s, -may, upon at least five (5) business days’ prior written notice and at its -expense, audit Licensee with respect to the use of the Redistributables, but not -more frequently than once during each 6-month period. Such audit may be -conducted by mail, electronic means or through an in-person visit to Licensee’s -place of business. Any such in-person audit shall be conducted during regular -business hours at Licensee's facilities and shall not unreasonably interfere -with Licensee's business activities. The Qt Company or the independent auditor -acting on behalf of The Qt Company shall be entitled to inspect Licensee’s -Records. All such Licensee’s Records and use thereof shall be subject to an -obligation of confidentiality under this Agreement. If an audit reveals that -Licensee is using the Licensed Software beyond scope of the licenses Licensee -has paid for, Licensee agrees to immediately pay The Qt Company any amounts owed -for such unauthorized use. -In addition, in the event the audit reveals a material violation of the terms of -this Agreement (underpayment of more than 5% of License Fees shall always be -deemed a material violation for purposes of this section), then the Licensee -shall pay The Qt Company's reasonable cost of conducting such audit. - -12 TERM AND TERMINATION -12.1 Term -This Agreement shall enter into force upon due acceptance by both Parties and -remain in force for as long as there is any Development License(s) in force -(“Term”), unless and until terminated pursuant to the terms of this Section 12. - -12.2 Termination by The Qt Company -The Qt Company shall have the right to terminate this Agreement upon thirty (30) -days prior written notice if the Licensee is in material breach of any -obligation of this Agreement and fails to remedy such breach within such notice -period. - -12.3 Mutual Right to Terminate -Either Party shall have the right to terminate this Agreement immediately upon -written notice in the event that the other Party becomes insolvent, files for -any form of bankruptcy, makes any assignment for the benefit of creditors, has a -receiver, administrative receiver or officer appointed over the whole or a -substantial part of its assets, ceases to conduct business, or an act equivalent -to any of the above occurs under the laws of the jurisdiction of the other -Party. - -12.4 Parties´ Rights and Duties upon Termination -Upon expiry or termination of the Agreement Licensee shall cease and shall cause -all Designated Users (including those of its Affiliates’ and Contractors’) to -cease using the Licensed Software and distribution of the Redistributables under -this Agreement. -Notwithstanding the above, in the event the Agreement expires or is terminated: -(i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses possessed - by the Licensee at such date shall be extended to be valid in perpetuity - under the terms of this Agreement and Licensee is entitled to purchase - additional licenses as set forth in Section 10.2; or -(ii) for reason other than by The Qt Company pursuant to item (i) above or - pursuant to Section 12.2, then the Licensee is entitled, for a period of - six (6) months after the effective date of termination, to continue - distribution of Devices under the Distribution Licenses paid but unused at - such effective date of termination. Upon any such termination the Licensee - shall destroy or return to The Qt Company all copies of the Licensed - Software and all related materials and will certify the same to The Qt - Company upon its request, provided however that Licensee may retain and - exploit such copies of the Licensed Software as it may reasonably require - in providing continued support to Customers. -Expiry or termination of this Agreement for any reason whatsoever shall not -relieve Licensee of its obligation to pay any License Fees accrued or payable to -The Qt Company prior to the effective date of termination, and Licensee shall -immediately pay to The Qt Company all such fees upon the effective date of -termination. Termination of this Agreement shall not affect any rights of -Customers to continue use of Applications and Devices (and therein incorporated -Redistributables). - -12.5 Extension in case of bankruptcy -In the event The Qt Company is declared bankrupt under a final, non-cancellable -decision by relevant court of law, and this Agreement is not, at the date of -expiry of the Development License(s) pursuant to Section 3.1, assigned to party, -who has assumed The Qt Company’s position as a legitimate licensor of Licensed -Software under this Agreement, then all valid licenses possessed by the Licensee -at such date of expiry, and which the Licensee has not notified for expiry, -shall be extended to be valid in perpetuity under the terms of this Agreement. - -13. GOVERNING LAW AND LEGAL VENUE -In the event this Agreement is in the name of The Qt Company Inc., a Delaware -Corporation, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of the State of California, USA, excluding its choice of law - provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any dispute, claim or controversy arising out of or relating to this - Agreement or the breach, termination, enforcement, interpretation or - validity thereof, including the determination of the scope or - applicability of this Agreement to arbitrate, shall be determined by - arbitration in San Francisco, USA, before one arbitrator. The arbitration - shall be administered by JAMS pursuant to JAMS' Streamlined Arbitration - Rules and Procedures. Judgment on the Award may be entered in any court - having jurisdiction. This Section shall not preclude parties from seeking - provisional remedies in aid of arbitration from a court of appropriate - jurisdiction. -In the event this Agreement is in the name of The Qt Company Ltd., a Finnish -Company, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of Finland, excluding its choice of law provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any disputes, controversy or claim arising out of or relating to this - Agreement, or the breach, termination or validity thereof shall be shall - be finally settled by arbitration in accordance with the Arbitration Rules - of Finland Chamber of Commerce. The arbitration tribunal shall consist of - one (1), or if either Party so requires, of three (3), arbitrators. The - award shall be final and binding and enforceable in any court of competent - jurisdiction. The arbitration shall be held in Helsinki, Finland and the - process shall be conducted in the English language. This Section shall not - preclude parties from seeking provisional remedies in aid of arbitration - from a court of appropriate jurisdiction. - -14. GENERAL PROVISIONS -14.1 No Assignment -Except in the case of a merger or sale of substantially all of its corporate -assets, Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the prior written -consent of The Qt Company, which shall not be unreasonably withheld or delayed. -The Qt Company shall be entitled to freely assign or transfer any of its rights, -benefits or obligations under this Agreement. - -14.2 No Third Party Representations -Licensee shall make no representations or warranties concerning the Licensed -Software on behalf of The Qt Company. Any representation or warranty Licensee -makes or purports to make on The Qt Company’s behalf shall be void as to The Qt -Company. - -14.3 Surviving Sections -Any terms and conditions that by their nature or otherwise reasonably should -survive termination of this Agreement shall so be deemed to survive. - -14.4 Entire Agreement -This Agreement, the exhibits hereto, the License Certificate and any applicable -Purchase Order constitute the complete agreement between the Parties and -supersedes all prior or contemporaneous discussions, representations, and -proposals, written or oral, with respect to the subject matters discussed -herein. -In the event of any conflict or inconsistency between this Agreement and any -Purchase Order, the terms of this Agreement will prevail over the terms of the -Purchase Order with respect to such conflict or inconsistency. -Parties specifically acknowledge and agree that this Agreement prevails over any -click-to-accept or similar agreements the Designated Users may need to accept -online upon download of the Licensed Software, as may be required by The Qt -Company’s applicable processes relating to Licensed Software. - -14.5 Modifications -No modification of this Agreement shall be effective unless contained in a -writing executed by an authorized representative of each Party. No term or -condition contained in Licensee's Purchase Order shall apply unless expressly -accepted by The Qt Company in writing. - -14.6 Force Majeure -Except for the payment obligations hereunder, neither Party shall be liable to -the other for any delay or non-performance of its obligations hereunder in the -event and to the extent that such delay or non-performance is due to an event of -act of God, terrorist attack or other similar unforeseeable catastrophic event -that prevents either Party for fulfilling its obligations under this Agreement -and which such Party cannot avoid or circumvent (“Force Majeure Event”). If the -Force Majeure Event results in a delay or non-performance of a Party for a -period of three (3) months or longer, then either Party shall have the right to -terminate this Agreement with immediate effect without any liability (except for -the obligations of payment arising prior to the event of Force Majeure) towards -the other Party. - -14.7 Notices -Any notice given by one Party to the other shall be deemed properly given and -deemed received if specifically acknowledged by the receiving Party in writing -or when successfully delivered to the recipient by hand, fax, or special courier -during normal business hours on a business day to the addresses specified for -each Party on the signature page. Each communication and document made or -delivered by one Party to the other Party pursuant to this Agreement shall be in -the English language. - -14.8 Export Control -Licensee acknowledges that the Redistributables may be subject to export control -restrictions under the applicable laws of respective countries. Licensee shall -fully comply with all applicable export license restrictions and requirements as -well as with all laws and regulations relating to the Redistributables and -exercise of licenses hereunder and shall procure all necessary governmental -authorizations, including without limitation, all necessary licenses, approvals, -permissions or consents, where necessary for the re-exportation of the -Redistributables, Applications and/or Devices. - -14.9 No Implied License -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, shall -remain with The Qt Company and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with any -other software or hardware not delivered by The Qt Company under this Agreement. - -14.10 Attorney Fees -The prevailing Party in any action to enforce this Agreement shall be entitled -to recover its attorney’s fees and costs in connection with such action. - -14.11 Severability -If any provision of this Agreement shall be adjudged by any court of competent -jurisdiction to be unenforceable or invalid, that provision shall be limited or -eliminated to the minimum extent necessary so that this Agreement shall -otherwise remain in full force and effect and enforceable. - - - -APPENDICES -The Agreement includes Appendix 1 as shown below. In addition, the Agreement may -include one or more of the Appendices 3-5 listed below depending on the -product(s) purchased by the Licensee, what is stated in the quote or invoice, -and/or what is stated on the License Certificate. - -  -APPENDIX 1: LICENSED SOFTWARE -1a. Licensed Software - Qt Toolkit -Module Description -Qt Core Core non-graphical classes used by other modules. -Qt GUI Base classes for graphical user interface (GUI) - components. -Qt Multimedia Classes for audio, video and camera functionality. -Qt Multimedia Widgets Widget-based classes for implementing multimedia - functionality. -Qt Network Classes to make network programming easier and more - portable. -Qt QML Classes for QML and JavaScript languages. -Qt Quick A declarative framework for building highly dynamic - applications with custom user interfaces. -Qt Quick Controls 2 Provides lightweight QML types for creating - performant user interfaces for desktop, embedded, and - mobile devices. -Qt Quick Dialogs Types for creating and interacting with system - dialogs from a Qt Quick application. -Qt Quick Layouts Layouts are items that are used to arrange Qt Quick 2 - based items in the user interface. -Qt Quick Test A unit test framework for QML applications. -Qt SQL Classes for database integration using SQL. -Qt Test Classes for unit testing Qt applications and - libraries. -Qt Widgets Classes to extend Qt GUI with C++ widgets. -Active Qt Classes for applications which use ActiveX and COM -Qt 3D Functionality for near-realtime simulation systems - with support for 2D and 3D rendering. -Qt Android Extras Provides platform-specific APIs for Android. -Qt Bluetooth Provides access to Bluetooth hardware. -Qt Canvas 3D Enables OpenGL-like 3D drawing calls from Qt Quick - applications using JavaScript. -Qt Concurrent Classes for writing multi-threaded programs without - using low-level threading primitives. -Qt D-Bus Classes for inter-process communication over the - D-Bus protocol. -Qt Gamepad Enables Qt applications to support the use of gamepad - hardware. -Qt Graphical Effects Graphical effects for use with Qt Quick 2. -Qt Help Classes for integrating documentation into - applications, similar to Qt Assistant. -Qt Image Formats Plugins for additional image formats: TIFF, MNG, TGA, - WBMP. -Qt Location Displays map, navigation, and place content in a QML - application. -Qt Mac Extras Provides platform-specific APIs for macOS. -Qt Network Authorization Provides support for OAuth-based authorization to - online services. -Qt NFC Provides access to Near-Field communication (NFC) - hardware. -Qt Platform Headers Provides classes that encapsulate platform-specific - information. -Qt Positioning Provides access to position, satellite and area - monitoring classes. -Qt Print Support Classes to make printing easier and more portable. -Qt Purchasing Enables in-app purchase of products in Qt - applications. -Qt for Python Python bindings for Qt. -Qt Quick Controls Reusable Qt Quick based UI controls to create classic - desktop-style user interfaces. -Qt Quick Extras Provides a specialized set of controls that can be - used to build interfaces in Qt Quick. -Qt Quick Widgets Provides a C++ widget class for displaying a Qt - Quick user interface. -Qt SCXML Provides classes and tools for creating state - machines from SCXML files. -Qt Sensors Provides access to sensor hardware and motion gesture - recognition. -Qt Serial Bus Provides access to serial industrial bus interface. -Qt Serial Port Provides access to hardware and virtual serial ports. -Qt Speech Provides support for accessibility features such as - text-to-speech. -Qt SVG Classes for displaying the contents of SVG files. -Qt UI Tools Classes for loading QWidget based forms created in Qt - Designer dynamically, at runtime. -Qt WebChannel Provides access to QObject or QML objects from HTML - clients for seamless integration of Qt applications - with HTML/JavaScript clients. -Qt WebEngine Classes and functions for embedding web content in - applications using the Chromium browser project. -Qt WebSockets Provides WebSocket communication. -Qt WebView Displays web content in a QML application by using - APIs native to the platform. -Qt Windows Extras Provides platform-specific APIs for Windows. -Qt X11 Extras Provides platform-specific APIs for X11. -Qt XML C++ implementations of SAX and DOM. -Qt XML Patterns Support for XPath, XQuery, XSLT and XML schema - validation. -Qt Wayland Compositor Provides a framework to develop a Wayland compositor. -Qt Charts UI Components for displaying charts. -Qt Data Visualization UI Components for creating 3D data visualizations. -Qt Virtual Keyboard A framework for implementing different input methods - as well as a QML virtual keyboard. - -1b. Licensed software – Embedded software development libraries -Module Description -Boot 2 Qt stack Yocto based Embedded Linux stack for selected - target hardware -Qt OTA Client-side capability for device image - updates Over The Air. -Device Utilities Collection of API’s to manage the device; - E.g. display, WiFi and Bluetooth settings. -Qt Debugging Bridge (QDB) Daemon Enables host-target deployment, debugging, - profiling and other features over USB. Up to - developer to decide if this is left in the - final solution. - -1c. Licensed Software - Qt Tools/Applications -Tool Description -Qt Creator The integrated development environment for Qt. -Qt Designer Qt tool for designing and building graphical user interfaces. -Qt Linguist Tool used to add translations to Qt applications. -Qt Assistant Tool for viewing online documentation in Qt help-file format. -Qmake Utility tool used to automate the generation of make files. -uic User interface compiler for the Qt GUI toolkit. -rcc Resource compiler used for embedding resources into Qt - applications. -lupdate Tool that finds the translatable strings in the specified source, - header and Qt Designer interface files, and produces or updates - translation files. -lrelease Tool that produces translation files in the compact binary format - used by localized Qt applications. -qlalr Qt parser generator tool. -qdoc Configurable documentation generation tool. -qmlscene QML launcher tool -qmlviewer QML launcher tool - -1d. Licensed software –Qt Tools/Applications specific to embedded software -development -Tool Description -Target toolchains Cross compilation toolchains for - supported target devices and operating - systems -Qt Debugging Bridge (QDB) Host Tools Enables deployment, debugging, - profiling and other features over USB - from development host PC to target - device. -qtconfig-gui Qt Lite Configurator tool graphical - interface -Qt Emulator Qt emulator - -2. Parts of the Licensed Software that are permitted for distribution in -object-code form only (“Redistributables”) under this Agreement: - -2a. Qt for Application Development -(i) The Licensed Software's Qt Toolkit libraries defined in 1a -(ii) The Licensed Software's installer framework - -2b. Qt for Device Creation -(i) Qt for Application Development Redistributables defined in 2a -(ii) The Licensed Software’s Embedded software development libraries defined in - 1b - -2c. Qt 3D Studio -The Licensed Software’s Qt 3D Studio Runtime (“Qt53DStudioRuntime2”) - - -APPENDIX 3: ADDITIONS TO LICENSED SOFTWARE -In addition to what is provided under the definition of the Licensed Software, -Parties agree that Licensed Software shall also include the following additional -software products of The Qt Company if included in the quote / invoice: -Qt for Automation - - MQTT software protocol libraries - - KNX software protocol libraries - - OPCUA (open source backend) - - OPCUA (Unified Automation backend) -Qt Safe Renderer - - Qt Safe Renderer library -Qt Application Manager - - Qt Application Manager library with Qt Creator integration - -All the above is considered as Redistributables and subject to applicable -provisions and limitations including but not limited to what is defined in -Section 3. - - -APPENDIX 4: SMALL BUSINESS AND START-UP APPENDIX -The provisions of this Appendix 4 are applicable for Start-up Companies and for -the Evaluation Term. -For the purpose of this Appendix 4, the following additional definitions shall -be applicable: - “Trial Term” shall mean a period of twelve (12) months. - “Start-up Company” means a company with a maximum annual revenue, including - funding, equivalent to 100,000 USD (in applicable currency) during a respective - calendar year, as evidenced by duly audited records of the Licensee and - approved by The Qt Company. - -During the Trial Term, Section 3 shall apply with following modifications -(“Trial Term Modifications”): - - Licenses granted under Sections 3.1 and 3.2 shall be free of any charge. For - clarity, License for distribution of Devices pursuant to Section 3.3 is - subject to applicable License Fee for necessary Distribution Licenses; - - Development License under Section 3.1 is limited to a maximum of three (3) - Designated Users; and - - Support is available subject to availability, as judged by The Qt Company at - its free and absolute discretion. - -Upon expiry of the Trial Term: - a) This Appendix 4 is terminated, Trial Term Modifications cease to remain in - force, Licensee’s Development Licenses shall be automatically converted into - licenses subject to a License Fee (in the amount specified in the quote or - in Appendix 2 and payable with a 30-day payment term) and Licensee’s rights - and obligations under this Agreement shall continue to remain in force under - the standard provisions of the Agreement, unless the Licensee notifies The - Qt Company in writing no less than ninety (90) days before such expiry date - that Licensee does not agree to such continuance, in which event the - Agreement, and all rights of the Licensee thereunder, shall expire; provided - however that - b) in the event the Licensee still qualifies as a Start-up Company, the - Licensee has an option (“Option”), instead of what is stated in item a) - above, to extend the Trial Term renewal is limited to one time and total - duration of Trial Terms thus to 24 months after the effective date. Licensee - shall notify The Qt Company in writing no less than ninety (90) days before - the expiry date, if Licensee wish to exercise the Option. - - -APPENDIX 5: NON-COMMERCIAL USE APPENDIX -The provisions of this Appendix 5 are applicable for non-commercial use of the -Licensed Software by the Licensee. -For the purpose of this Appendix 5, the following additional definitions -(replacing the relevant definition of the Agreement, where applicable) shall be -applicable: - “Demo Units” shall mean (i) hardware development platform, which incorporates - the Licensed Software along with Licensee’s software and/or hardware, and - (ii) prototype versions of Applications or Devices. - “Designated User(s)” shall mean the employees and students of the Licensee. - “Licensee Products” shall mean Applications and/or Devices. - “Permitted Purpose” shall mean (i) Licensee’s internal evaluation and testing - of Licensed Software, (ii) building Demo Units as well as (iii) educational - use. - “Term” shall mean a period of twelve (12) months or any such other period as - may be agreed between the Parties. - -For the purpose of this Appendix 5, the following changes shall be agreed with -respect to relevant Sections of the Agreement: - I. Recital (A) shall be replaced in its entirety to read as follows: “(A) - Licensee wishes to use the Licensed Software for the Permitted Purpose.” - II. Section 3.1 shall be replaced in its entirety to read as follows: - “The Qt Company grants to Licensee a personal, non-exclusive, - non-transferable, revocable, royalty-free license, valid for the Term, to - use, modify and copy the Licensed Software solely for the Permitted - Purpose. Licensee may install copies of the Licensed Software on an - unlimited number of computers provided that only Designated Users may use - the Licensed Software. Licensee may demonstrate the Demo Units, provided - that such demonstrations must be conducted by Licensee, and the Demo Units - must remain in Licensee’s possession and under Licensee’s control at all - times. For clarity, this Agreement does not (i) entitle Licensee to use - Licensed Software to create Applications or Devices (other than prototypes - thereof) or (ii) carry any distribution rights to Licensee, but such - rights are subject to and conditional upon conclusion of a separate - license agreement with The Qt Company.” - III. Sections 3.2, 3.3, 8 and 10 shall be deleted. - IV. Section 3.4 shall be replaced in its entirety to read as follows: - “Licensee shall not: - - remove or alter any copyright, trademark or other proprietary rights - notice contained in any portion of the Licensed Software; - - transfer, publish, sublicense, disclose, display or otherwise make - the Licensed Software available to any third party (except that - Licensee may demonstrate the Demo Units pursuant to Section 3.1); - - in any way combine, incorporate or integrate Licensed Software with, or - use Licensed Software for creation of, any software created with or - incorporating Open Source Qt; - Licensee shall cause all Designated Users who make use of the licenses - granted under this Agreement, to be contractually bound to comply with - the relevant terms of this Agreement and not to use the Licensed - Software beyond the terms hereof. Licensee shall be responsible for any - and all actions and omissions of its Designated Users relating to the - Licensed Software and use thereof. Any use of Licensed Software beyond - the provisions of this Agreement is strictly prohibited and requires an - additional license from The Qt Company.” - V. Section 12 shall be replaced in its entirety to read as follows: - “This Agreement shall enter into force upon due acceptance by both Parties - and remain in force for the Term, unless and until terminated pursuant to - the terms of Section 12. Upon termination of the Agreement, Licensee shall - cease using the Licensed Software. All other copies of Licensed Software - in the possession or control of Licensee must be erased or destroyed. An - officer of Licensee must, upon request, promptly deliver to The Qt Company - a written confirmation that this has occurred.” - -Except for the modifications specified above, this Appendix carries no change to -the terms of the Agreement which shall remain in full force. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/.QT-FOR-AUTOMOTIVE-LICENSE-AGREEMENT qtquickcontrols2-opensource-src-5.9.5/.QT-FOR-AUTOMOTIVE-LICENSE-AGREEMENT --- qtquickcontrols2-opensource-src-5.12.5+dfsg/.QT-FOR-AUTOMOTIVE-LICENSE-AGREEMENT 2019-09-06 12:05:25.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/.QT-FOR-AUTOMOTIVE-LICENSE-AGREEMENT 1970-01-01 00:00:00.000000000 +0000 @@ -1,894 +0,0 @@ -QT AUTOMOTIVE SUITE LICENSE AGREEMENT -Agreement version 3.0 - -This Qt Automotive Suite License Agreement (“Agreement”) is a legal agreement -between The Qt Company (as defined below) and the Licensee (as defined below) -for the license of Licensed Software (as defined below). Capitalized terms used -herein are defined in Section 1. - -WHEREAS: - -(A) Licensee wishes to use the Licensed Software for the purpose of developing -and distributing Applications and/or Devices; and - -(B) The Qt Company is willing to grant the Licensee a right to use Licensed -Software for such purpose pursuant to term and conditions of this Agreement. - -NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: - -1. DEFINITIONS - -"Affiliate" of a Party shall mean an entity (i) which is directly or indirectly -controlling such Party; (ii) which is under the same direct or indirect -ownership or control as such Party; or (iii) which is directly or indirectly -owned or controlled by such Party. For these purposes, an entity shall be -treated as being controlled by another if that other entity has fifty percent -(50 %) or more of the votes in such entity, is able to direct its affairs and/or -to control the composition of its board of directors or equivalent body. - -"Applications" shall mean Licensee's software products created using the -Licensed Software in connection with the Program, which may include the -Redistributables, or part thereof. - -"Contractor(s)" shall mean third party consultants, distributors and contractors -performing services to a Party under applicable contractual arrangement. - -"Customer(s)" shall mean Licensee's end users to whom Licensee, directly or -indirectly, distributes copies of the Redistributables. - -"Deployment Platforms" shall mean operating systems specified in the License -Certificate, in which the Redistributables can be distributed pursuant to the -terms and conditions of this Agreement. - -"Designated User(s)" shall mean the employee(s) of Licensee or Licensee's -Affiliates acting within the scope of their employment or Licensee's -Contractors acting within the scope of their services for Licensee and on behalf -of Licensee. Designated Users shall be named in the License Certificate. - -"Development License" shall mean the license needed by the Licensee for each -Designated User to use the Licensed Software under the license grant described -in Section 3.1 of this Agreement. - -"Development Platforms" shall mean those operating systems specified in the -License Certificate, in which the Licensed Software can be used under the -Development License, but not distributed in any form or used for any other -purpose. - -"Devices" shall mean hardware devices or products that 1) are manufactured -and/or distributed by the Licensee or its Affiliates or Contractors in -connection with the Program, and (2)(i) incorporate or integrate the -Redistributables or parts thereof; or (ii) do not incorporate or integrate -the Redistributables at the time of distribution, but where, when used by a -Customer, the main user interface or substantial functionality of such -device is provided by Application(s) or otherwise depends on the Licensed -Software. - -"Distribution License(s)" shall mean the license required for distribution of -Redistributables in accordance with the license grant described in Section -3.2(ii)-(iii) of this Agreement. - -"Distribution License Packs" shall mean set of prepaid Distribution Licenses -for distribution of Redistributables, as defined in The Qt Company's standard -price list, quote, Purchase Order confirmation or in an appendix hereto, as the -case may be. - -"Initial Support Term" shall mean a time period of twelve (12) months, -calculated from the effective date of this Agreement. - -"Intellectual Property Rights" shall mean patents (including utility models), -design patents, and designs (whether or not capable of registration), chip -topography rights and other like protection, copyrights, trademarks, service -marks, trade names, logos or other words or symbols and any other form of -statutory protection of any kind and applications for any of the foregoing -as well as any trade secrets. -"Licensee" shall mean the individual or legal entity that is party to this -Agreement, as identified on the signature page hereof. - -"License Certificate" shall mean a certificate accompanying the Licensed -Software and generated for each Designated User respectively. License -Certificate will specify the Designated User, the Development Platforms, -Deployment Platforms, Program and the Term of this Agreement. The terms of the -License Certificate are considered part of this Agreement and shall be updated -from time to time to reflect any changes to the foregoing terms relating to -Licensee's rights to the Licensed Software. - -"Licensee's Records" shall mean books and records that are likely to contain -information bearing on Licensee's compliance with this Agreement or the payments -due to The Qt Company under this Agreement, including, but not limited to: -assembly logs, sales records and distribution records. - -"Licensee´s SDK Contractors" shall mean Contractors of Licensee, who have -purchased or received SDK from the Licensee relating to the Program. - -"License Fee" shall mean the fee charged to the Licensee for rights granted -under the terms of this Agreement. - -"Licensed Software" shall mean all versions of The Qt Company's computer -software products, online or electronic documentation, associated media and -printed materials, including the source code, example programs and the -documentation, licensed to the Licensee under this Agreement. Licensed Software -does not include Third Party Software (as defined in Section 4) or Open Source -Qt. - -"Modified Software" shall mean bug-fixes, error corrections, patches or -modifications made to the Licensed Software by Licensee, including documentation -related thereto. - -"Online Services" shall mean any services or access to systems made available -by The Qt Company to the Licensee over the Internet relating to the Licensed -Software or for the purpose of use by the Licensee of the Licensed Software or -Support. Use of any such Online Services is discretionary for the Licensee and -some of them may be subject to additional fees. - -"Open Source Qt" shall mean all versions of The Qt Company's Qt computer -software products, online or electronic documentation, associated media and -printed materials, including the source code, example programs and the -documentation available under the terms of the GNU Lesser General Public -License, version 2.1 or later ("LGPL") or the GNU General Public License, -version 2.0 or later ("GPL"). - -"Party" or "Parties" shall mean Licensee and/or The Qt Company. - -"Program" shall mean Licensee´s business program for which purpose the Licensee -is entitled to use the Licensed Software and grant the Licensee's SDK -Contractors a right to use the Licensed Software as part of a SDK. - -"Redistributables" shall mean the portions of the Licensed Software set forth -in Appendix 1, Section 1 that may be distributed pursuant to the terms of this -Agreement in object code form only, including any relevant documentation. Where -relevant, any reference to Licensed Software in this Agreement shall include and -refer also to Redistributables. - -"SDK" or "Software Development Kit" shall mean a combination of software modules -including Licensed Software intended to be utilized in connection with the -Program. - -"Submitted Modified Software" shall have the meaning as set forth in Section -2.3. - -"Support" shall mean standard developer support that is provided by -The Qt Company to assist Designated Users in using the Licensed Software in -accordance with The Qt Company's standard support terms. - -"Support Renewal Term" shall mean a time period of twelve (12) months, -calculated from the end of the Initial Support Term or previous Support Renewal -Term, as applicable. - -"Support Term" shall mean the Initial Support Term and any possible Support -Renewal Terms(s) during which time the Licensee is eligible to receive for -Support for the Licensed Software. - -"Taxes" shall have the meaning set forth in Section 10.5. - -"Term" shall mean the validity period of this Agreement, as set forth in the -License Certificate. - -“The Qt Company” shall mean: - -(i) in the event Licensee is an individual residing in the United States or a -legal entity incorporated in the United States or having its headquarters in the -United States, The Qt Company Inc., a Delaware corporation with its office at -2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, USA.; or - -(ii) in the event the Licensee is an individual residing outside of the United -States or a legal entity incorporated outside of the United States or having its -registered office outside of the United States, The Qt Company Ltd., a Finnish -company with its registered office at Bertel Jungin aukio D3A, 02600 Espoo, -Finland. - -"Updates" shall mean a release or version of the Licensed Software containing -bug fixes, error corrections and other changes that are generally made available -to users of the Licensed Software that have contracted for Support. Updates are -generally depicted as a change to the digits following the decimal in the -Licensed Software version number. The Qt Company shall make Updates available to -the Licensee under the Support. Updates shall be considered as part of the -Licensed Software hereunder. - -"Upgrades" shall mean a release or version of the Licensed Software containing -enhancements and new features and are generally depicted as a change to the -first digit of the Licensed Software version number. In the event Upgrades are -provided to the Licensee under this Agreement, they shall be considered as part -of the Licensed Software hereunder. - -2. OWNERSHIP 2.1 - -Ownership of The Qt Company - -The Licensed Software is protected by copyright laws and international copyright -treaties, as well as other intellectual property laws and treaties. The Licensed -Software is licensed, not sold. - -All The Qt Company's Intellectual Property Rights are and shall remain the -exclusive property of The Qt Company or its licensors respectively. - -2.2 Ownership of Licensee - -All the Licensee's Intellectual Property Rights are and shall remain the -exclusive property of the Licensee or its licensors respectively. - -All Intellectual Property Rights to the Modified Software, Applications and -Devices shall remain with the Licensee and no rights thereto shall be granted by -the Licensee to The Qt Company under this Agreement (except as set forth in -Section 2.3 below). - -2.3 Modified Software - -Licensee may create Modified Software that breaks the source or binary -compatibility with the Licensed Software. This includes, but is not limited to, -changing the application programming interfaces ("API") by adding, changing or -deleting any variable, method, or class signature in the Licensed Software -and/or any inter-process protocols, services or standards in the Licensed -Software libraries. To the extent that Licensee breaks source or binary -compatibility with the Licensed Software, Licensee acknowledges that The Qt -Company's ability to provide Support may be prevented or limited and Licensee's -ability to make use of Updates may be restricted. - -To the extent Licensee submits Modified Software to The Qt Company ("Submitted -Modified Software"), Licensee hereby grants The Qt Company a sublicensable, -assignable, irrevocable, perpetual, worldwide, non-exclusive, royalty-free and -fully paid-up license, under all of Licensee's Intellectual Property Rights, to -reproduce, adapt, translate, modify, and prepare derivative works of, publicly -display, publicly perform, sublicense, make available and distribute such -Submitted Modified Software as The Qt Company sees fit at its free and absolute -discretion. For the sake of clarity, the Licensee shall have no obligation to -provide Modified Software to The Qt Company. - -3. LICENSES GRANTED - -3.1 Development with Licensed Software - -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non- exclusive, non-transferable license, valid for the -Term, to use, modify and copy the Licensed Software by Designated Users on the -Development Platforms for the sole purposes of designing, developing, -demonstrating and testing Application(s) and/or Devices, and to provide thereto -related support and other services to end-user Customers. - -Licensee may install copies of the Licensed Software on an unlimited number of -computers provided that (i) only the Designated Users may use the Licensed -Software, and (ii) all Designated Users must have a valid Development License to -use Licensed Software. - -Licensee may at any time designate another Designated User to replace a -then-current Designated User by notifying The Qt Company in writing, provided -that any Designated User may be replaced only once during any six-month period. - -3.2 Distribution of Redistributables - -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non- exclusive, non-transferable license, valid for the -Term, to (i) distribute, by itself or through its Contractors, Redistributables -as installed, incorporated or integrated into Applications for execution on the -Deployment Platforms, and (ii) distribute, by itself or through one or more -tiers of Contractors, Redistributables as installed, incorporated or integrated, -or intended to be installed, incorporated or integrated into Devices for -execution on the Deployment Platforms, and (iii) grant sublicenses to -Redistributables, as distributed hereunder, for Customers solely for Customer's -internal use and to the extent necessary in order for the Customers to use the -Applications and/or Devices for their respective intended purposes. - -Right to distribute the Redistributables as provided herein is conditional upon -the Licensee having purchased and paid the appropriate amount of Development and -Distribution Licenses from The Qt Company before distributing any -Redistributables to Customers. - -For the avoidance of any doubt it is specifically acknowledged and agreed that -distribution of Redistributables solely as installed, incorporated or integrated -into Applications for execution on the Deployment Platform(s), as specified in -(i) of the first paragraph of Section 3.2 above, i.e. with no connection to -Devices or intention to use in connection therewith, shall not require a -Distribution License. - -3.3 SDK License - -The Qt Company grants to Licensee a personal, worldwide, non-exclusive, -non-transferable license, valid for the Term, to (i) distribute Licensed -Software as a part of the SDK to Licensee´s SDK Contractors in connection with -the Program and (ii) in connection with the Program, by itself or by Licensee's -SDK Contractors, combine, incorporate or integrate Licensed Software with, or -use Licensed Software for creation of, any software created with or -incorporating Open Source Qt, provided, however, that: - -(i) the Licensee´s SDK Contractors are only entitled to use the Licensed -Software as part of SDK and for the sole purpose of developing software for -Devices that are distributed under the Program; and - -(ii) Licensee´s SDK Contractors shall not be entitled to distribute the SDK or -any part thereof to any third parties. - -For the avoidance of any doubt, the distribution of such software development -tools that do not contain Licensed Software shall not be covered by this -Agreement. - -3.4 Further Requirements - -The licenses granted above in this Section 3 by The Qt Company to Licensee are -conditional and subject to Licensee's compliance with the following terms: - -(i) Licensee shall not remove or alter any copyright, trademark or other -proprietary rights notice contained in any portion of the Licensed Software; - -(ii) Applications and SDKs must add primary and substantial functionality to the -Licensed Software; - -(iii) Applications may not pass on functionality which in any way makes it -possible for others to create software with the Licensed Software; provided -however that Licensee may use the Licensed Software's scripting and QML ("Qt -Quick") functionality solely in order to enable scripting, themes and styles -that augment the functionality and appearance of the Application(s) without -adding primary and substantial functionality to the Application(s); - -(iv) Applications and SDKs must not compete with the Licensed Software; - -(v) Licensee shall not use The Qt Company's or any of its suppliers' names, -logos, or trademarks to market Applications or SDKs, except that Licensee may -use "Built with Qt" logo to indicate that Application(s) was developed using -the Licensed Software; - -(vi) Except as expressly provided in Section 3.3, Licensee shall not -distribute, sublicense or disclose source code of Licensed Software to any third -party (provided however that Licensee may appoint employee(s) of Contractors as -Designated Users to use Licensed Software pursuant to this Agreement); - -(vii) Licensee shall not grant the Customers a right to (i) make copies of the -Redistributables except when and to the extent required to use the Applications -and/or Devices for their intended purpose, (ii) modify the Redistributables or -create derivative works thereof, (iii) decompile, disassemble or otherwise -reverse engineer Redistributables, or (iv) redistribute any copy or portion of -the Redistributables to any third party, except as part of the onward sale of -the Device on which the Redistributables are installed; - -(viii) Except as expressly provided in Section 3.3, Licensee shall not and -shall cause that its Affiliates, Contractors and Licensee's SDK Contractors -shall not a) in any way, combine, incorporate or integrate Licensed Software -with, or use Licensed Software for creation of, any software created with or -incorporating Open Source Qt or b) incorporate or integrate Applications into a -hardware device or product other than a Device, unless Licensee has received an -advance written permission from The Qt Company to do so. Unless specifically -otherwise agreed, any and all distribution by the Licensee during the Term of -a hardware device or product a) which incorporate or integrate any part of -Licensed Software or Open Source Qt; or b) where the main user interface or -substantial functionality is provided by software build with Licensed -Software or Open Source Qt or otherwise depends on the Licensed Software or Open -Open Source Qt, shall be considered as distribution under this Agreement and -dependent on compliance thereof (including but not limited to obligation to -pay applicable License Fees for such distribution); - -(ix) Licensee shall cause all of its Affiliates and Contractors entitled to make -use of the licenses granted under this Agreement, to be contractually bound to -comply with the relevant terms of this Agreement and not to use the Licensed -Software beyond the terms hereof and for any purposes other than operating -within the scope of their services for Licensee. Licensee shall be responsible -for any and all actions and omissions of its Affiliates and Contractors relating -to the Licensed Software and use thereof (including but not limited to payment -of all applicable License Fees); - -(x) Except when and to the extent explicitly provided in this Section 3, -Licensee shall not transfer, publish, disclose, display or otherwise make -available the Licensed Software; - -(xi) Licensee shall not take any action inconsistent with The Qt Company's -Intellectual Property Rights; and - -(xii) Attempt or enlist a third party to conduct or attempt to conduct any of -the above. - -Above terms shall not be applicable if and to the extent they conflict with any -mandatory provisions of any applicable laws. - -Any use of Licensed Software beyond the provisions of this Agreement is strictly -prohibited and requires an additional license from The Qt Company. - -4. THIRD PARTY SOFTWARE - -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. Third -Party Software does not comprise part of the Licensed Software. In some cases, -access to Third Party Software may be included in the Licensed Software. Such -Third Party Software will be listed in the ".../src/3rdparty" source tree -delivered with the Licensed Software or documented in the Licensed Software, as -such may be amended from time to time. Licensee acknowledges that use or -distribution of Third Party Software is in all respects subject to applicable -license terms of applicable third party right holders. 5. PRE-RELEASE CODE - -The Licensed Software may contain pre-release code and functionality marked or -otherwise stated as "Technology Preview", "Alpha", "Beta" or similar -designation. Such pre-release code may be present in order to provide -experimental support for new platforms or preliminary versions of one or more -new functionalities. The pre-release code may not be at the level of performance -and compatibility of a final, generally available, product offering of the -Licensed Software. The pre-release parts of the Licensed Software may not -operate correctly, may contain errors and may be substantially modified by The -Qt Company prior to the first commercial product release, if any. The Qt Company -is under no obligation to make pre-release code commercially available, or -provide any Support or Updates relating thereto. The Qt Company assumes no -liability whatsoever regarding any pre-release code, but any use thereof is -exclusively at Licensee's own risk and expense. - -6. LIMITED WARRANTY AND WARRANTY DISCLAIMER - -The Qt Company hereby represents and warrants that it has the power and -authority to grant the rights and licenses granted to Licensee under this -Agreement. - -Except as set forth above, the Licensed Software is licensed to Licensee "as -is". - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF -ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL WARRANTIES, -EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT -WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT WARRANT THAT THE -LICENSED SOFTWARE WILL SATISFY LICENSEE'S REQUIREMENTS OR THAT IT WILL OPERATE -WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE UNINTERRUPTED. ALL -USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE RISK OF AND -RESPONSIBILITY OF LICENSEE. - -Licensee's exclusive remedy and The Qt Company's entire liability for Licensed -Software shall be limited, at The Qt Company's option, to correction of the -error, replacement of the Licensed Software or return of the applicable fees -paid for the defective Licensed Software for the time period during which the -License is not able to utilize the Licensed Software under the terms of this -Agreement. - -7. INDEMNIFICATION AND LIMITATION OF LIABILITY - -7.1 Limitation of Liability - -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, (II) -LICENSEE'S DUTY TO PAY ALL APPLICABLE LICENSE FEES AND COMPENSATIONS, AND (III) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, -LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, -CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, -HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. - -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, (II) -LICENSEE'S DUTY TO PAY ALL APPLICABLE LICENSE FEES AND COMPENSATIONS, AND (III) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY'S TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT EXCEED -THE AGGREGATE LICENSE FEES RECEIVED BY THE QT COMPANY FROM LICENSEE DURING THE -PERIOD OF TWELVE (12) MONTHS IMMEDIATELY PRECEDING THE EVENT RESULTING IN SUCH -LIABILITY. - -THE PROVISIONS OF THIS SECTION 7 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN -THE QT COMPANY AND LICENSEE AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET -FORTH HEREIN IN DETERMINING WHETHER TO ENTER INTO THIS AGREEMENT. - -7.2 Licensee´s Indemnification - -Licensee shall indemnify and hold harmless The Qt Company from and against any -claim, injury, judgment, settlement, loss or expense, including attorneys' fees -related to: (a) Licensee's misrepresentation in connection with The Qt Company -or the Licensed Software or breach of this Agreement, (b) the Application or -Device (except where such cause of liability is solely attributable to the -Licensed Software). - -8. SUPPORT, UPDATES AND ONLINE SERVICES - -Licensee will be eligible to receive Support and Updates and to use the Online -Services during the Support Term. Unless otherwise decided by The Company at its -free and absolute discretion, Upgrades will not be included in the Support but -may be available subject to additional fees. - -Licenses granted under this Agreement shall include a prepaid Initial Support -Term. - -Initial Support Term shall be automatically extended to one or more Support -Renewal Term(s), unless and until either Party notifies the other Party in -writing that it does not wish to continue the Support, such notification to be -provided to the other Party no less than ninety (90) days before expiry of the -Initial Support Term or respective Support Renewal Term. During any such Support -Renewal Term Support shall be available subject to prices and terms agreed -between the Parties or, if no advance agreement exists, subject to The Qt -Company's standard pricing applicable at the commencement date of any such -Support Renewal Term. From time to time The Qt Company may change Support -provided within each Support plan; provided that during the respective Initial -Support Term or Support Renewal Term (as the case may be), the level of Support -provided by The Qt Company may not be reduced without the consent of the -Licensee. - -Unless otherwise agreed, The Qt Company shall not be responsible for providing -any service or support to the Customers. - -9. CONFIDENTIALITY - -Each Party acknowledges that during the Term of this Agreement each Party may -receive information about the other Party's business, business methods, business -plans, customers, business relations, technology, and other information, -including the terms of this Agreement, that is confidential and of great value -to the other Party, and the value of which would be significantly reduced if -disclosed to third parties ("Confidential Information"). Accordingly, when a -Party (the "Receiving Party") receives Confidential Information from the other -Party (the "Disclosing Party"), the Receiving Party shall only disclose such -information to employees and Contractors on a need to know basis, and shall -cause its employees and employees of its Affiliates to: (i) maintain any and all -Confidential Information in confidence; (ii) not disclose the Confidential -Information to a third party without the Disclosing Party's prior written -approval; and (iii) not, directly or indirectly, use the Confidential -Information for any purpose other than for exercising its rights and fulfilling -its responsibilities pursuant to this Agreement. Each Party shall take -reasonable measures to protect the Confidential Information of the other Party, -which measures shall not be less than the measures taken by such Party to -protect its own confidential and proprietary information. - -Obligation of confidentiality shall not apply to information that (i) is or -becomes generally known to the public through no act or omission of the -Receiving Party; (ii) was in the Receiving Party's lawful possession prior to -the disclosure hereunder and was not subject to limitations on disclosure or -use; (iii) is developed independently by employees or Contractors of the -Receiving Party or other persons working for the Receiving Party who have not -had access to the Confidential Information of the Disclosing Party, as proven by -the written records of the Receiving Party; (iv) is lawfully disclosed to the -Receiving Party without restrictions, by a third party not under an obligation -of confidentiality; or (v) the Receiving Party is legally compelled to disclose, -in which case the Receiving Party shall notify the Disclosing Party of such -compelled disclosure and assert the privileged and confidential nature of the -information and cooperate fully with the Disclosing Party to limit the scope of -disclosure and the dissemination of disclosed Confidential Information to the -minimum extent necessary. - -The obligations under this Section 9 shall continue to remain in force for a -period of five (5) years after the last disclosure, and, with respect to trade -secrets, for so long as such trade secrets are protected under applicable trade -secret laws. - -10. FEES, DELIVERY AND PAYMENT - -10.1 License Fees - -License Fees are described in The Qt Company's standard price list, quote or -Purchase Order confirmation or in an appendix hereto, as the case may be. The -License Fees shall not be refunded or claimed as a credit, even on the ground -that Distribution Licenses are not used, i.e. Redistributables are not actually -distributed corresponding to the Distribution Licenses purchased, or for any -other reason. - -10.2 Ordering Licenses - -Licensee may purchase Development Licenses and Distribution Licenses pursuant to -agreed pricing terms or, if no specific pricing terms have been agreed upon, at -The Qt Company's standard pricing terms applicable at the time of purchase. - -Licensee shall submit all purchase orders for Development Licenses and -Distribution Licenses to The Qt Company by email or any other method acceptable -to The Qt Company (each such order is referred to herein as a "Purchase Order") -for confirmation, whereupon the Purchase Order shall become binding between the -Parties. - -10.3 Distribution - -License Packs Unless otherwise agreed, the Distribution Licenses are bought by -way of Distribution License Packs. - -Upon due payment of the ordered Distribution License Pack(s), the Licensee will -have an account of Distribution Licenses available for installing, bundling or -integrating (all jointly "installing") the Redistributables with the Devices or -for otherwise distributing the Redistributables in accordance with this -Agreement. - -Each time Licensee "installs" or distributes a copy of Redistributables, then -one Distribution License is used, and Licensee's account of available -Distribution Licenses is decreased accordingly. - -Licensee may "install" copies of the Redistributables so long as Licensee has -Distribution Licenses remaining on its account. - -Redistributables will be deemed to have been "installed" into a Device when one -of the following circumstances shall have occurred: a) the Redistributables -have been loaded onto the Device and used outside of the Licensee's premises or -b) the Device has been fully tested and placed into Licensee's inventory (or -sold) for the first time (i.e., Licensee will not be required to use (or pay -for) more than one Distribution License for each individual Device, e.g. in a -situation where a Device is returned to Licensee's inventory after delivery to -a distributor or sale to a Customer). In addition, if Licensee includes a -back-up copy of the Redistributables on a CD-ROM or other storage medium -along with the product, that backup copy of the Redistributables will not -be deemed to have been "installed" and will not require an additional -Distribution License. - -10.4 Payment Terms -License Fees and any other charges under this Agreement shall be paid by -Licensee no later than thirty (30) days from the date of the applicable invoice -from The Qt Company. - -The Qt Company will submit an invoice to Licensee after the date of this -Agreement and/or after The Qt Company receives a Purchase Order from Licensee. -A late payment charge of the lower of (a) one percent per month; or (b) the -interest rate stipulated by applicable law, shall be charged on any unpaid -balances that remain past due. - -The Qt Company shall have the right to suspend, terminate or withhold grants of -all rights to the Licensed Software hereunder, including but not limited to the -Developer License, Distribution License, and Support, should Licensee fail to -make payment in a timely fashion. - -10.5 Taxes -All License Fees and other charges payable hereunder are gross amounts but -exclusive of any value added tax, use tax, sales tax and other taxes, duties or -tariffs ("Taxes"). Such applicable Taxes shall be paid by Licensee, or, where -applicable, in lieu of payment of such Taxes, Licensee shall provide an -exemption certificate to The Qt Company and any applicable authority. - -11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS - -11.1 Licensee's Record-keeping - -Licensee shall at all times maintain accurate and up-to-date written records of -Licensee's activities related to the use of Licensed Software and distribution -of Redistributables. The records shall be adequate to determine Licensee's -compliance with the provisions of this Agreement and to demonstrate the number -of Designated Users and Redistributables distributed by Licensee. The records -shall conform to good accounting practices reasonably acceptable to The Qt -Company. - -Licensee shall, within thirty (30) days from the end of each calendar -quarter, deliver to The Qt Company a report detailing the number of Designated -Users and copies of Redistributables distributed by Licensee during that -calendar quarter, and also detailing the number of undistributed copies of -Redistributables made by Licensee and remaining in its account (i.e., -undistributed copies for which Distribution Licenses have been or need to be -obtained from The Qt Company). Such report shall contain such other information -as The Qt Company shall reasonably require from time to time. - -11.2. The Qt Company's Audit Rights - -The Qt Company or an independent auditor acting on behalf of The Qt Company's, -may, upon at least five (5) business days' prior written notice and at its -expense, audit Licensee with respect to the use of the Redistributables, but -not more frequently than once during each 6-month period. Such audit may be -conducted by mail, electronic means or through an in-person visit to -Licensee's place of business. Any such in-person audit shall be conducted -during regular business hours at Licensee's facilities and shall not -unreasonably interfere with Licensee's business activities. The Qt Company or -the independent auditor acting on behalf of The Qt Company shall be entitled to -inspect Licensee's Records. All such Licensee's Records and use thereof shall be -subject to an obligation of confidentiality under this Agreement. - -If an audit reveals that Licensee is using the Licensed Software beyond scope of -the licenses Licensee has paid for, Licensee agrees to immediately pay The Qt -Company any amounts owed for such unauthorized use. - -In addition, in the event the audit reveals a material violation of the terms of -this Agreement (underpayment of more than 5% of License Fees shall always be -deemed a material violation for purposes of this section), then the Licensee -shall pay The Qt Company's reasonable cost of conducting such audit. - -12 TERM AND TERMINATION - -12.1 Term - -This Agreement shall enter into force upon due acceptance by both Parties and -remain in force for the Term, unless and until terminated pursuant to the terms -of this Section 12. - -12.2 Termination by The Qt Company - -The Qt Company shall have the right to terminate this Agreement upon thirty -(30) days prior written notice if (i) the Licensee is in material breach of any -obligation of this Agreement and fails to remedy such breach within such notice -period; (ii) or Licensee or any of its Affiliates bring a suit before any court -or administrative agency or otherwise assert a claim against The Qt Company's -or any of its Affiliates' Intellectual Property Rights or validity thereof. - -12.3 Mutual Right to Terminate - -Either Party shall have the right to terminate this Agreement immediately upon -written notice in the event that the other Party becomes insolvent, files for -any form of bankruptcy, makes any assignment for the benefit of creditors, has a -receiver, administrative receiver or officer appointed over the whole or a -substantial part of its assets, ceases to conduct business, or an act equivalent -to any of the above occurs under the laws of the jurisdiction of the other -Party. - -12.4 Parties´ Rights and Duties upon Termination - -Upon expiry or termination of the Agreement for any reason, Licensee shall, -within 30 days after such termination, cease and shall cause all Designated -Users (including those of its Affiliates' and Contractors') and Licensee's SDK -Contractors to cease using the Licensed Software and distribution of the -Redistributables under this Agreement. Notwithstanding the above, in the event -the Agreement expires or is terminated for reason other than by The Qt Company -pursuant to Section 12.2, the Licensee is entitled, for a period of six (6) -months after the effective date of termination, to continue distribution of -Devices under the Distribution Licenses paid but unused at such effective date -of termination. - -Upon any such termination the Licensee shall destroy or return to The Qt -Company all copies of the Licensed Software and all related materials and will -certify the same to The Qt Company upon its request, provided however that -Licensee may retain and exploit such copies of the Licensed Software as it may -reasonably require in providing continued support to Customers. - -Expiry or termination of this Agreement for any reason whatsoever shall not -relieve Licensee of its obligation to pay any License Fees accrued or payable -to The Qt Company prior to the effective date of termination, and Licensee shall -immediately pay to The Qt Company all such fees upon the effective date of -termination. Termination of this Agreement shall not affect any rights of -Customers to continue use of Applications and Devices (and therein incorporated -Redistributables). - -13.GOVERNING LAW AND LEGAL VENUE - -In the event this Agreement is in the name of The Qt Company Inc., a Delaware -Corporation, then: - -(i) this Agreement shall be construed and interpreted in accordance with the -laws of the State of California, USA, excluding its choice of law provisions; - -(ii) the United Nations Convention on Contracts for the International Sale of -Goods will not apply to this Agreement; and - -(iii) any dispute, claim or controversy arising out of or relating to this -Agreement or the breach, termination, enforcement, interpretation or validity -thereof, including the determination of the scope or applicability of this -Agreement to arbitrate, shall be determined by arbitration in San Francisco, -USA, before one arbitrator. The arbitration shall be administered by JAMS -pursuant to JAMS' Streamlined Arbitration Rules and Procedures. Judgment on the -Award may be entered in any court having jurisdiction. This Section shall not -preclude parties from seeking provisional remedies in aid of arbitration from a -court of appropriate jurisdiction. - -In the event this Agreement is in the name of The Qt Company Ltd., a Finnish -Company, then: - -(i) this Agreement shall be construed and interpreted in accordance with the -laws of Finland, excluding its choice of law provisions; - -(ii) the United Nations Convention on Contracts for the International Sale of -Goods will not apply to this Agreement; and - -(iii) any disputes, controversy or claim arising out of or relating to this -Agreement, or the breach, termination or validity thereof shall be shall be -finally settled by arbitration in accordance with the Arbitration Rules of -Finland Chamber of Commerce. The arbitration tribunal shall consist of one (1), -or if either Party so requires, of three (3), arbitrators. The award shall be -final and binding and enforceable in any court of competent jurisdiction. The -arbitration shall be held in Helsinki, Finland and the process shall be -conducted in the English language. This Section shall not preclude parties from -seeking provisional remedies in aid of arbitration from a court of appropriate -jurisdiction. - -14. GENERAL PROVISIONS - -14.1 No Assignment Licensee - -shall not be entitled to assign or transfer all or any of its rights, benefits -and obligations under this Agreement without the prior written consent of The Qt -Company, which shall not be unreasonably withheld or delayed. The Qt Company -shall be entitled to freely assign or transfer any of its rights, benefits or -obligations under this Agreement. - -14.2 No Third Party Representations - -Licensee shall make no representations or warranties concerning the Licensed -Software on behalf of The Qt Company. Any representation or warranty Licensee -makes or purports to make on The Qt Company's behalf shall be void as to The Qt -Company. - -14.3 Surviving Sections - -Any terms and conditions that by their nature or otherwise reasonably should -survive termination of this Agreement shall so be deemed to survive. - -14.4 Entire Agreement - -This Agreement, the exhibits hereto, the License Certificate and any applicable -Purchase Order constitute the complete agreement between the Parties and -supersedes all prior or contemporaneous discussions, representations, and -proposals, written or oral, with respect to the subject matters discussed -herein. In the event of any conflict or inconsistency between this Agreement and -any Purchase Order, the terms of this Agreement will prevail over the terms of -the Purchase Order with respect to such conflict or inconsistency. - -14.5 Modifications - -No modification of this Agreement shall be effective unless contained in a -writing executed by an authorized representative of each Party. No term or -condition contained in Licensee's Purchase Order shall apply unless expressly -accepted by The Qt Company in writing. - -14.6 Force Majeure - -Except for the payment obligations hereunder, neither Party shall be liable to -the other for any delay or non-performance of its obligations hereunder in the -event and to the extent that such delay or non- performance is due to an event -of act of God, terrorist attack or other similar unforeseeable catastrophic -event that prevents either Party for fulfilling its obligations under this -Agreement and which such Party cannot avoid or circumvent ("Force Majeure -Event"). If the Force Majeure Event results in a delay or non- performance of a -Party for a period of three (3) months or longer, then either Party shall have -the right to terminate this Agreement with immediate effect without any -liability (except for the obligations of payment arising prior to the event of -Force Majeure) towards the other Party. - -14.7 Notices - -Any notice given by one Party to the other shall be deemed properly given and -deemed received if specifically acknowledged by the receiving Party in writing -or when successfully delivered to the recipient by hand, fax, or special courier -during normal business hours on a business day to the addresses specified for -The Qt Company in the beginning of this Agreement, and for the Licensee in the -Licensee’s account profile. Each communication and document made or delivered by -one Party to the other Party pursuant to this Agreement shall be in the English -language. - -14.8 Export Control -Licensee acknowledges that the Redistributables may be subject to export -control restrictions under the applicable laws of respective countries. -Licensee shall fully comply with all applicable export license restrictions -and requirements as well as with all lawses hereunder and shall procure all -necessary governmental authorizations, including without limitation, all -necessary licenses, approvals, permissions or consents, where necessary for -the re- exportation of the Redistributables, Applications -and/or Devices. - -14.9 No Implied License -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, shall -remain with The Qt Company and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with any -other software or hardware not delivered by The Qt Company under this Agreement. - -14.10 Attorney Fees - -The prevailing Party in any action to enforce this Agreement shall be entitled -to recover its attorney's fees and costs in connection with such action. - -14.11 Severability - -If any provision of this Agreement shall be adjudged by any court of competent -jurisdiction to be unenforceable or invalid, that provision shall be limited or -eliminated to the minimum extent necessary so that this Agreement shall -otherwise remain in full force and effect and enforceable. - -IN WITNESS WHEREOF, the Parties hereto, intending to be legally bound hereby, -have caused this Agreement to be executed by Licensee’s authorized -representative installing the Licensed Software and accepting the terms hereof -in connection therewith. - -Appendix 1 - -1. Parts of the Licensed Software that are permitted for distribution in object -code form only ("Redistributables") under this Agreement: - -- The Licensed Software's essential and add-on libraries - -- The Licensed Software's configuration tool ("qtconfig") - -- The Licensed Software's help tool ("Qt Assistant") - -- The Licensed Software's internationalization tools ("Qt Linguist", "lupdate", -"lrelease") - -- The Licensed Software's QML ("Qt Quick") launcher tool ("qmlscene" and -"qmlviewer") - -- The Licensed Software's installer framework - -2. Parts of the Licensed Software that are not permitted for distribution -include, but are not limited to: - -- The Licensed Software's source code and header files - -- The Licensed Software's documentation - -- The Licensed Software's documentation generation tool ("qdoc") - -- The Licensed Software's tool for writing makefiles ("qmake") - -- The Licensed Software's Meta Object Compiler ("moc") - -- The Licensed Software's User Interface Compiler ("uic" or in the case of Qt Jambi: "juic") - -- The Licensed Software's Resource Compiler ("rcc") - -- The Licensed Software's generator (only in the case of Qt Jambi if applicable) - -- The Licensed Software's parts of the IDE tool ("Qt Creator") - -- The Licensed Software's Emulator - -- Build scripts, recipes and other material for creating the -configuration of Licensed Software and/or 3rd party components, including the -reference operating system configuration delivered in conjunction with the diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT qtquickcontrols2-opensource-src-5.9.5/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT --- qtquickcontrols2-opensource-src-5.12.5+dfsg/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 2019-09-06 12:05:25.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT 1970-01-01 00:00:00.000000000 +0000 @@ -1,1089 +0,0 @@ -QT LICENSE AGREEMENT -Agreement version 4.1 -This License Agreement (“Agreement”) is a legal agreement between The Qt Company -(as defined below) and the Licensee (as defined below) for the license of -Licensed Software (as defined below). Capitalized terms used herein are defined -in Section 1. -WHEREAS: - -(A) Licensee wishes to use the Licensed Software for the purpose of developing - and distributing Applications and/or Devices; and -(B) The Qt Company is willing to grant the Licensee a right to use Licensed - Software for such purpose pursuant to term and conditions of this Agreement. - -NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: - -1. DEFINITIONS -“Affiliate” of a Party shall mean an entity (i) which is directly or indirectly -controlling such Party; (ii) which is under the same direct or indirect -ownership or control as such Party; or (iii) which is directly or indirectly -owned or controlled by such Party. For these purposes, an entity shall be -treated as being controlled by another if that other entity has fifty percent -(50 %) or more of the votes in such entity, is able to direct its affairs and/or -to control the composition of its board of directors or equivalent body. - -“Add-on Products” shall mean The Qt Company’s specific add-on software products -(for example Qt Safe Renderer, Qt for Automation, Qt Application Manager), which -are not licensed as part of The Qt Company’s standard offering, but shall be -included into the scope of Licensed Software only if so specifically agreed -between the Parties. - -“Applications” shall mean Licensee's software products created using the -Licensed Software, which may include the Redistributables, or part thereof. - -“Contractor(s)” shall mean third party consultants, distributors and contractors -performing services to a Party under applicable contractual arrangement. - -“Customer(s)” shall mean Licensee’s end users to whom Licensee, directly or -indirectly, distributes copies of the Redistributables. - -“Deployment Platforms” shall mean operating systems specified in the License -Certificate, in which the Redistributables can be distributed pursuant to the -terms and conditions of this Agreement. - -“Designated User(s)” shall mean the employee(s) of Licensee or Licensee’s -Affiliates acting within the scope of their employment or Licensee's Contractors -acting within the scope of their services for Licensee and on behalf of -Licensee. Designated Users shall be named in the License Certificate. - -“Development License” shall mean the license needed by the Licensee for each -Designated User to use the Licensed Software under the license grant described -in Section 3.1 of this Agreement. Development Licenses are available separately -for Qt for Application Development (desktop) and Qt for Device Creation -(embedded) products, each product having its designated scope and purpose of -use. Distribution Licenses are always connected to Qt for Device Creation -product only. - -“Development Platforms” shall mean those operating systems specified in the -License Certificate, in which the Licensed Software can be used under the -Development License, but not distributed in any form or used for any other -purpose. - -“Devices” shall mean hardware devices or products that 1) are manufactured -and/or distributed by the Licensee or its Affiliates or Contractors, and 2) -(i) incorporate or integrate the Redistributables or parts thereof; or (ii) do -not incorporate or integrate the Redistributables at the time of distribution, -but where, when used by a Customer, the main user interface or substantial -functionality of such device is provided by Application(s) or otherwise depends -on the Licensed Software. Devices shall be specified in Appendix 2 or in a -quote. - -“Distribution License(s)” shall mean the license required for distribution of -Redistributables in connection with Devices pursuant to license grant described -in Section 3.3 of this Agreement. - -“Distribution License Packs” shall mean set of prepaid Distribution Licenses for -distribution of Redistributables, as defined in The Qt Company’s standard price -list, quote, Purchase Order confirmation or in an appendix hereto, as the case -may be. - -“Intellectual Property Rights” shall mean patents (including utility models), -design patents, and designs (whether or not capable of registration), chip -topography rights and other like protection, copyrights, trademarks, service -marks, trade names, logos or other words or symbols and any other form of -statutory protection of any kind and applications for any of the foregoing as -well as any trade secrets. - -“License Certificate” shall mean a certificate generated by The Qt Company for -each Designated User respectively upon them downloading the Licensed Software. -License Certificate will be available under respective Designated User’s Qt -Account at account.qt.io and it will specify the Designated User, the -Development Platforms, Deployment Platforms and the License Term. The terms of -the License Certificate are considered part of this Agreement and shall be -updated from time to time to reflect any agreed changes to the foregoing terms -relating to Designated User’s rights to the Licensed Software. - -“License Fee” shall mean the fee charged to the Licensee for rights granted -under the terms of this Agreement. - -“License Term” shall mean the agreed validity period of the Development License -of the respective Designated User, during which time the Designated User is -entitled to use the Licensed Software, as set forth in the respective License -Certificate. - -“Licensed Software” shall mean either -(i) Qt for Application Development or -(ii) Qt for Device Creation, and/or -(iii) Qt 3D Studio, and/or -(iv) Qt Design Studio, and/or -(v) selected Add-on Products, if any, depending on which product(s) the - Licensee has purchased under this Agreement, - -as well as corresponding online or electronic documentation, associated media -and printed materials, including the source code, example programs and the -documentation, licensed to the Licensee under this Agreement. Licensed Software -does not include Third Party Software (as defined in Section 4) or Open Source -Qt. The Qt Company may, in the course of its development activities, at its free -and absolute discretion and without any obligation to send or publish any -notifications to the Licensee or in general, make changes, additions or -deletions in the components and functionalities of the Licensed Software, -provided that no such changes, additions or deletions will affect the already -released version of the Licensed Software, but only upcoming version(s). - -“Licensee” shall mean the individual or legal entity that is party to this -Agreement, as identified on the signature page hereof. - -“Licensee’s Records” shall mean books and records that are likely to contain -information bearing on Licensee’s compliance with this Agreement or the payments -due to The Qt Company under this Agreement, including, but not limited to: -assembly logs, sales records and distribution records. - -“Modified Software” shall have the meaning as set forth in Section 2.3. - -“Online Services” shall mean any services or access to systems made available by -The Qt Company to the Licensee over the Internet relating to the Licensed -Software or for the purpose of use by the Licensee of the Licensed Software or -Support. Use of any such Online Services is discretionary for the Licensee and -some of them may be subject to additional fees. - -“Open Source Qt” shall mean the non-commercial Qt computer software products, -licensed under the terms of the GNU Lesser General Public License, version 2.1 -or later (“LGPL”) or the GNU General Public License, version 2.0 or later -(“GPL”). For clarity, Open Source Qt shall not be provided nor governed under -this Agreement. - -”Party” or “Parties” shall mean Licensee and/or The Qt Company. - -“Qt 3D Studio” shall mean all versions of The Qt Company’s Qt 3D Studio, a 3D -user interface design and development environment for rapid designing and -prototyping of animated user interfaces. - -“Qt Design Studio” shall mean all versions of The Qt Company’s Qt Design Studio -tool, a 2D user interface design and development environment for rapid designing -and prototyping of animated user interfaces. - -“Qt for Application Development” shall mean The Qt Company’s productized -offering, which consist of all versions of -(i) Qt Toolkit, and -(ii) Qt Tools/Applications. - -“Qt for Device Creation” shall mean The Qt Company’s productized offering, -which consist of all versions of -(i) Qt for Application Development, and -(ii) Software components specific to embedded software development as set forth - in Appendix 1, Sections 1b and 1d. - -“Qt Toolkit” shall mean the modules defined in Appendix 1, Section 1a. - -“Qt Tools/Applications” shall mean the tools defined in Appendix 1, Section 1c. - -"Redistributables" shall mean the portions of the Licensed Software set forth in -Appendix 1, Section 2 that may be distributed pursuant to the terms of this -Agreement in object code form only, including any relevant documentation. Where -relevant, any reference to Licensed Software in this Agreement shall include and -refer also to Redistributables. - -“Renewal Term” shall mean an extension of previous License Term as agreed -between the Parties. - -“Submitted Modified Software” shall have the meaning as set forth in -Section 2.3. - -“Support” shall mean standard developer support that is provided by The Qt -Company to assist Designated Users in using the Licensed Software in accordance -with The Qt Company’s standard support terms and as further defined in -Section 8 hereunder. - -“Taxes” shall have the meaning set forth in Section 10.5. - -“Term” shall have the meaning set forth in Section 12. - -“The Qt Company” shall mean: -(i) in the event Licensee is an individual residing in the United States or a - legal entity incorporated in the United States or having its headquarters - in the United States, The Qt Company Inc., a Delaware corporation with its - office at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, - USA.; or -(ii) in the event the Licensee is an individual residing outside of the United - States or a legal entity incorporated outside of the United States or - having its registered office outside of the United States, The Qt Company - Ltd., a Finnish company with its registered office at Bertel Jungin aukio - D3A, 02600 Espoo, Finland. - -"Third Party Software " shall have the meaning set forth in Section 4. - -“Updates” shall mean a release or version of the Licensed Software containing -bug fixes, error corrections and other changes that are generally made available -to users of the Licensed Software that have contracted for Support. Updates are -generally depicted as a change to the digits following the decimal in the -Licensed Software version number. The Qt Company shall make Updates available to -the Licensee under the Support. Updates shall be considered as part of the -Licensed Software hereunder. - -“Upgrades” shall mean a release or version of the Licensed Software containing -enhancements and new features and are generally depicted as a change to the -first digit of the Licensed Software version number. In the event Upgrades are -provided to the Licensee under this Agreement, they shall be considered as part -of the Licensed Software hereunder. - -2. OWNERSHIP -2.1 Ownership of The Qt Company -The Licensed Software is protected by copyright laws and international copyright -treaties, as well as other intellectual property laws and treaties. The Licensed -Software is licensed, not sold. All The Qt Company's Intellectual Property -Rights are and shall remain the exclusive property of The Qt Company or its -licensors respectively. - -2.2 Ownership of Licensee -All the Licensee's Intellectual Property Rights are and shall remain the -exclusive property of the Licensee or its licensors respectively. All -Intellectual Property Rights to the Modified Software, Applications and Devices -shall remain with the Licensee and no rights thereto shall be granted by the -Licensee to The Qt Company under this Agreement (except as set forth in Section -2.3 below). - -2.3 Modified Software -Licensee may create bug-fixes, error corrections, patches or modifications to -the Licensed Software (“Modified Software”). Such Modified Software may break -the source or binary compatibility with the Licensed Software (including without -limitation through changing the application programming interfaces ("API") or by -adding, changing or deleting any variable, method, or class signature in the -Licensed Software and/or any inter-process protocols, services or standards in -the Licensed Software libraries). To the extent that Licensee’s Modified -Software so breaks source or binary compatibility with the Licensed Software, -Licensee acknowledges that The Qt Company's ability to provide Support may be -prevented or limited and Licensee's ability to make use of Updates may be -restricted. Licensee may, at its sole and absolute discretion, choose to submit -Modified Software to The Qt Company (“Submitted Modified Software”) in -connection with Licensee’s Support request, service request or otherwise. In the -event Licensee does so, then, Licensee hereby grants The Qt Company a -sublicensable, assignable, irrevocable, perpetual, worldwide, non-exclusive, -royalty-free and fully paid-up license, under all of Licensee’s Intellectual -Property Rights, to reproduce, adapt, translate, modify, and prepare derivative -works of, publicly display, publicly perform, sublicense, make available and -distribute such Submitted Modified Software as The Qt Company sees fit at its -free and absolute discretion. - -3. LICENSES GRANTED -3.1 Development with Licensed Software -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable license, valid for the -License Term, to use, modify and copy the Licensed Software by Designated Users -on the Development Platforms for the sole purposes of designing, developing, -demonstrating and testing Application(s) and/or Devices, and to provide thereto -related support and other related services to end-user Customers. Licensee may -install copies of the Licensed Software on an unlimited number of computers -provided that (i) only the Designated Users may use the Licensed Software, and -(ii) all Designated Users must have a valid Development License to use Licensed -Software. Licensee may at any time designate another Designated User to replace -a then-current Designated User by notifying The Qt Company in writing, provided -that any Designated User may be replaced only once during any six-month period. -Upon expiry of the initially agreed License Term, the respective License Terms -shall be automatically extended to one or more Renewal Term(s), unless and until -either Party notifies the other Party in writing that it does not wish to -continue the License Term, such notification to be provided to the other Party -no less than ninety (90) days before expiry of the respective License Term. -Unless otherwise agreed between the Parties, Renewal Term shall be of equal -length with the initial Term. Any such Renewal Term shall be subject to License -Fees agreed between the Parties or, if no advance agreement exists, subject to -The Qt Company’s standard pricing applicable at the commencement date of any -such Renewal Term. - -3.2 Distribution of Applications -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through its Contractors, Redistributables as installed, -incorporated or integrated into Applications for execution on the Deployment -Platforms, and (ii) grant sublicenses to Redistributables, as distributed -hereunder, for Customers solely for Customer’s internal use and to the extent -necessary in order for the Customers to use the Applications for their -respective intended purposes. -Right to distribute the Redistributables as part of an Application as provided -herein is not royalty-bearing but is conditional upon the Licensee having paid -the agreed Development Licenses from The Qt Company before distributing any -Redistributables to Customers. - -3.3 Distribution of Devices -Subject to the terms of this Agreement, The Qt Company grants to Licensee a -personal, worldwide, non-exclusive, non-transferable, revocable (for cause -pursuant to this Agreement) right and license, valid for the Term, to (i) -distribute, by itself or through one or more tiers of Contractors, -Redistributables as installed, incorporated or integrated, or intended to be -installed, incorporated or integrated into Devices for execution on the -Deployment Platforms, and (ii) grant sublicenses to Redistributables, as -distributed hereunder, for Customers solely for Customer’s internal use and to -the extent necessary in order for the Customers to use the Devices for their -respective intended purposes. -Right to distribute the Redistributables with Devices as provided herein is -conditional upon the Licensee having purchased and paid the appropriate amount -of Development Licenses for Qt for Device Creation product and Distribution -Licenses from The Qt Company before distributing any Redistributables to -Customers. - -3.4 Further Requirements -The licenses granted above in this Section 3 by The Qt Company to Licensee are -conditional and subject to Licensee's compliance with the following terms: -(i) Licensee shall not remove or alter any copyright, trademark or other - proprietary rights notice contained in any portion of the Licensed - Software; -(ii) Applications must add primary and substantial functionality to the - Licensed Software; -(iii) Applications may not pass on functionality which in any way makes it - possible for others to create software with the Licensed Software; - provided however that Licensee may use the Licensed Software's scripting - and QML ("Qt Quick") functionality solely in order to enable scripting, - themes and styles that augment the functionality and appearance of the - Application(s) without adding primary and substantial functionality to - the Application(s); -(iv) Applications must not compete with the Licensed Software; -(v) Licensee shall not use The Qt Company's or any of its suppliers' names, - logos, or trademarks to market Applications, except that Licensee may use - “Built with Qt” logo to indicate that Application(s) was developed using - the Licensed Software; -(vi) Licensee shall not distribute, sublicense or disclose source code of - Licensed Software to any third party (provided however that Licensee may - appoint employee(s) of Contractors as Designated Users to use Licensed - Software pursuant to this Agreement). Such right may be available for the - Licensee subject to a separate software development kit (“SDK”) license - agreement to be concluded with The Qt Company; -(vii) Licensee shall not grant the Customers a right to (i) make copies of the - Redistributables except when and to the extent required to use the - Applications and/or Devices for their intended purpose, (ii) modify the - Redistributables or create derivative works thereof, (iii) decompile, - disassemble or otherwise reverse engineer Redistributables, or (iv) - redistribute any copy or portion of the Redistributables to any third - party, except as part of the onward sale of the Device on which the - Redistributables are installed; -(viii) Licensee shall not and shall cause that its Affiliates or Contractors - shall not a) in any way combine, incorporate or integrate Licensed - Software with, or use Licensed Software for creation of, any software - created with or incorporating Open Source Qt, or b) incorporate or - integrate Applications into a hardware device or product other than a - Device, unless Licensee has received an advance written permission from - The Qt Company to do so. Absent such written permission, any and all - distribution by the Licensee during the Term of a hardware device or - product a) which incorporate or integrate any part of Licensed Software - or Open Source Qt; or b) where the main user interface or substantial - functionality is provided by software built with Licensed Software or - Open Source Qt or otherwise depends on the Licensed Software or Open - Source Qt, shall be considered as a Device distribution under this - Agreement and dependent on compliance thereof (including but not limited - to obligation to pay applicable License Fees for such distribution). - Notwithstanding what is provided above in this sub-section (viii), - Licensee is entitled to use and combine Qt 3D Studio and/or Qt Design - Studio with Open Source Qt (“Combination”) for its internal evaluation - purposes, provided that Licensee shall in no way transfer, publish, - disclose, display or otherwise make available any software or work - resulting from such Combination; -(ix) Licensee shall cause all of its Affiliates and Contractors entitled to - make use of the licenses granted under this Agreement, to be - contractually bound to comply with the relevant terms of this Agreement - and not to use the Licensed Software beyond the terms hereof and for any - purposes other than operating within the scope of their services for - Licensee. Licensee shall be responsible for any and all actions and - omissions of its Affiliates and Contractors relating to the Licensed - Software and use thereof (including but not limited to payment of all - applicable License Fees); -(x) Except when and to the extent explicitly provided in this Section 3, - Licensee shall not transfer, publish, disclose, display or otherwise - make available the Licensed Software; -; and -(xi) Licensee shall not attempt or enlist a third party to conduct or attempt - to conduct any of the above. - -Above terms shall not be applicable if and to the extent they conflict with any -mandatory provisions of any applicable laws. Any use of Licensed Software beyond -the provisions of this Agreement is strictly prohibited and requires an -additional license from The Qt Company. - -4. THIRD PARTY SOFTWARE -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. Third -Party Software does not comprise part of the Licensed Software. In some cases, -access to Third Party Software may be included in the Licensed Software. Such -Third Party Software will be listed in the ".../src/3rdparty" source tree -delivered with the Licensed Software or documented in the Licensed Software, as -such may be amended from time to time. Licensee acknowledges that use or -distribution of Third Party Software is in all respects subject to applicable -license terms of applicable third party right holders. - -5. PRE-RELEASE CODE -The Licensed Software may contain pre-release code and functionality marked or -otherwise stated as “Technology Preview”, “Alpha”, “Beta” or similar -designation. Such pre-release code may be present in order to provide -experimental support for new platforms or preliminary versions of one or more -new functionalities. The pre-release code may not be at the level of performance -and compatibility of a final, generally available, product offering of the -Licensed Software. The pre-release parts of the Licensed Software may not -operate correctly, may contain errors and may be substantially modified by The -Qt Company prior to the first commercial product release, if any. The Qt Company -is under no obligation to make pre-release code commercially available, or -provide any Support or Updates relating thereto. The Qt Company assumes no -liability whatsoever regarding any pre-release code, but any use thereof is -exclusively at Licensee’s own risk and expense. For clarity, Licensee is -entitled to use such pre-release code pursuant to Section 3, just like other -Licensed Software, provided however that in the event Add-on Products are -included and available as such pre-release code, Licensee’s right to use such -Add-on Products is nevertheless subject to and conditional upon conclusion of -separate agreement with The Qt Company. - -6. LIMITED WARRANTY AND WARRANTY DISCLAIMER -The Qt Company hereby represents and warrants that it has the power and -authority to grant the rights and licenses granted to Licensee under this -Agreement. Except as set forth above, the Licensed Software is licensed to -Licensee "as is" and Licensee’s exclusive remedy and The Qt Company’s entire -liability for errors in the Licensed Software shall be limited, at The Qt -Company’s option, to correction of the error, replacement of the Licensed -Software or return of the applicable fees paid for the defective Licensed -Software for the time period during which the License is not able to utilize the -Licensed Software under the terms of this Agreement. - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF -ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER -WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND -NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT -WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE’S REQUIREMENTS OR THAT -IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE -UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE -RISK OF AND RESPONSIBILITY OF LICENSEE. - -7. INDEMNIFICATION AND LIMITATION OF LIABILITY -7.1 Limitation of Liability -EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) -BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO -EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, -LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, -CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, -HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES -SPECIFICALLY AGREE THAT LICENSEE’S OBLIGATION TO PAY LICENSE AND OTHER FEES -CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE CONSIDERED -AS A DIRECT DAMAGE. EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL -MISCONDUCT, AND (II) BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY -APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY’S TOTAL AGGREGATE LIABILITY UNDER -THIS AGREEMENT EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT -COMPANY FROM LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY -PRECEDING THE EVENT RESULTING IN SUCH LIABILITY. THE PROVISIONS OF THIS SECTION -7 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN THE QT COMPANY AND LICENSEE -AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET FORTH HEREIN IN DETERMINING -WHETHER TO ENTER INTO THIS AGREEMENT. - -7.2 Licensee´s Indemnification -Licensee shall indemnify and hold harmless The Qt Company from and against any -claim, injury, judgment, settlement, loss or expense, including attorneys' fees -related to: (a) Licensee’s misrepresentation in connection with The Qt Company -or the Licensed Software or breach of this Agreement, (b) the Application or -Device (except where such cause of liability is solely attributable to the -Licensed Software). - -8. SUPPORT, UPDATES AND ONLINE SERVICES -Upon due payment of the agreed License Fees the Licensee will be eligible to -receive Support and Updates and to use the Online Services during the License -Term, provided, however, that in the event the License Term is longer than 36 -months, Support is provided only for the first 12 months, unless the Parties -specifically otherwise agree. Unless otherwise decided by The Company at its -free and absolute discretion, Upgrades will not be included in the Support but -may be available subject to additional fees. From time to time The Qt Company -may change the Support terms, provided that during the respective ongoing -License Term the level of Support provided by The Qt Company may not be reduced -without the consent of the Licensee. Unless otherwise agreed, The Qt Company -shall not be responsible for providing any service or support to Customers. - -9. CONFIDENTIALITY -Each Party acknowledges that during the Term of this Agreement each Party may -receive information about the other Party's business, business methods, business -plans, customers, business relations, technology, and other information, -including the terms of this Agreement, that is confidential and of great value -to the other Party, and the value of which would be significantly reduced if -disclosed to third parties (“Confidential Information”). Accordingly, when a -Party (the “Receiving Party”) receives Confidential Information from the other -Party (the “Disclosing Party”), the Receiving Party shall only disclose such -information to employees and Contractors on a need to know basis, and shall -cause its employees and employees of its Affiliates to: (i) maintain any and all -Confidential Information in confidence; (ii) not disclose the Confidential -Information to a third party without the Disclosing Party's prior written -approval; and (iii) not, directly or indirectly, use the Confidential -Information for any purpose other than for exercising its rights and fulfilling -its responsibilities pursuant to this Agreement. Each Party shall take -reasonable measures to protect the Confidential Information of the other Party, -which measures shall not be less than the measures taken by such Party to -protect its own confidential and proprietary information. Obligation of -confidentiality shall not apply to information that (i) is or becomes generally -known to the public through no act or omission of the Receiving Party; (ii) was -in the Receiving Party's lawful possession prior to the disclosure hereunder and -was not subject to limitations on disclosure or use; (iii) is developed -independently by employees or Contractors of the Receiving Party or other -persons working for the Receiving Party who have not had access to the -Confidential Information of the Disclosing Party, as proven by the written -records of the Receiving Party; (iv) is lawfully disclosed to the Receiving -Party without restrictions, by a third party not under an obligation of -confidentiality; or (v) the Receiving Party is legally compelled to disclose, in -which case the Receiving Party shall notify the Disclosing Party of such -compelled disclosure and assert the privileged and confidential nature of the -information and cooperate fully with the Disclosing Party to limit the scope of -disclosure and the dissemination of disclosed Confidential Information to the -minimum extent necessary. The obligations under this Section 9 shall continue to -remain in force for a period of five (5) years after the last disclosure, and, -with respect to trade secrets, for so long as such trade secrets are protected -under applicable trade secret laws. - -10. FEES, DELIVERY AND PAYMENT -10.1 License Fees -License Fees are described in The Qt Company’s standard price list, quote or -Purchase Order confirmation or in an appendix hereto, as the case may be. The -License Fees shall not be refunded or claimed as a credit in any event or for -any reason whatsoever. - -10.2 Ordering Licenses -Licensee may purchase Development Licenses and Distribution Licenses pursuant to -agreed pricing terms or, if no specific pricing terms have been agreed upon, at -The Qt Company's standard pricing terms applicable at the time of purchase. -Licensee shall submit all purchase orders for Development Licenses and -Distribution Licenses to The Qt Company by email or any other method acceptable -to The Qt Company (each such order is referred to herein as a “Purchase Order”) -for confirmation, whereupon the Purchase Order shall become binding between the -Parties. - -10.3 Distribution License Packs -Unless otherwise agreed, Distribution Licenses shall be purchased by way of -Distribution License Packs. Upon due payment of the ordered Distribution License -Pack(s), the Licensee will have an account of Distribution Licenses available -for installing, bundling or integrating (all jointly “installing”) the -Redistributables with the Devices or for otherwise distributing the -Redistributables in accordance with this Agreement. Each time Licensee -“installs” or distributes a copy of Redistributables, then one Distribution -License is used, and Licensee’s account of available Distribution Licenses is -decreased accordingly. Licensee may “install” copies of the Redistributables so -long as Licensee has Distribution Licenses remaining on its account. -Redistributables will be deemed to have been “installed” into a Device when one -of the following circumstances shall have occurred: a) the Redistributables have -been loaded onto the Device and used outside of the Licensee’s premises or b) -the Device has been fully tested and placed into Licensee's inventory (or sold) -for the first time (i.e., Licensee will not be required to use (or pay for) more -than one Distribution License for each individual Device, e.g. in a situation -where a Device is returned to Licensee's inventory after delivery to a -distributor or sale to a Customer). In addition, if Licensee includes a back-up -copy of the Redistributables on a CD-ROM or other storage medium along with the -product, that backup copy of the Redistributables will not be deemed to have -been “installed” and will not require an additional Distribution License. - -10.4 Payment Terms -License Fees and any other charges under this Agreement shall be paid by -Licensee no later than thirty (30) days from the date of the applicable invoice -from The Qt Company. The Qt Company will submit an invoice to Licensee after the -date of this Agreement and/or after The Qt Company receives a Purchase Order -from Licensee. A late payment charge of the lower of (a) one percent per month; -or (b) the interest rate stipulated by applicable law, shall be charged on any -unpaid balances that remain past due. The Qt Company shall have the right to -suspend, terminate or withhold grants of all rights to the Licensed Software -hereunder, including but not limited to the Developer License, Distribution -License, and Support, should Licensee fail to make payment in timely fashion. - -10.5 Taxes -All License Fees and other charges payable hereunder are gross amounts but -exclusive of any value added tax, use tax, sales tax and other taxes, duties or -tariffs (“Taxes”). Such applicable Taxes shall be paid by Licensee, or, where -applicable, in lieu of payment of such Taxes, Licensee shall provide an -exemption certificate to The Qt Company and any applicable authority. - -11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS -11.1 Licensee’s Record-keeping -Licensee shall at all times maintain accurate and up-to-date written records of -Licensee’s activities related to the use of Licensed Software and distribution -of Redistributables. The records shall be adequate to determine Licensee’s -compliance with the provisions of this Agreement and to demonstrate the number -of Designated Users and Redistributables distributed by Licensee. The records -shall conform to good accounting practices reasonably acceptable to The Qt -Company. Licensee shall, within thirty (30) days from receiving The Qt Company’s -request to that effect, deliver to The Qt Company a report on Licensee’s usage -of Licensed Software, such report to contain information, in sufficient detail, -on (i) amount of users working with Licensed Software, (ii) copies of -Redistributables distributed by Licensee during that calendar quarter, (iii) -number of undistributed copies of Redistributables and corresponding number of -unused Distribution Licenses remaining on Licensee’s account, and (iv) any other -information as The Qt Company may reasonably require from time to time. - -11.2. The Qt Company’s Audit Rights -The Qt Company or an independent auditor acting on behalf of The Qt Company’s, -may, upon at least five (5) business days’ prior written notice and at its -expense, audit Licensee with respect to the use of the Redistributables, but not -more frequently than once during each 6-month period. Such audit may be -conducted by mail, electronic means or through an in-person visit to Licensee’s -place of business. Any such in-person audit shall be conducted during regular -business hours at Licensee's facilities and shall not unreasonably interfere -with Licensee's business activities. The Qt Company or the independent auditor -acting on behalf of The Qt Company shall be entitled to inspect Licensee’s -Records. All such Licensee’s Records and use thereof shall be subject to an -obligation of confidentiality under this Agreement. If an audit reveals that -Licensee is using the Licensed Software beyond scope of the licenses Licensee -has paid for, Licensee agrees to immediately pay The Qt Company any amounts owed -for such unauthorized use. -In addition, in the event the audit reveals a material violation of the terms of -this Agreement (underpayment of more than 5% of License Fees shall always be -deemed a material violation for purposes of this section), then the Licensee -shall pay The Qt Company's reasonable cost of conducting such audit. - -12 TERM AND TERMINATION -12.1 Term -This Agreement shall enter into force upon due acceptance by both Parties and -remain in force for as long as there is any Development License(s) in force -(“Term”), unless and until terminated pursuant to the terms of this Section 12. - -12.2 Termination by The Qt Company -The Qt Company shall have the right to terminate this Agreement upon thirty (30) -days prior written notice if the Licensee is in material breach of any -obligation of this Agreement and fails to remedy such breach within such notice -period. - -12.3 Mutual Right to Terminate -Either Party shall have the right to terminate this Agreement immediately upon -written notice in the event that the other Party becomes insolvent, files for -any form of bankruptcy, makes any assignment for the benefit of creditors, has a -receiver, administrative receiver or officer appointed over the whole or a -substantial part of its assets, ceases to conduct business, or an act equivalent -to any of the above occurs under the laws of the jurisdiction of the other -Party. - -12.4 Parties´ Rights and Duties upon Termination -Upon expiry or termination of the Agreement Licensee shall cease and shall cause -all Designated Users (including those of its Affiliates’ and Contractors’) to -cease using the Licensed Software and distribution of the Redistributables under -this Agreement. -Notwithstanding the above, in the event the Agreement expires or is terminated: -(i) as a result of The Qt Company choosing not to renew the Development - License(s) as set forth in Section 3.1, then all valid licenses possessed - by the Licensee at such date shall be extended to be valid in perpetuity - under the terms of this Agreement and Licensee is entitled to purchase - additional licenses as set forth in Section 10.2; or -(ii) for reason other than by The Qt Company pursuant to item (i) above or - pursuant to Section 12.2, then the Licensee is entitled, for a period of - six (6) months after the effective date of termination, to continue - distribution of Devices under the Distribution Licenses paid but unused at - such effective date of termination. Upon any such termination the Licensee - shall destroy or return to The Qt Company all copies of the Licensed - Software and all related materials and will certify the same to The Qt - Company upon its request, provided however that Licensee may retain and - exploit such copies of the Licensed Software as it may reasonably require - in providing continued support to Customers. -Expiry or termination of this Agreement for any reason whatsoever shall not -relieve Licensee of its obligation to pay any License Fees accrued or payable to -The Qt Company prior to the effective date of termination, and Licensee shall -immediately pay to The Qt Company all such fees upon the effective date of -termination. Termination of this Agreement shall not affect any rights of -Customers to continue use of Applications and Devices (and therein incorporated -Redistributables). - -12.5 Extension in case of bankruptcy -In the event The Qt Company is declared bankrupt under a final, non-cancellable -decision by relevant court of law, and this Agreement is not, at the date of -expiry of the Development License(s) pursuant to Section 3.1, assigned to party, -who has assumed The Qt Company’s position as a legitimate licensor of Licensed -Software under this Agreement, then all valid licenses possessed by the Licensee -at such date of expiry, and which the Licensee has not notified for expiry, -shall be extended to be valid in perpetuity under the terms of this Agreement. - -13. GOVERNING LAW AND LEGAL VENUE -In the event this Agreement is in the name of The Qt Company Inc., a Delaware -Corporation, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of the State of California, USA, excluding its choice of law - provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any dispute, claim or controversy arising out of or relating to this - Agreement or the breach, termination, enforcement, interpretation or - validity thereof, including the determination of the scope or - applicability of this Agreement to arbitrate, shall be determined by - arbitration in San Francisco, USA, before one arbitrator. The arbitration - shall be administered by JAMS pursuant to JAMS' Streamlined Arbitration - Rules and Procedures. Judgment on the Award may be entered in any court - having jurisdiction. This Section shall not preclude parties from seeking - provisional remedies in aid of arbitration from a court of appropriate - jurisdiction. -In the event this Agreement is in the name of The Qt Company Ltd., a Finnish -Company, then: -(i) this Agreement shall be construed and interpreted in accordance with the - laws of Finland, excluding its choice of law provisions; -(ii) the United Nations Convention on Contracts for the International Sale of - Goods will not apply to this Agreement; and -(iii) any disputes, controversy or claim arising out of or relating to this - Agreement, or the breach, termination or validity thereof shall be shall - be finally settled by arbitration in accordance with the Arbitration Rules - of Finland Chamber of Commerce. The arbitration tribunal shall consist of - one (1), or if either Party so requires, of three (3), arbitrators. The - award shall be final and binding and enforceable in any court of competent - jurisdiction. The arbitration shall be held in Helsinki, Finland and the - process shall be conducted in the English language. This Section shall not - preclude parties from seeking provisional remedies in aid of arbitration - from a court of appropriate jurisdiction. - -14. GENERAL PROVISIONS -14.1 No Assignment -Except in the case of a merger or sale of substantially all of its corporate -assets, Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the prior written -consent of The Qt Company, which shall not be unreasonably withheld or delayed. -The Qt Company shall be entitled to freely assign or transfer any of its rights, -benefits or obligations under this Agreement. - -14.2 No Third Party Representations -Licensee shall make no representations or warranties concerning the Licensed -Software on behalf of The Qt Company. Any representation or warranty Licensee -makes or purports to make on The Qt Company’s behalf shall be void as to The Qt -Company. - -14.3 Surviving Sections -Any terms and conditions that by their nature or otherwise reasonably should -survive termination of this Agreement shall so be deemed to survive. - -14.4 Entire Agreement -This Agreement, the exhibits hereto, the License Certificate and any applicable -Purchase Order constitute the complete agreement between the Parties and -supersedes all prior or contemporaneous discussions, representations, and -proposals, written or oral, with respect to the subject matters discussed -herein. -In the event of any conflict or inconsistency between this Agreement and any -Purchase Order, the terms of this Agreement will prevail over the terms of the -Purchase Order with respect to such conflict or inconsistency. -Parties specifically acknowledge and agree that this Agreement prevails over any -click-to-accept or similar agreements the Designated Users may need to accept -online upon download of the Licensed Software, as may be required by The Qt -Company’s applicable processes relating to Licensed Software. - -14.5 Modifications -No modification of this Agreement shall be effective unless contained in a -writing executed by an authorized representative of each Party. No term or -condition contained in Licensee's Purchase Order shall apply unless expressly -accepted by The Qt Company in writing. - -14.6 Force Majeure -Except for the payment obligations hereunder, neither Party shall be liable to -the other for any delay or non-performance of its obligations hereunder in the -event and to the extent that such delay or non-performance is due to an event of -act of God, terrorist attack or other similar unforeseeable catastrophic event -that prevents either Party for fulfilling its obligations under this Agreement -and which such Party cannot avoid or circumvent (“Force Majeure Event”). If the -Force Majeure Event results in a delay or non-performance of a Party for a -period of three (3) months or longer, then either Party shall have the right to -terminate this Agreement with immediate effect without any liability (except for -the obligations of payment arising prior to the event of Force Majeure) towards -the other Party. - -14.7 Notices -Any notice given by one Party to the other shall be deemed properly given and -deemed received if specifically acknowledged by the receiving Party in writing -or when successfully delivered to the recipient by hand, fax, or special courier -during normal business hours on a business day to the addresses specified for -each Party on the signature page. Each communication and document made or -delivered by one Party to the other Party pursuant to this Agreement shall be in -the English language. - -14.8 Export Control -Licensee acknowledges that the Redistributables may be subject to export control -restrictions under the applicable laws of respective countries. Licensee shall -fully comply with all applicable export license restrictions and requirements as -well as with all laws and regulations relating to the Redistributables and -exercise of licenses hereunder and shall procure all necessary governmental -authorizations, including without limitation, all necessary licenses, approvals, -permissions or consents, where necessary for the re-exportation of the -Redistributables, Applications and/or Devices. - -14.9 No Implied License -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, shall -remain with The Qt Company and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with any -other software or hardware not delivered by The Qt Company under this Agreement. - -14.10 Attorney Fees -The prevailing Party in any action to enforce this Agreement shall be entitled -to recover its attorney’s fees and costs in connection with such action. - -14.11 Severability -If any provision of this Agreement shall be adjudged by any court of competent -jurisdiction to be unenforceable or invalid, that provision shall be limited or -eliminated to the minimum extent necessary so that this Agreement shall -otherwise remain in full force and effect and enforceable. - - - -APPENDICES -The Agreement includes Appendix 1 as shown below. In addition, the Agreement may -include one or more of the Appendices 3-5 listed below depending on the -product(s) purchased by the Licensee, what is stated in the quote or invoice, -and/or what is stated on the License Certificate. - -  -APPENDIX 1: LICENSED SOFTWARE -1a. Licensed Software - Qt Toolkit -Module Description -Qt Core Core non-graphical classes used by other modules. -Qt GUI Base classes for graphical user interface (GUI) - components. -Qt Multimedia Classes for audio, video and camera functionality. -Qt Multimedia Widgets Widget-based classes for implementing multimedia - functionality. -Qt Network Classes to make network programming easier and more - portable. -Qt QML Classes for QML and JavaScript languages. -Qt Quick A declarative framework for building highly dynamic - applications with custom user interfaces. -Qt Quick Controls 2 Provides lightweight QML types for creating - performant user interfaces for desktop, embedded, and - mobile devices. -Qt Quick Dialogs Types for creating and interacting with system - dialogs from a Qt Quick application. -Qt Quick Layouts Layouts are items that are used to arrange Qt Quick 2 - based items in the user interface. -Qt Quick Test A unit test framework for QML applications. -Qt SQL Classes for database integration using SQL. -Qt Test Classes for unit testing Qt applications and - libraries. -Qt Widgets Classes to extend Qt GUI with C++ widgets. -Active Qt Classes for applications which use ActiveX and COM -Qt 3D Functionality for near-realtime simulation systems - with support for 2D and 3D rendering. -Qt Android Extras Provides platform-specific APIs for Android. -Qt Bluetooth Provides access to Bluetooth hardware. -Qt Canvas 3D Enables OpenGL-like 3D drawing calls from Qt Quick - applications using JavaScript. -Qt Concurrent Classes for writing multi-threaded programs without - using low-level threading primitives. -Qt D-Bus Classes for inter-process communication over the - D-Bus protocol. -Qt Gamepad Enables Qt applications to support the use of gamepad - hardware. -Qt Graphical Effects Graphical effects for use with Qt Quick 2. -Qt Help Classes for integrating documentation into - applications, similar to Qt Assistant. -Qt Image Formats Plugins for additional image formats: TIFF, MNG, TGA, - WBMP. -Qt Location Displays map, navigation, and place content in a QML - application. -Qt Mac Extras Provides platform-specific APIs for macOS. -Qt Network Authorization Provides support for OAuth-based authorization to - online services. -Qt NFC Provides access to Near-Field communication (NFC) - hardware. -Qt Platform Headers Provides classes that encapsulate platform-specific - information. -Qt Positioning Provides access to position, satellite and area - monitoring classes. -Qt Print Support Classes to make printing easier and more portable. -Qt Purchasing Enables in-app purchase of products in Qt - applications. -Qt for Python Python bindings for Qt. -Qt Quick Controls Reusable Qt Quick based UI controls to create classic - desktop-style user interfaces. -Qt Quick Extras Provides a specialized set of controls that can be - used to build interfaces in Qt Quick. -Qt Quick Widgets Provides a C++ widget class for displaying a Qt - Quick user interface. -Qt SCXML Provides classes and tools for creating state - machines from SCXML files. -Qt Sensors Provides access to sensor hardware and motion gesture - recognition. -Qt Serial Bus Provides access to serial industrial bus interface. -Qt Serial Port Provides access to hardware and virtual serial ports. -Qt Speech Provides support for accessibility features such as - text-to-speech. -Qt SVG Classes for displaying the contents of SVG files. -Qt UI Tools Classes for loading QWidget based forms created in Qt - Designer dynamically, at runtime. -Qt WebChannel Provides access to QObject or QML objects from HTML - clients for seamless integration of Qt applications - with HTML/JavaScript clients. -Qt WebEngine Classes and functions for embedding web content in - applications using the Chromium browser project. -Qt WebSockets Provides WebSocket communication. -Qt WebView Displays web content in a QML application by using - APIs native to the platform. -Qt Windows Extras Provides platform-specific APIs for Windows. -Qt X11 Extras Provides platform-specific APIs for X11. -Qt XML C++ implementations of SAX and DOM. -Qt XML Patterns Support for XPath, XQuery, XSLT and XML schema - validation. -Qt Wayland Compositor Provides a framework to develop a Wayland compositor. -Qt Charts UI Components for displaying charts. -Qt Data Visualization UI Components for creating 3D data visualizations. -Qt Virtual Keyboard A framework for implementing different input methods - as well as a QML virtual keyboard. - -1b. Licensed software – Embedded software development libraries -Module Description -Boot 2 Qt stack Yocto based Embedded Linux stack for selected - target hardware -Qt OTA Client-side capability for device image - updates Over The Air. -Device Utilities Collection of API’s to manage the device; - E.g. display, WiFi and Bluetooth settings. -Qt Debugging Bridge (QDB) Daemon Enables host-target deployment, debugging, - profiling and other features over USB. Up to - developer to decide if this is left in the - final solution. - -1c. Licensed Software - Qt Tools/Applications -Tool Description -Qt Creator The integrated development environment for Qt. -Qt Designer Qt tool for designing and building graphical user interfaces. -Qt Linguist Tool used to add translations to Qt applications. -Qt Assistant Tool for viewing online documentation in Qt help-file format. -Qmake Utility tool used to automate the generation of make files. -uic User interface compiler for the Qt GUI toolkit. -rcc Resource compiler used for embedding resources into Qt - applications. -lupdate Tool that finds the translatable strings in the specified source, - header and Qt Designer interface files, and produces or updates - translation files. -lrelease Tool that produces translation files in the compact binary format - used by localized Qt applications. -qlalr Qt parser generator tool. -qdoc Configurable documentation generation tool. -qmlscene QML launcher tool -qmlviewer QML launcher tool - -1d. Licensed software –Qt Tools/Applications specific to embedded software -development -Tool Description -Target toolchains Cross compilation toolchains for - supported target devices and operating - systems -Qt Debugging Bridge (QDB) Host Tools Enables deployment, debugging, - profiling and other features over USB - from development host PC to target - device. -qtconfig-gui Qt Lite Configurator tool graphical - interface -Qt Emulator Qt emulator - -2. Parts of the Licensed Software that are permitted for distribution in -object-code form only (“Redistributables”) under this Agreement: - -2a. Qt for Application Development -(i) The Licensed Software's Qt Toolkit libraries defined in 1a -(ii) The Licensed Software's installer framework - -2b. Qt for Device Creation -(i) Qt for Application Development Redistributables defined in 2a -(ii) The Licensed Software’s Embedded software development libraries defined in - 1b - -2c. Qt 3D Studio -The Licensed Software’s Qt 3D Studio Runtime (“Qt53DStudioRuntime2”) - - -APPENDIX 3: ADDITIONS TO LICENSED SOFTWARE -In addition to what is provided under the definition of the Licensed Software, -Parties agree that Licensed Software shall also include the following additional -software products of The Qt Company if included in the quote / invoice: -Qt for Automation - - MQTT software protocol libraries - - KNX software protocol libraries - - OPCUA (open source backend) - - OPCUA (Unified Automation backend) -Qt Safe Renderer - - Qt Safe Renderer library -Qt Application Manager - - Qt Application Manager library with Qt Creator integration - -All the above is considered as Redistributables and subject to applicable -provisions and limitations including but not limited to what is defined in -Section 3. - - -APPENDIX 4: SMALL BUSINESS AND START-UP APPENDIX -The provisions of this Appendix 4 are applicable for Start-up Companies and for -the Evaluation Term. -For the purpose of this Appendix 4, the following additional definitions shall -be applicable: - “Trial Term” shall mean a period of twelve (12) months. - “Start-up Company” means a company with a maximum annual revenue, including - funding, equivalent to 100,000 USD (in applicable currency) during a respective - calendar year, as evidenced by duly audited records of the Licensee and - approved by The Qt Company. - -During the Trial Term, Section 3 shall apply with following modifications -(“Trial Term Modifications”): - - Licenses granted under Sections 3.1 and 3.2 shall be free of any charge. For - clarity, License for distribution of Devices pursuant to Section 3.3 is - subject to applicable License Fee for necessary Distribution Licenses; - - Development License under Section 3.1 is limited to a maximum of three (3) - Designated Users; and - - Support is available subject to availability, as judged by The Qt Company at - its free and absolute discretion. - -Upon expiry of the Trial Term: - a) This Appendix 4 is terminated, Trial Term Modifications cease to remain in - force, Licensee’s Development Licenses shall be automatically converted into - licenses subject to a License Fee (in the amount specified in the quote or - in Appendix 2 and payable with a 30-day payment term) and Licensee’s rights - and obligations under this Agreement shall continue to remain in force under - the standard provisions of the Agreement, unless the Licensee notifies The - Qt Company in writing no less than ninety (90) days before such expiry date - that Licensee does not agree to such continuance, in which event the - Agreement, and all rights of the Licensee thereunder, shall expire; provided - however that - b) in the event the Licensee still qualifies as a Start-up Company, the - Licensee has an option (“Option”), instead of what is stated in item a) - above, to extend the Trial Term renewal is limited to one time and total - duration of Trial Terms thus to 24 months after the effective date. Licensee - shall notify The Qt Company in writing no less than ninety (90) days before - the expiry date, if Licensee wish to exercise the Option. - - -APPENDIX 5: NON-COMMERCIAL USE APPENDIX -The provisions of this Appendix 5 are applicable for non-commercial use of the -Licensed Software by the Licensee. -For the purpose of this Appendix 5, the following additional definitions -(replacing the relevant definition of the Agreement, where applicable) shall be -applicable: - “Demo Units” shall mean (i) hardware development platform, which incorporates - the Licensed Software along with Licensee’s software and/or hardware, and - (ii) prototype versions of Applications or Devices. - “Designated User(s)” shall mean the employees and students of the Licensee. - “Licensee Products” shall mean Applications and/or Devices. - “Permitted Purpose” shall mean (i) Licensee’s internal evaluation and testing - of Licensed Software, (ii) building Demo Units as well as (iii) educational - use. - “Term” shall mean a period of twelve (12) months or any such other period as - may be agreed between the Parties. - -For the purpose of this Appendix 5, the following changes shall be agreed with -respect to relevant Sections of the Agreement: - I. Recital (A) shall be replaced in its entirety to read as follows: “(A) - Licensee wishes to use the Licensed Software for the Permitted Purpose.” - II. Section 3.1 shall be replaced in its entirety to read as follows: - “The Qt Company grants to Licensee a personal, non-exclusive, - non-transferable, revocable, royalty-free license, valid for the Term, to - use, modify and copy the Licensed Software solely for the Permitted - Purpose. Licensee may install copies of the Licensed Software on an - unlimited number of computers provided that only Designated Users may use - the Licensed Software. Licensee may demonstrate the Demo Units, provided - that such demonstrations must be conducted by Licensee, and the Demo Units - must remain in Licensee’s possession and under Licensee’s control at all - times. For clarity, this Agreement does not (i) entitle Licensee to use - Licensed Software to create Applications or Devices (other than prototypes - thereof) or (ii) carry any distribution rights to Licensee, but such - rights are subject to and conditional upon conclusion of a separate - license agreement with The Qt Company.” - III. Sections 3.2, 3.3, 8 and 10 shall be deleted. - IV. Section 3.4 shall be replaced in its entirety to read as follows: - “Licensee shall not: - - remove or alter any copyright, trademark or other proprietary rights - notice contained in any portion of the Licensed Software; - - transfer, publish, sublicense, disclose, display or otherwise make - the Licensed Software available to any third party (except that - Licensee may demonstrate the Demo Units pursuant to Section 3.1); - - in any way combine, incorporate or integrate Licensed Software with, or - use Licensed Software for creation of, any software created with or - incorporating Open Source Qt; - Licensee shall cause all Designated Users who make use of the licenses - granted under this Agreement, to be contractually bound to comply with - the relevant terms of this Agreement and not to use the Licensed - Software beyond the terms hereof. Licensee shall be responsible for any - and all actions and omissions of its Designated Users relating to the - Licensed Software and use thereof. Any use of Licensed Software beyond - the provisions of this Agreement is strictly prohibited and requires an - additional license from The Qt Company.” - V. Section 12 shall be replaced in its entirety to read as follows: - “This Agreement shall enter into force upon due acceptance by both Parties - and remain in force for the Term, unless and until terminated pursuant to - the terms of Section 12. Upon termination of the Agreement, Licensee shall - cease using the Licensed Software. All other copies of Licensed Software - in the possession or control of Licensee must be erased or destroyed. An - officer of Licensee must, upon request, promptly deliver to The Qt Company - a written confirmation that this has occurred.” - -Except for the modifications specified above, this Appendix carries no change to -the terms of the Agreement which shall remain in full force. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/README.md qtquickcontrols2-opensource-src-5.9.5/README.md --- qtquickcontrols2-opensource-src-5.12.5+dfsg/README.md 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/README.md 2018-03-21 07:59:29.000000000 +0000 @@ -1,8 +1,6 @@ Qt Quick Controls 2 =================== -![Qt Quick Controls 2 Styles](https://doc.qt.io/qt-5/images/qtquickcontrols2-styles.png) - The Qt Quick Controls 2 module delivers the next generation user interface controls based on Qt Quick. In comparison to the desktop-oriented Qt Quick Controls 1, Qt Quick Controls 2 are an order of magnitude simpler, lighter and @@ -13,8 +11,6 @@ comes with a selection of built-in styles: - Default style - a simple and minimal all-round style that offers the maximum performance -- Fusion style - a platform-agnostic style that offers a desktop-oriented look'n'feel -- Imagine style - a designer-friendly style based on image assets - Material style - a style based on the Google Material Design Guidelines - Universal style - a style based on the Microsoft Universal Design Guidelines @@ -22,11 +18,6 @@ - http://blog.qt.io/blog/2015/03/31/qt-quick-controls-for-embedded/ - http://blog.qt.io/blog/2015/11/23/qt-quick-controls-re-engineered-status-update/ -- http://blog.qt.io/blog/2016/06/10/qt-quick-controls-2-0-a-new-beginning/ -- http://blog.qt.io/blog/2016/10/06/qt-quick-controls-2-1-and-beyond/ -- http://blog.qt.io/blog/2017/05/31/ready-made-ui-controls-qt-quick-controls-2-summary/ -- http://blog.qt.io/blog/2017/11/23/qt-quick-controls-2-imagine-style/ -- http://blog.qt.io/blog/2017/11/23/ready-qt-quick-controls-2-3/ ## Help @@ -52,4 +43,4 @@ ## Usage -Please refer to the [Getting Started with Qt Quick Controls 2](https://doc.qt.io/qt-5/qtquickcontrols2-gettingstarted.html) documentation. +Please refer to the "Getting Started with Qt Quick Controls 2" documentation. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/DayOfWeekRow.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/DayOfWeekRow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/DayOfWeekRow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/DayOfWeekRow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import Qt.labs.calendar 1.0 AbstractDayOfWeekRow { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/qtlabscalendar.qdocconf qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/qtlabscalendar.qdocconf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/qtlabscalendar.qdocconf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/qtlabscalendar.qdocconf 2018-03-21 07:59:29.000000000 +0000 @@ -22,10 +22,7 @@ qhp.QtLabsCalendar.subprojects.qmltypes.selectors = qmlclass qhp.QtLabsCalendar.subprojects.qmltypes.sortPages = true -depends = qtcore qtgui qtdoc qtqml qtquick qtquickcontrols - -# This module has no documented C++ types, clear the module header -moduleheader = +depends = qtcore qtgui qtdoc qtqml qtquick qtquickcontrols2 headerdirs += ../ sourcedirs += ../ src diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.0 import Qt.labs.calendar 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 //! [1] ListView { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.0 +import QtQuick.Layouts 1.0 import Qt.labs.calendar 1.0 //! [1] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.0 import Qt.labs.calendar 1.0 //! [1] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.0 +import QtQuick.Layouts 1.0 import Qt.labs.calendar 1.0 //! [1] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.0 import Qt.labs.calendar 1.0 //! [1] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.0 +import QtQuick.Layouts 1.0 import Qt.labs.calendar 1.0 //! [1] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.0 import Qt.labs.calendar 1.0 //! [1] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/MonthGrid.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/MonthGrid.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/MonthGrid.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/MonthGrid.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import Qt.labs.calendar 1.0 AbstractMonthGrid { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/plugins.qmltypes qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/plugins.qmltypes --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/plugins.qmltypes 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/plugins.qmltypes 2018-03-21 07:59:29.000000000 +0000 @@ -86,8 +86,6 @@ Property { name: "wheelEnabled"; type: "bool" } Property { name: "background"; type: "QQuickItem"; isPointer: true } Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "palette"; revision: 3; type: "QPalette" } - Signal { name: "paletteChanged"; revision: 3 } } Component { name: "QQuickDayOfWeekRow" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/qtlabscalendarplugin.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/qtlabscalendarplugin.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/qtlabscalendarplugin.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/qtlabscalendarplugin.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -42,6 +42,13 @@ #include "qquickcalendarmodel_p.h" #include "qquickcalendar_p.h" +static inline void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_Qt_labs_calendar); +#endif +} + QT_BEGIN_NAMESPACE class QtLabsCalendarPlugin: public QQmlExtensionPlugin @@ -51,11 +58,12 @@ public: QtLabsCalendarPlugin(QObject *parent = nullptr); - void registerTypes(const char *uri) override; + void registerTypes(const char *uri); }; QtLabsCalendarPlugin::QtLabsCalendarPlugin(QObject *parent) : QQmlExtensionPlugin(parent) { + initResources(); } static QObject *calendarSingleton(QQmlEngine *engine, QJSEngine *scriptEngine) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/WeekNumberColumn.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/WeekNumberColumn.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/calendar/WeekNumberColumn.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/calendar/WeekNumberColumn.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import Qt.labs.calendar 1.0 AbstractWeekNumberColumn { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/AbstractButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/AbstractButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/AbstractButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/AbstractButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,14 +34,15 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.AbstractButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (contentItem ? contentItem.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + (contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem ? contentItem.y + contentItem.baselineOffset : 0 } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ActionGroup.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ActionGroup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ActionGroup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ActionGroup.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T - -T.ActionGroup { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Action.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Action.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Action.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Action.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T - -T.Action { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ApplicationWindow.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ApplicationWindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ApplicationWindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ApplicationWindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,22 +34,22 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Window 2.3 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.ApplicationWindow { id: window - color: palette.window + color: Default.backgroundColor overlay.modal: Rectangle { - color: Color.transparent(window.palette.shadow, 0.5) + color: Default.overlayModalColor } overlay.modeless: Rectangle { - color: Color.transparent(window.palette.shadow, 0.12) + color: Default.overlayDimColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/BusyIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/BusyIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/BusyIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/BusyIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,16 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.BusyIndicator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding + implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding padding: 6 @@ -53,9 +51,6 @@ implicitWidth: 48 implicitHeight: 48 - pen: control.palette.dark - fill: control.palette.dark - running: control.running opacity: control.running ? 1 : 0 Behavior on opacity { OpacityAnimator { duration: 250 } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ButtonGroup.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ButtonGroup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ButtonGroup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ButtonGroup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ButtonGroup { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Button.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,47 +34,44 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.Button { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 - horizontalPadding: padding + 2 - spacing: 6 + leftPadding: padding + 2 + rightPadding: padding + 2 - icon.width: 24 - icon.height: 24 - icon.color: control.checked || control.highlighted ? control.palette.brightText : - control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font - color: control.checked || control.highlighted ? control.palette.brightText : - control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText + opacity: enabled || control.highlighted || control.checked ? 1 : 0.3 + color: control.checked || control.highlighted ? + Default.textLightColor : + (control.visualFocus ? Default.focusColor : (control.down ? Default.textDarkColor : Default.textColor)) + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight } background: Rectangle { implicitWidth: 100 implicitHeight: 40 visible: !control.flat || control.down || control.checked || control.highlighted - color: Color.blend(control.checked || control.highlighted ? control.palette.dark : control.palette.button, - control.palette.mid, control.down ? 0.5 : 0.0) - border.color: control.palette.highlight + color: control.checked || control.highlighted ? + (control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : Default.focusColor) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor)) : + (control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor)) + border.color: Default.focusColor border.width: control.visualFocus ? 2 : 0 } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/CheckBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,60 +34,39 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 T.CheckBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 spacing: 6 - // keep in sync with CheckDelegate.qml (shared CheckIndicator.qml was removed for performance reasons) - indicator: Rectangle { - implicitWidth: 28 - implicitHeight: 28 - + indicator: CheckIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - - color: control.down ? control.palette.light : control.palette.base - border.width: control.visualFocus ? 2 : 1 - border.color: control.visualFocus ? control.palette.highlight : control.palette.mid - - ColorImage { - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - defaultColor: "#353637" - color: control.palette.text - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" - visible: control.checkState === Qt.Checked - } - - Rectangle { - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - width: 16 - height: 3 - color: control.palette.text - visible: control.checkState === Qt.PartiallyChecked - } + control: control } - contentItem: CheckLabel { + contentItem: Text { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 text: control.text font: control.font - color: control.palette.windowText + color: control.down ? Default.textDarkColor : Default.textColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + opacity: enabled ? 1 : 0.3 } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/CheckDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/CheckDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/CheckDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/CheckDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,77 +34,46 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 T.CheckDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 12 spacing: 12 - icon.width: 24 - icon.height: 24 - icon.color: control.palette.text - - contentItem: IconLabel { + contentItem: Text { leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0 - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon text: control.text font: control.font - color: control.palette.text + color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } - // keep in sync with CheckBox.qml (shared CheckIndicator.qml was removed for performance reasons) - indicator: Rectangle { - implicitWidth: 28 - implicitHeight: 28 - + indicator: CheckIndicator { x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding y: control.topPadding + (control.availableHeight - height) / 2 - color: control.down ? control.palette.light : control.palette.base - border.width: control.visualFocus ? 2 : 1 - border.color: control.visualFocus ? control.palette.highlight : control.palette.mid - - ColorImage { - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - defaultColor: "#353637" - color: control.palette.text - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" - visible: control.checkState === Qt.Checked - } - - Rectangle { - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - width: 16 - height: 3 - color: control.palette.text - visible: control.checkState === Qt.PartiallyChecked - } + control: control } background: Rectangle { implicitWidth: 100 implicitHeight: 40 visible: control.down || control.highlighted - color: control.down ? control.palette.midlight : control.palette.light + color: control.down ? Default.delegatePressedColor : Default.delegateColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/CheckIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/CheckIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/CheckIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/CheckIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 + +Rectangle { + id: indicator + + property Item control + + implicitWidth: 28 + implicitHeight: 28 + + color: control.enabled ? (control.down + ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor) + : Default.backgroundColor) : Default.disabledDarkColor + border.width: control.visualFocus ? 2 : 1 + border.color: control.enabled ? (control.visualFocus + ? Default.focusColor + : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : "transparent" + opacity: enabled ? 1 : 0.3 + + Image { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + source: "image://default/check/" + (control.visualFocus ? Default.focusColor : Default.textColor) + sourceSize.width: width + sourceSize.height: height + visible: control.checkState === Qt.Checked + } + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 16 + height: 3 + color: control.visualFocus ? Default.focusColor : Default.frameDarkColor + visible: control.checkState === Qt.PartiallyChecked + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ComboBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ComboBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ComboBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ComboBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,21 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Window 2.3 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.ComboBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) @@ -55,19 +56,17 @@ delegate: ItemDelegate { width: parent.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData - palette.text: control.palette.text - palette.highlightedText: control.palette.highlightedText font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal highlighted: control.highlightedIndex === index hoverEnabled: control.hoverEnabled } - indicator: ColorImage { + indicator: Image { x: control.mirrored ? control.padding : control.width - width - control.padding y: control.topPadding + (control.availableHeight - height) / 2 - color: control.palette.dark - defaultColor: "#353637" - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/double-arrow.png" + source: "image://default/double-arrow/" + (!control.editable && control.visualFocus ? Default.focusColor : Default.textColor) + sourceSize.width: width + sourceSize.height: height opacity: enabled ? 1 : 0.3 } @@ -86,25 +85,26 @@ validator: control.validator font: control.font - color: control.editable ? control.palette.text : control.palette.buttonText - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText + color: !control.editable && control.visualFocus ? Default.focusColor : Default.textColor + selectionColor: Default.focusColor + selectedTextColor: Default.textLightColor verticalAlignment: Text.AlignVCenter + opacity: control.enabled ? 1 : 0.3 background: Rectangle { - visible: control.enabled && control.editable && !control.flat + visible: control.editable && !control.flat border.width: parent && parent.activeFocus ? 2 : 1 - border.color: parent && parent.activeFocus ? control.palette.highlight : control.palette.button - color: control.palette.base + border.color: parent && parent.activeFocus ? Default.focusColor : Default.buttonColor } } background: Rectangle { - implicitWidth: 140 + implicitWidth: 120 implicitHeight: 40 - color: control.down ? control.palette.mid : control.palette.button - border.color: control.palette.highlight + color: !control.editable && control.visualFocus ? (control.pressed ? Default.focusPressedColor : Default.focusLightColor) : + (control.down ? Default.buttonPressedColor : Default.buttonColor) + border.color: Default.focusColor border.width: !control.editable && control.visualFocus ? 2 : 0 visible: !control.flat || control.down } @@ -121,6 +121,7 @@ implicitHeight: contentHeight model: control.delegateModel currentIndex: control.highlightedIndex + highlightRangeMode: ListView.ApplyRange highlightMoveDuration: 0 Rectangle { @@ -128,14 +129,12 @@ width: parent.width height: parent.height color: "transparent" - border.color: control.palette.mid + border.color: Default.frameLightColor } T.ScrollIndicator.vertical: ScrollIndicator { } } - background: Rectangle { - color: control.palette.window - } + background: Rectangle { } } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Container.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Container.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Container.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Container.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,14 +34,14 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Container { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (contentItem ? contentItem.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + (contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding) } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Control.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Control.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,14 +34,14 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Control { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (contentItem ? contentItem.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + (contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding) } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/controls.pri qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/controls.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/controls.pri 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/controls.pri 2018-03-21 07:59:29.000000000 +0000 @@ -1,27 +1,24 @@ HEADERS += \ + $$PWD/qquickdialring_p.h \ $$PWD/qquickdefaultbusyindicator_p.h \ - $$PWD/qquickdefaultdial_p.h \ $$PWD/qquickdefaultprogressbar_p.h \ - $$PWD/qquickdefaultstyle_p.h \ - $$PWD/qquickdefaulttheme_p.h + $$PWD/qquickdefaultstyle_p.h SOURCES += \ + $$PWD/qquickdialring.cpp \ $$PWD/qquickdefaultbusyindicator.cpp \ - $$PWD/qquickdefaultdial.cpp \ $$PWD/qquickdefaultprogressbar.cpp \ - $$PWD/qquickdefaultstyle.cpp \ - $$PWD/qquickdefaulttheme.cpp + $$PWD/qquickdefaultstyle.cpp -QML_FILES += \ +QML_CONTROLS = \ $$PWD/AbstractButton.qml \ - $$PWD/Action.qml \ - $$PWD/ActionGroup.qml \ $$PWD/ApplicationWindow.qml \ $$PWD/BusyIndicator.qml \ $$PWD/Button.qml \ $$PWD/ButtonGroup.qml \ $$PWD/CheckBox.qml \ $$PWD/CheckDelegate.qml \ + $$PWD/CheckIndicator.qml \ $$PWD/ComboBox.qml \ $$PWD/Container.qml \ $$PWD/Control.qml \ @@ -35,8 +32,6 @@ $$PWD/ItemDelegate.qml \ $$PWD/Label.qml \ $$PWD/Menu.qml \ - $$PWD/MenuBar.qml \ - $$PWD/MenuBarItem.qml \ $$PWD/MenuItem.qml \ $$PWD/MenuSeparator.qml \ $$PWD/Page.qml \ @@ -46,6 +41,7 @@ $$PWD/ProgressBar.qml \ $$PWD/RadioButton.qml \ $$PWD/RadioDelegate.qml \ + $$PWD/RadioIndicator.qml \ $$PWD/RangeSlider.qml \ $$PWD/RoundButton.qml \ $$PWD/ScrollBar.qml \ @@ -56,6 +52,7 @@ $$PWD/StackView.qml \ $$PWD/SwipeDelegate.qml \ $$PWD/Switch.qml \ + $$PWD/SwitchIndicator.qml \ $$PWD/SwitchDelegate.qml \ $$PWD/SwipeView.qml \ $$PWD/TabBar.qml \ @@ -67,3 +64,5 @@ $$PWD/ToolSeparator.qml \ $$PWD/ToolTip.qml \ $$PWD/Tumbler.qml + +!qtquickcompiler: QML_FILES += $$QML_CONTROLS diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/controls.pro qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/controls.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/controls.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/controls.pro 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ TARGET = qtquickcontrols2plugin TARGETPATH = QtQuick/Controls.2 -IMPORT_VERSION = 2.5 +IMPORT_VERSION = 2.2 QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private @@ -11,7 +11,7 @@ OTHER_FILES += \ qmldir \ - $$QML_FILES + $$QML_CONTROLS SOURCES += \ $$PWD/qtquickcontrols2plugin.cpp @@ -22,7 +22,15 @@ !static: qtConfig(quick-designer): include(designer/designer.pri) include(doc/doc.pri) -CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler +qtquickcompiler { + qmlfiles.prefix = /qt-project.org/imports/QtQuick/Controls.2 + qmlfiles.files += $$QML_CONTROLS + RESOURCES += qmlfiles +} else:!static { + CONFIG += qmlcache +} + +CONFIG += no_cxx_module load(qml_plugin) requires(qtConfig(quickcontrols2-default)) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/DelayButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/DelayButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/DelayButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/DelayButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,21 +34,23 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.DelayButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 - horizontalPadding: padding + 2 + leftPadding: padding + 2 + rightPadding: padding + 2 transition: Transition { NumberAnimation { @@ -66,7 +68,7 @@ text: control.text font: control.font opacity: enabled ? 1 : 0.3 - color: control.palette.buttonText + color: control.visualFocus ? Default.focusColor : (control.down ? Default.textDarkColor : Default.textColor) horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -81,7 +83,7 @@ text: control.text font: control.font opacity: enabled ? 1 : 0.3 - color: control.palette.brightText + color: Default.textLightColor horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -91,15 +93,14 @@ background: Rectangle { implicitWidth: 100 implicitHeight: 40 - color: Color.blend(control.palette.button, control.palette.mid, control.down ? 0.5 : 0.0) - border.color: control.palette.highlight + color: control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor) + border.color: Default.focusColor border.width: control.visualFocus ? 2 : 0 - PaddedRectangle { - padding: control.visualFocus ? 2 : 0 + Rectangle { width: control.progress * parent.width height: parent.height - color: Color.blend(control.palette.dark, control.palette.mid, control.down ? 0.5 : 0.0) + color: control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : Default.focusColor) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor) } } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/dependencies.json qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/dependencies.json --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/dependencies.json 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/dependencies.json 2018-03-21 07:59:29.000000000 +0000 @@ -2,7 +2,7 @@ { "name": "QtQuick", "type": "module", - "version": "2.11" + "version": "2.9" }, { "name": "QtQuick.Window", @@ -12,6 +12,6 @@ { "name": "QtQuick.Templates", "type": "module", - "version": "2.5" + "version": "2.2" } ] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/AbstractButtonSection.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/AbstractButtonSection.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/AbstractButtonSection.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/AbstractButtonSection.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Section { caption: qsTr("AbstractButton") @@ -52,19 +52,6 @@ Layout.fillWidth: true } } - - Label { - text: qsTr("Display") - tooltip: qsTr("Determines how the icon and text are displayed within the button.") - } - SecondColumnLayout { - ComboBox { - backendValue: backendValues.display - model: [ "IconOnly", "TextOnly", "TextBesideIcon" ] - scope: "AbstractButton" - Layout.fillWidth: true - } - } Label { visible: checkable diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/BusyIndicatorSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/BusyIndicatorSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/BusyIndicatorSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/BusyIndicatorSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ButtonSection.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ButtonSection.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ButtonSection.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ButtonSection.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Section { id: section @@ -44,28 +44,6 @@ SectionLayout { Label { - text: qsTr("AutoRepeat") - tooltip: qsTr("Whether the button repeats pressed(), released() and clicked() signals while the button is pressed and held down.") - } - SecondColumnLayout { - CheckBox { - text: backendValues.autoRepeat.valueToString - backendValue: backendValues.autoRepeat - Layout.fillWidth: true - } - } - Label { - text: qsTr("Flat") - tooltip: qsTr("Whether the button is flat.") - } - SecondColumnLayout { - CheckBox { - text: backendValues.flat.valueToString - backendValue: backendValues.flat - Layout.fillWidth: true - } - } - Label { text: qsTr("Highlighted") tooltip: qsTr("Whether the button is highlighted.") } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ButtonSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ButtonSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ButtonSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ButtonSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/CheckBoxSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/CheckBoxSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/CheckBoxSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/CheckBoxSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/CheckDelegateSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/CheckDelegateSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/CheckDelegateSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/CheckDelegateSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/CheckSection.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/CheckSection.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/CheckSection.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/CheckSection.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Section { SectionLayout { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ComboBoxSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ComboBoxSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ComboBoxSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ComboBoxSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width @@ -70,38 +70,6 @@ Layout.fillWidth: true } } - Label { - text: qsTr("Editable") - tooltip: qsTr("Whether the combo box is editable.") - } - SecondColumnLayout { - CheckBox { - text: backendValues.editable.valueToString - backendValue: backendValues.editable - Layout.fillWidth: true - } - } - Label { - text: qsTr("Flat") - tooltip: qsTr("Whether the combo box button is flat.") - } - SecondColumnLayout { - CheckBox { - text: backendValues.flat.valueToString - backendValue: backendValues.flat - Layout.fillWidth: true - } - } - Label { - text: qsTr("DisplayText") - tooltip: qsTr("Holds the text that is displayed on the combo box button.") - } - SecondColumnLayout { - LineEdit { - backendValue: backendValues.displayText - Layout.fillWidth: true - } - } } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ContainerSection.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ContainerSection.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ContainerSection.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ContainerSection.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Section { caption: qsTr("Container") diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ControlSection.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ControlSection.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ControlSection.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ControlSection.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Section { caption: qsTr("Control") diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ControlSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ControlSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ControlSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ControlSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/DelayButtonSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/DelayButtonSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/DelayButtonSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/DelayButtonSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/designer.pri qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/designer.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/designer.pri 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/designer.pri 2018-03-21 07:59:29.000000000 +0000 @@ -1,7 +1,7 @@ -AUX_QML_FILES += \ +QML_FILES += \ $$PWD/qtquickcontrols2.metainfo -AUX_QML_FILES += \ +QML_FILES += \ $$PWD/AbstractButtonSection.qml \ $$PWD/BusyIndicatorSpecifics.qml \ $$PWD/ButtonSection.qml \ @@ -47,5 +47,5 @@ $$PWD/ToolSeparatorSpecifics.qml \ $$PWD/TumblerSpecifics.qml -AUX_QML_FILES += \ +QML_FILES += \ $$PWD/images/*.png diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/DialSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/DialSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/DialSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/DialSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.1 Column { width: parent.width @@ -130,19 +130,6 @@ Layout.fillWidth: true } } - - Label { - text: qsTr("Input Mode") - tooltip: qsTr("How the dial tracks movement.") - } - SecondColumnLayout { - ComboBox { - backendValue: backendValues.inputMode - model: [ "Circular", "Horizontal", "Vertical" ] - scope: "Dial" - Layout.fillWidth: true - } - } } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/FrameSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/FrameSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/FrameSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/FrameSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/GroupBoxSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/GroupBoxSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/GroupBoxSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/GroupBoxSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/busyindicator-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/busyindicator-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/busyindicator-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/busyindicator-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/busyindicator-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/busyindicator-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/busyindicator-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/busyindicator-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/button-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/button-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/button-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/button-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/button-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/button-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/button-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/button-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/checkbox-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/checkbox-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/checkbox-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/checkbox-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/checkbox-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/checkbox-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/checkbox-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/checkbox-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/combobox-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/combobox-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/combobox-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/combobox-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/combobox-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/combobox-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/combobox-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/combobox-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/delaybutton-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/delaybutton-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/delaybutton-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/delaybutton-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/delaybutton-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/delaybutton-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/delaybutton-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/delaybutton-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/dial-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/dial-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/dial-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/dial-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/dial-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/dial-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/dial-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/dial-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/frame-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/frame-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/frame-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/frame-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/frame-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/frame-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/frame-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/frame-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/groupbox-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/groupbox-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/groupbox-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/groupbox-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/groupbox-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/groupbox-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/groupbox-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/groupbox-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/itemdelegate-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/itemdelegate-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/itemdelegate-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/itemdelegate-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/itemdelegate-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/itemdelegate-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/itemdelegate-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/itemdelegate-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/label-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/label-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/label-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/label-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/label-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/label-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/label-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/label-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/page-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/page-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/page-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/page-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/page-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/page-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/page-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/page-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/pageindicator-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/pageindicator-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/pageindicator-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/pageindicator-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/pageindicator-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/pageindicator-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/pageindicator-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/pageindicator-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/pane-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/pane-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/pane-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/pane-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/pane-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/pane-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/pane-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/pane-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/placeholder-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/placeholder-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/placeholder-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/placeholder-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/placeholder-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/placeholder-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/placeholder-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/placeholder-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/progressbar-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/progressbar-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/progressbar-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/progressbar-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/progressbar-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/progressbar-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/progressbar-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/progressbar-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/radiobutton-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/radiobutton-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/radiobutton-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/radiobutton-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/radiobutton-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/radiobutton-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/radiobutton-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/radiobutton-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/rangeslider-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/rangeslider-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/rangeslider-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/rangeslider-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/rangeslider-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/rangeslider-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/rangeslider-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/rangeslider-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/roundbutton-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/roundbutton-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/roundbutton-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/roundbutton-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/roundbutton-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/roundbutton-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/roundbutton-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/roundbutton-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/scrollview-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/scrollview-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/scrollview-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/scrollview-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/scrollview-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/scrollview-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/slider-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/slider-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/slider-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/slider-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/slider-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/slider-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/slider-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/slider-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/spinbox-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/spinbox-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/spinbox-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/spinbox-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/spinbox-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/spinbox-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/spinbox-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/spinbox-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/stackview-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/stackview-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/stackview-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/stackview-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/stackview-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/stackview-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/swipeview-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/swipeview-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/swipeview-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/swipeview-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/swipeview-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/swipeview-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/switch-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/switch-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/switch-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/switch-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/switch-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/switch-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/switch-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/switch-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/textarea-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/textarea-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/textarea-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/textarea-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/textarea-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/textarea-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/textarea-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/textarea-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/textfield-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/textfield-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/textfield-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/textfield-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/textfield-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/textfield-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/textfield-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/textfield-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolbar-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolbar-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolbar-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolbar-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolbar-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolbar-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolbar-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolbar-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolbutton-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolbutton-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolbutton-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolbutton-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolbutton-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolbutton-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolbutton-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolbutton-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolseparator-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolseparator-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolseparator-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolseparator-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolseparator-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolseparator-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/toolseparator-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/toolseparator-icon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/tumbler-icon16@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/tumbler-icon16@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/tumbler-icon16.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/tumbler-icon16.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/tumbler-icon@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/tumbler-icon@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/images/tumbler-icon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/images/tumbler-icon.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ItemDelegateSection.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ItemDelegateSection.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ItemDelegateSection.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ItemDelegateSection.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Section { id: section diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ItemDelegateSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ItemDelegateSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ItemDelegateSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ItemDelegateSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/LabelSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/LabelSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/LabelSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/LabelSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/PaddingSection.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/PaddingSection.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/PaddingSection.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/PaddingSection.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Section { caption: qsTr("Padding") diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/PageIndicatorSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/PageIndicatorSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/PageIndicatorSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/PageIndicatorSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/PageSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/PageSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/PageSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/PageSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/PaneSection.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/PaneSection.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/PaneSection.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/PaneSection.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Section { caption: qsTr("Pane") diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/PaneSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/PaneSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/PaneSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/PaneSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ProgressBarSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ProgressBarSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ProgressBarSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ProgressBarSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/RadioButtonSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/RadioButtonSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/RadioButtonSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/RadioButtonSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/RadioDelegateSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/RadioDelegateSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/RadioDelegateSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/RadioDelegateSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/RangeSliderSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/RangeSliderSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/RangeSliderSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/RangeSliderSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.1 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/RoundButtonSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/RoundButtonSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/RoundButtonSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/RoundButtonSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ScrollViewSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ScrollViewSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ScrollViewSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ScrollViewSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SliderSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SliderSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SliderSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SliderSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.1 Column { width: parent.width @@ -112,7 +112,7 @@ } SecondColumnLayout { ComboBox { - backendValue: backendValues.snapMode + backendValue: backendValues.orientation model: [ "NoSnap", "SnapOnRelease", "SnapAlways" ] scope: "Slider" Layout.fillWidth: true diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SpinBoxSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SpinBoxSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SpinBoxSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SpinBoxSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.1 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/StackViewSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/StackViewSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/StackViewSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/StackViewSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SwipeDelegateSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SwipeDelegateSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SwipeDelegateSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SwipeDelegateSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SwipeViewSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SwipeViewSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SwipeViewSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SwipeViewSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SwitchDelegateSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SwitchDelegateSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SwitchDelegateSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SwitchDelegateSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SwitchSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SwitchSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/SwitchSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/SwitchSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/TabBarSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/TabBarSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/TabBarSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/TabBarSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/TabButtonSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/TabButtonSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/TabButtonSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/TabButtonSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/TextAreaSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/TextAreaSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/TextAreaSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/TextAreaSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/TextFieldSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/TextFieldSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/TextFieldSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/TextFieldSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ToolBarSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ToolBarSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ToolBarSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ToolBarSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ToolButtonSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ToolButtonSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ToolButtonSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ToolButtonSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ToolSeparatorSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ToolSeparatorSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/ToolSeparatorSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/ToolSeparatorSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.8 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.3 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/TumblerSpecifics.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/TumblerSpecifics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/designer/TumblerSpecifics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/designer/TumblerSpecifics.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts 1.0 Column { width: parent.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/DialogButtonBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/DialogButtonBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/DialogButtonBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/DialogButtonBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,16 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.DialogButtonBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - (control.count === 1 ? implicitContentWidth * 2 : implicitContentWidth) + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - contentWidth: contentItem.contentWidth + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) spacing: 1 padding: 12 @@ -55,6 +54,9 @@ } contentItem: ListView { + implicitWidth: contentWidth + implicitHeight: 40 + model: control.contentModel spacing: control.spacing orientation: ListView.Horizontal @@ -67,6 +69,5 @@ x: 1; y: 1 width: parent.width - 2 height: parent.height - 2 - color: control.palette.window } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Dialog.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,28 +34,30 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 T.Dialog { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitHeaderWidth, - implicitFooterWidth) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding - + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) - + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + header && header.visible ? header.implicitWidth : 0, + footer && footer.visible ? footer.implicitWidth : 0, + contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + (header && header.visible ? header.implicitHeight + spacing : 0) + + (footer && footer.visible ? footer.implicitHeight + spacing : 0) + + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 12 background: Rectangle { - color: control.palette.window - border.color: control.palette.dark + border.color: Default.frameDarkColor } header: Label { @@ -68,19 +70,10 @@ x: 1; y: 1 width: parent.width - 2 height: parent.height - 1 - color: control.palette.window } } footer: DialogButtonBox { visible: count > 0 } - - T.Overlay.modal: Rectangle { - color: Color.transparent(control.palette.shadow, 0.5) - } - - T.Overlay.modeless: Rectangle { - color: Color.transparent(control.palette.shadow, 0.12) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Dial.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Dial.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,35 +34,33 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.Dial { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) || 184 // ### remove 184 in Qt 6 - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) || 184 // ### remove 184 in Qt 6 + implicitWidth: 184 + implicitHeight: 184 - background: DialImpl { - implicitWidth: 184 - implicitHeight: 184 - color: control.visualFocus ? control.palette.highlight : control.palette.dark + background: DialRing { + width: control.availableWidth + height: control.availableHeight + color: control.visualFocus ? Default.focusColor : Default.frameDarkColor progress: control.position opacity: control.enabled ? 1 : 0.3 } - handle: ColorImage { + handle: Image { x: background.x + background.width / 2 - handle.width / 2 y: background.y + background.height / 2 - handle.height / 2 width: 14 height: 10 - defaultColor: "#353637" - color: control.visualFocus ? control.palette.highlight : control.palette.dark - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/dial-indicator.png" + source: "image://default/dial-indicator/" + (control.visualFocus ? Default.focusColor : Default.textColor) + sourceSize.width: width + sourceSize.height: height antialiasing: true opacity: control.enabled ? 1 : 0.3 transform: [ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/doc.pri qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/doc.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/doc.pri 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/doc.pri 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -QMAKE_DOCS = $$PWD/qtquickcontrols.qdocconf +QMAKE_DOCS = $$PWD/qtquickcontrols2.qdocconf OTHER_FILES += \ $$files($$PWD/snippets/*.qml) \ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-applicationwindow-wireframe.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-applicationwindow-wireframe.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-button-icononly.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-button-icononly.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-button-textbesideicon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-button-textbesideicon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-button-textonly.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-button-textonly.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-button-textundericon.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-button-textundericon.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-checkbox-group.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-checkbox-group.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-control.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-control.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-control.svg qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-control.svg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-control.svg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-control.svg 2018-03-21 07:59:29.000000000 +0000 @@ -9,16 +9,16 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="760" - height="580" - viewBox="0 0 759.99997 579.99999" + width="679.31317" + height="357.84125" + viewBox="0 0 679.31314 357.84124" id="svg2" version="1.1" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:version="0.91 r13725" sodipodi:docname="qtquickcontrols2-control.svg" - inkscape:export-filename="/home/jpnurmi/Projects/qt-dev/qtquickcontrols2/src/imports/controls/doc/images/qtquickcontrols2-control.png" - inkscape:export-xdpi="192" - inkscape:export-ydpi="192"> + inkscape:export-filename="/home/mitch/Dropbox/qtquickcontrols2-control.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> @@ -78,7 +78,7 @@ id="path4212" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="scale(-0.6)" + transform="scale(-0.6,-0.6)" inkscape:connector-curvature="0" /> + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + transform="scale(-0.8,-0.8)" /> + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + transform="scale(0.8,0.8)" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - + @@ -571,63 +211,88 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(91.482322,-32.9581)"> + transform="translate(91.482322,-255.11685)"> - + width="564.41473" + height="248.82799" + x="-30.289024" + y="321.69858" /> Background  Background + width="464.22452" + height="165.94499" + x="18.895706" + y="364.74274" /> Content item Content item + + Available height Available width Width Width Height Height Popup Control Bottompadding Bottom padding Toppadding Top padding Right padding Left padding - - Top inset Left inset - - Bottom inset - Right inset - - - - Window - - Topmargin Rightmargin - Bottommargin - Leftmargin + style="font-size:17.02554321px;line-height:125%;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000" + id="flowPara4386-0">Left padding Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-dial-inputmode.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-dial-inputmode.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-dial-inputMode.svgz and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-dial-inputMode.svgz differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-fusion-palettes.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-fusion-palettes.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-fusion.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-fusion.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-fusion-thumbnail.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-fusion-thumbnail.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-fusion-violet.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-fusion-violet.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-inset-boundaries.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-inset.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-inset.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-resized-padding.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-resized-stretchable.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-size.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch-size.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch.svgz and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-imagine-9-patch.svgz differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-imagine-customization-dark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-imagine-customization-dark.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-imagine-customization.svgz and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-imagine-customization.svgz differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-imagine.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-imagine.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-imagine-thumbnail.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-imagine-thumbnail.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-material-variant-dense.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-material-variant-dense.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-material-variant-normal.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-material-variant-normal.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-menubar-custom.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-menubar-custom.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-menubar.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-menubar.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-popup.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-popup.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-popup.svg qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-popup.svg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-popup.svg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-popup.svg 2018-03-21 07:59:29.000000000 +0000 @@ -9,16 +9,15 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="640" - height="420" - viewBox="0 0 639.99997 419.99999" + width="817.22076" + height="605.42444" + viewBox="0 0 766.14443 567.58541" id="svg2" version="1.1" - inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="qtquickcontrols2-control.svg" - inkscape:export-filename="/home/jpnurmi/Projects/qt-dev/qtquickcontrols2/src/imports/controls/doc/images/qtquickcontrols2-control.png" - inkscape:export-xdpi="192" - inkscape:export-ydpi="192"> + inkscape:version="0.92.1 r15371" + sodipodi:docname="qtquickcontrols2-popup.svg" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> - - - - - - - - - - - - @@ -251,13 +190,13 @@ orient="auto" refY="0" refX="0" - id="TriangleOutL-96" + id="TriangleOutL-4" style="overflow:visible" inkscape:isstock="true"> @@ -266,13 +205,13 @@ orient="auto" refY="0" refX="0" - id="TriangleInL-9-6-4" + id="TriangleInL-7-1" style="overflow:visible" inkscape:isstock="true"> @@ -281,13 +220,13 @@ orient="auto" refY="0" refX="0" - id="TriangleOutL-1-1-6" + id="TriangleOutL-4-3" style="overflow:visible" inkscape:isstock="true"> @@ -296,44 +235,14 @@ orient="auto" refY="0" refX="0" - id="TriangleInL-2-5-6" + id="TriangleInL-2-4" style="overflow:visible" inkscape:isstock="true"> - - - - - - @@ -371,13 +280,13 @@ orient="auto" refY="0" refX="0" - id="TriangleOutL-96-7" + id="TriangleOutL-4-3-5" style="overflow:visible" inkscape:isstock="true"> @@ -386,14 +295,14 @@ orient="auto" refY="0" refX="0" - id="TriangleInL-2-5-6-9-1" + id="TriangleInL-2-4-7" style="overflow:visible" inkscape:isstock="true"> @@ -419,21 +328,21 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8284271" - inkscape:cx="328.65009" - inkscape:cy="205.42326" + inkscape:zoom="1" + inkscape:cx="433.56809" + inkscape:cy="282.4206" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="3840" - inkscape:window-height="2031" - inkscape:window-x="0" - inkscape:window-y="55" + inkscape:window-width="1920" + inkscape:window-height="1137" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" + fit-margin-top="1" + fit-margin-left="1" + fit-margin-right="1" + fit-margin-bottom="1" units="px" /> @@ -451,262 +360,312 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(91.482322,-192.9581)"> + transform="translate(117.89629,-192.1482)"> - + width="564.20264" + height="365.80341" + x="-21.075951" + y="321.69159" /> Background  Background + width="432.17508" + height="243.95665" + x="44.027798" + y="384.97104" /> Content item Width - + style="font-size:37.45019655px;line-height:1.25;">Content item + + Available height + + + Height Available width + Width + + + + Height + Control Popup Bottompadding Bottom padding Toppadding Top padding Right padding Left padding - + style="font-size:17.5px;fill:#000000" />Left padding Top inset Left inset + style="font-size:59.99999619px;fill:#000000" />Window + + Bottom margin + + + Top margin + + + Right margin - Bottom inset + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path4179-7-5-2" + d="m -96.90814,305.30865 h 70.4038" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.93839908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#TriangleInL-2-4-7);marker-end:url(#TriangleOutL-9-3-6)" /> Right inset - - - + style="font-size:17.5px;fill:#000000" />Left margin Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/images/qtquickcontrols2-styles.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/images/qtquickcontrols2-styles.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/manifest-meta.qdocconf qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/manifest-meta.qdocconf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/manifest-meta.qdocconf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/manifest-meta.qdocconf 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -# Additional meta information (attributes for matched entries, as well as tags) -# to be added to manifest.xml files. -# -# manifestmeta.filters = ,,... -# -# manifestmeta..names = /,/,.. -# manifestmeta..attributes = ,,.. -# manifestmeta..tags = ,,.. -# -# .names specify all the module/name combinations to apply the -# attributes/tags to. You can use simple wildcard matching by appending -# '*' at the end of name. -# -# Note: You cannot use operators (+, =, -) in the names. -# -# Examples: add a 'isHighlighted' attribute for two 'Analog Clock' examples, -# add a 'database' tag for QtSql examples, and a 'qt5' tag for all examples -# -# manifestmeta.filters = highlighted sql global -# -# manifestmeta.highlighted.names = "QtGui/Analog Clock Window Example" \ -# "QtWidgets/Analog Clock Example" -# manifestmeta.highlighted.attributes = isHighlighted:true -# -# manifestmeta.sql.names = "QtSql/*" -# manifestmeta.sql.tags = database -# -# manifestmeta.global.names = * -# manifestmeta.global.tags = qt5 - -manifestmeta.highlighted.names = "QtQuickControls2/Qt Quick Controls 2 - Gallery" \ - "QtQuickControls2/Qt Quick Controls 2 - Wearable Demo" \ - "QtQuickControls2/Qt Quick Controls 2 - Text Editor" \ - "QtQuickControls2/Qt Quick Controls 2 - Contact List" \ - "QtQuickControls2/Qt Quick Controls 2 - Side Panel" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/qtquickcontrols2.qdocconf qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/qtquickcontrols2.qdocconf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/qtquickcontrols2.qdocconf 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/qtquickcontrols2.qdocconf 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,93 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) + +project = QtQuickControls2 +description = Qt Quick Controls 2 Reference Documentation +version = $QT_VERSION + +qhp.projects = QtQuickControls2 + +qhp.QtQuickControls2.file = qtquickcontrols2.qhp +qhp.QtQuickControls2.namespace = org.qt-project.qtquickcontrols2.$QT_VERSION_TAG +qhp.QtQuickControls2.virtualFolder = qtquickcontrols2 +qhp.QtQuickControls2.indexTitle = Qt Quick Controls 2 +qhp.QtQuickControls2.indexRoot = + +qhp.QtQuickControls2.filterAttributes = qtquickcontrols2 $QT_VERSION qtrefdoc +qhp.QtQuickControls2.customFilters.Qt.name = QtQuickControls2 $QT_VERSION +qhp.QtQuickControls2.customFilters.Qt.filterAttributes = qtquickcontrols2 $QT_VERSION + +qhp.QtQuickControls2.subprojects = qmltypes classes examples +qhp.QtQuickControls2.subprojects.qmltypes.title = QML Types +qhp.QtQuickControls2.subprojects.qmltypes.indexTitle = Qt Quick Controls 2 QML Types +qhp.QtQuickControls2.subprojects.qmltypes.selectors = qmlclass +qhp.QtQuickControls2.subprojects.qmltypes.sortPages = true +qhp.QtQuickControls2.subprojects.classes.title = C++ Classes +qhp.QtQuickControls2.subprojects.classes.indexTitle = Qt Quick Controls 2 C++ Classes +qhp.QtQuickControls2.subprojects.classes.selectors = class fake:headerfile +qhp.QtQuickControls2.subprojects.classes.sortPages = true +qhp.QtQuickControls2.subprojects.examples.title = Examples +qhp.QtQuickControls2.subprojects.examples.indexTitle = Qt Quick Controls 2 Examples +qhp.QtQuickControls2.subprojects.examples.selectors = fake:example + +depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquickextras qmake qtsql qtwidgets qtlabscalendar qtlabsplatform + +# Specify the install path under QT_INSTALL_EXAMPLES +# Note: paths passed to \example command must contain the parent directory, e.g. +# \example controls/tabs +exampledirs += ../../../../examples/quickcontrols2 \ + ../../../quicktemplates2 \ + snippets + +examplesinstallpath = quickcontrols2 + +headerdirs += ../../../quicktemplates2 \ + ../../../quickcontrols2 + +sourcedirs += ../../../quicktemplates2 \ + ../../../quickcontrols2 \ + ../../templates/doc/src \ + src + +imagedirs += images + +navigation.landingpage = "Qt Quick Controls 2" +navigation.qmltypespage = "Qt Quick Controls 2 QML Types" +navigation.cppclassespage = "Qt Quick Controls 2 C++ Classes" + +tagfile = qtquickcontrols2.tags + +# \styleimport {QtQuick.Controls.Universal 2.0} +macro.styleimport.HTML = "
Import Statement: import \1
Since: \2
" + +# \styleproperty {Universal.accent} {enumeration} {html-target-id} +# \target html-target-id +# This property holds ... +# (empty line) +# \endstyleproperty +macro.styleproperty.HTML = "

\1 : \2

" +macro.endstyleproperty = "\\br" + +# \stylemethod {returntype} {methodname} {argtype} {argname} {html-target-id} +# \target html-target-id +# This property holds ... +# (empty line) +# \endstylemethod +macro.stylemethod.HTML = "

\1 \2(\3 \4)

" +macro.endstylemethod = "\\br" + +# \stylemethod2 {returntype} {methodname} {arg1type} {arg1name} {arg2type} {arg2name} {html-target-id} +# \target html-target-id +# This method returns ... +# (empty line) +# \endstylemethod2 +macro.stylemethod2.HTML = "

\1 \2(\3 \4, \5 \6)

" +macro.endstylemethod2 = "\\br" + +# \stylecolor {#6A00FF} {(default)} +macro.stylecolor.HTML = "
\1 \2
" + +macro.nbsp.HTML = " " + +#Add output suffix to the html filenames +outputsuffixes = QML +outputsuffixes.QML = 2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/qtquickcontrols.qdocconf qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/qtquickcontrols.qdocconf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/qtquickcontrols.qdocconf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/qtquickcontrols.qdocconf 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) -include(manifest-meta.qdocconf) - -moduleheader = QtQuickControls2 - -project = QtQuickControls -description = Qt Quick Controls Reference Documentation -version = $QT_VERSION - -qhp.projects = QtQuickControls -moduleheader = QtQuickControls2 - -qhp.QtQuickControls.file = qtquickcontrols.qhp -qhp.QtQuickControls.namespace = org.qt-project.qtquickcontrols.$QT_VERSION_TAG -qhp.QtQuickControls.virtualFolder = qtquickcontrols -qhp.QtQuickControls.indexTitle = Qt Quick Controls -qhp.QtQuickControls.indexRoot = - -qhp.QtQuickControls.filterAttributes = qtquickcontrols $QT_VERSION qtrefdoc -qhp.QtQuickControls.customFilters.Qt.name = QtQuickControls $QT_VERSION -qhp.QtQuickControls.customFilters.Qt.filterAttributes = qtquickcontrols $QT_VERSION - -qhp.QtQuickControls.subprojects = qmltypes classes examples -qhp.QtQuickControls.subprojects.qmltypes.title = QML Types -qhp.QtQuickControls.subprojects.qmltypes.indexTitle = Qt Quick Controls QML Types -qhp.QtQuickControls.subprojects.qmltypes.selectors = qmlclass -qhp.QtQuickControls.subprojects.qmltypes.sortPages = true -qhp.QtQuickControls.subprojects.classes.title = C++ Classes -qhp.QtQuickControls.subprojects.classes.indexTitle = Qt Quick Controls C++ Classes -qhp.QtQuickControls.subprojects.classes.selectors = class fake:headerfile -qhp.QtQuickControls.subprojects.classes.sortPages = true -qhp.QtQuickControls.subprojects.examples.title = Examples -qhp.QtQuickControls.subprojects.examples.indexTitle = Qt Quick Controls Examples -qhp.QtQuickControls.subprojects.examples.selectors = fake:example - -depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols1 qtquickextras qmake qtsql qtwidgets qtlabscalendar qtlabsplatform qtgraphicaleffects - -# Specify the install path under QT_INSTALL_EXAMPLES -# Note: paths passed to \example command must contain the parent directory, e.g. -# \example controls/tabs -exampledirs += ../../../../examples/quickcontrols2 \ - ../../../quicktemplates2 \ - snippets - -examples.fileextensions += "*.conf" - -examplesinstallpath = quickcontrols2 - -headerdirs += ../../../quicktemplates2 \ - ../../../quickcontrols2 - -sourcedirs += ../../../quicktemplates2 \ - ../../../quickcontrols2 \ - ../../templates/doc/src \ - src - -# Exclude .qml files from the doc build to prevent conflicts with .qml files -# in style-specific directories; all types are documented in .cpp/.qdoc files -sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qdoc" - -imagedirs += images \ - .. - -navigation.landingpage = "Qt Quick Controls" -navigation.qmltypespage = "Qt Quick Controls QML Types" -navigation.cppclassespage = "Qt Quick Controls C++ Classes" - -tagfile = qtquickcontrols.tags - -# \styleimport {QtQuick.Controls.Universal 2.0} -macro.styleimport.HTML = "
Import Statement: import \1
Since: \2
" - -# \styleproperty {Universal.accent} {enumeration} {html-target-id} -# \target html-target-id -# This property holds ... -# (empty line) -# \endstyleproperty -macro.styleproperty.HTML = "

\1 : \2

" -macro.endstyleproperty = "\\br" - -# \stylemethod {returntype} {methodname} {argtype} {argname} {html-target-id} -# \target html-target-id -# This property holds ... -# (empty line) -# \endstylemethod -macro.stylemethod.HTML = "

\1 \2(\3 \4)

" -macro.endstylemethod = "\\br" - -# \stylemethod2 {returntype} {methodname} {arg1type} {arg1name} {arg2type} {arg2name} {html-target-id} -# \target html-target-id -# This method returns ... -# (empty line) -# \endstylemethod2 -macro.stylemethod2.HTML = "

\1 \2(\3 \4, \5 \6)

" -macro.endstylemethod2 = "\\br" - -# \stylecolor {#6A00FF} {(default)} -macro.stylecolor.HTML = "
\1 \2
" - -macro.nbsp.HTML = " " - -#Add output suffix to the html filenames -outputsuffixes = QML -outputsuffixes.QML = 2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -Item { - //! [action] - Action { - id: copyAction - text: qsTr("&Copy") - icon.name: "edit-copy" - shortcut: StandardKey.Copy - onTriggered: window.activeFocusItem.copy() - } - //! [action] - - //! [toolbutton] - ToolButton { - id: toolButton - action: copyAction - } - //! [toolbutton] - - //! [menuitem] - MenuItem { - id: menuItem - action: copyAction - text: qsTr("&Copy selected Text") - } - //! [menuitem] -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 BusyIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Button { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-disabled.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-disabled.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-disabled.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-disabled.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Button { + width: 80 + text: "Disabled" + enabled: false +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-focused.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-focused.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-focused.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-focused.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Button { + width: 80 + text: "Focused" + focus: true +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -Button { - icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" - display: Button.IconOnly -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-normal.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-normal.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-normal.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-normal.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Button { + width: 80 + text: "Normal" +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-pressed.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-pressed.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-pressed.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-pressed.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Button { + width: 80 + text: "Pressed" + down: true +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -Button { - text: "Button" - icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" - display: Button.TextBesideIcon -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -Button { - text: "Button" - display: Button.TextOnly -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-checked.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-checked.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-checked.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-checked.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +CheckBox { + text: "Checked" + checked: true +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 CheckBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-disabled.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-disabled.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-disabled.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-disabled.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +CheckBox { + text: "Disabled" + enabled: false +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-focused.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-focused.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-focused.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-focused.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +CheckBox { + text: "Focused" + focus: true +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -//! [1] -Column { - ButtonGroup { - id: childGroup - exclusive: false - checkState: parentBox.checkState - } - - CheckBox { - id: parentBox - text: qsTr("Parent") - checkState: childGroup.checkState - } - - CheckBox { - checked: true - text: qsTr("Child 1") - leftPadding: indicator.width - ButtonGroup.group: childGroup - } - - CheckBox { - text: qsTr("Child 2") - leftPadding: indicator.width - ButtonGroup.group: childGroup - } -} -//! [1] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-normal.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-normal.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-normal.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-normal.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,33 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +CheckBox { + text: "Normal" +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 CheckDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ComboBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-delegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-delegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-delegate.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-delegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Item { + id: root + width: combo.width + height: combo.height + combo.popup.contentItem.height + ComboBox { + id: combo + model: ["First", "Second", "Third"] + popup.contentItem.parent: root + popup.contentItem.y: combo.height + delegate: ItemDelegate { + width: combo.width + text: modelData + autoExclusive: true + checked: combo.currentIndex === index + Rectangle { + visible: index === 0 + anchors.fill: parent + color: 'transparent' + border.color: 'red' + } + } + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-popup.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-popup.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Item { + id: root + width: combo.width + height: combo.height + combo.popup.contentItem.height + ComboBox { + id: combo + model: ["First", "Second", "Third"] + popup.contentItem.parent: root + popup.contentItem.y: combo.height + } + Rectangle { + parent: combo.popup.contentItem + anchors.fill: parent + color: 'transparent' + border.color: 'red' + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 DelayButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Dial { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dial-handle.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dial-handle.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dial-handle.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dial-handle.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,41 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Dial { + id: dial + + Rectangle { + parent: dial.handle + anchors.fill: parent + color: 'transparent' + border.color: 'red' + antialiasing: true + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 //! [1] DialogButtonBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 //! [1] DialogButtonBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 Item { width: dialog.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 Item { width: dialog.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 Item { width: dialog.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Frame { background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.1 //! [1] Frame { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.1 //! [1] GroupBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,17 +26,17 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 GroupBox { id: control title: qsTr("GroupBox") background: Rectangle { - y: control.topPadding - control.bottomPadding + y: control.topPadding - control.padding width: parent.width - height: parent.height - control.topPadding + control.bottomPadding + height: parent.height - control.topPadding + control.padding color: "transparent" border.color: "#21be2b" radius: 2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-label.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-label.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,41 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +GroupBox { + width: 100 + height: 100 + title: "GroupBox" + Rectangle { + parent: label + anchors.fill: parent + color: 'transparent' + border.color: 'red' + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.1 //! [1] GroupBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ItemDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 //! [1] ListView { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Label { text: qsTr("Label") diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 //! [1] Label { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Material 2.0 Pane { padding: 4 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Material 2.0 Pane { padding: 4 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Material 2.0 Pane { contentWidth: 120 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Material 2.0 Pane { padding: 4 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Material 2.0 Pane { padding: 10 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,212 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 - -Pane { - implicitWidth: 400 - implicitHeight: 600 - padding: 10 - - readonly property color measurementColor: "darkorange" - readonly property int barLeftMargin: 10 - readonly property int textTopMargin: 12 - - Component { - id: measurementComponent - - Rectangle { - color: measurementColor - width: 1 - height: parent.height - - Rectangle { - width: 5 - height: 1 - color: measurementColor - anchors.horizontalCenter: parent.horizontalCenter - } - - Rectangle { - width: 5 - height: 1 - color: measurementColor - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - } - - Text { - x: 8 - text: parent.height - height: parent.height - color: measurementColor - verticalAlignment: Text.AlignVCenter - } - } - } - - ColumnLayout { - anchors.fill: parent - spacing: 20 - - ColumnLayout { - spacing: textTopMargin - - Button { - id: button - text: qsTr("Button") - - Loader { - sourceComponent: measurementComponent - height: parent.height - anchors.left: parent.right - anchors.leftMargin: barLeftMargin - } - - } - Text { - text: "Roboto " + button.font.pixelSize - color: measurementColor - } - } - - ColumnLayout { - spacing: textTopMargin - - ItemDelegate { - id: itemDelegate - text: qsTr("ItemDelegate") - - Loader { - sourceComponent: measurementComponent - height: parent.height - anchors.left: parent.right - anchors.leftMargin: barLeftMargin - } - - } - Text { - text: "Roboto " + itemDelegate.font.pixelSize - color: measurementColor - } - } - - ColumnLayout { - spacing: textTopMargin - - CheckDelegate { - id: checkDelegate - text: qsTr("CheckDelegate") - - Loader { - sourceComponent: measurementComponent - height: parent.height - anchors.left: parent.right - anchors.leftMargin: barLeftMargin - } - - } - Text { - text: "Roboto " + checkDelegate.font.pixelSize - color: measurementColor - } - } - - ColumnLayout { - spacing: textTopMargin - - RadioDelegate { - id: radioDelegate - text: qsTr("RadioDelegate") - - Loader { - sourceComponent: measurementComponent - height: parent.height - anchors.left: parent.right - anchors.leftMargin: barLeftMargin - } - - } - Text { - text: "Roboto " + radioDelegate.font.pixelSize - color: measurementColor - } - } - - ColumnLayout { - spacing: textTopMargin - - ComboBox { - id: comboBox - model: [ qsTr("ComboBox") ] - - Loader { - sourceComponent: measurementComponent - height: parent.height - anchors.left: parent.right - anchors.leftMargin: barLeftMargin - } - - } - Text { - text: "Roboto " + comboBox.font.pixelSize - color: measurementColor - } - } - - ColumnLayout { - spacing: textTopMargin - - Item { - implicitWidth: groupBox.implicitWidth - implicitHeight: groupBox.implicitHeight - - GroupBox { - id: groupBox - title: qsTr("GroupBox") - } - Loader { - sourceComponent: measurementComponent - height: parent.height - anchors.left: parent.right - anchors.leftMargin: barLeftMargin - } - } - Text { - text: "Roboto " + groupBox.font.pixelSize - color: measurementColor - } - } - - Item { - Layout.fillHeight: true - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - id: window - visible: true - width: menuBar.implicitWidth - height: menuBar.height - - Component.onCompleted: menuBar.itemAt(1).highlighted = true - - header: - -// Indent it like this so that the indenting in the generated doc is normal. -MenuBar { - id: menuBar - - Menu { title: qsTr("File") } - Menu { title: qsTr("Edit") } - Menu { title: qsTr("View") } - Menu { title: qsTr("Help") } - - delegate: MenuBarItem { - id: menuBarItem - - contentItem: Text { - text: menuBarItem.text - font: menuBarItem.font - opacity: enabled ? 1.0 : 0.3 - color: menuBarItem.highlighted ? "#ffffff" : "#21be2b" - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - } - - background: Rectangle { - implicitWidth: 40 - implicitHeight: 40 - opacity: enabled ? 1 : 0.3 - color: menuBarItem.highlighted ? "#21be2b" : "transparent" - } - } - - background: Rectangle { - implicitWidth: 40 - implicitHeight: 40 - color: "#ffffff" - - Rectangle { - color: "#21be2b" - width: parent.width - height: 1 - anchors.bottom: parent.bottom - } - } -} -} //! [eof] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -//! [begin] -ApplicationWindow { - id: window - width: 320 - height: 260 - visible: true - - //! [skipfrom] - Component.onCompleted: { - menuBar.itemAt(0).triggered() - menuBar.itemAt(0).menu.itemAt(2).highlighted = true - } - //! [skipto] - - menuBar: MenuBar { - Menu { - title: qsTr("&File") - Action { text: qsTr("&New...") } - Action { text: qsTr("&Open...") } - Action { text: qsTr("&Save") } - Action { text: qsTr("Save &As...") } - MenuSeparator { } - Action { text: qsTr("&Quit") } - } - Menu { - title: qsTr("&Edit") - Action { text: qsTr("Cu&t") } - Action { text: qsTr("&Copy") } - Action { text: qsTr("&Paste") } - } - Menu { - title: qsTr("&Help") - Action { text: qsTr("&About") } - } - } -} -//! [end] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,109 +25,36 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +//! [file] +import QtQuick 2.6 +import QtQuick.Controls 2.1 -ApplicationWindow { +Item { id: window - width: menu.width - height: menu.height + width: menu.contentItem.width + height: menu.contentItem.height visible: true - Component.onCompleted: menu.popup(menu.itemAt(1)) - // Indent it like this so that the indenting in the generated doc is normal. Menu { id: menu - - Action { text: qsTr("Tool Bar"); checkable: true } - Action { text: qsTr("Side Bar"); checkable: true; checked: true } - Action { text: qsTr("Status Bar"); checkable: true; checked: true } - - MenuSeparator { - contentItem: Rectangle { - implicitWidth: 200 - implicitHeight: 1 - color: "#21be2b" - } + contentItem.parent: window + background: Rectangle { + implicitWidth: 200 + implicitHeight: 200 + color: "#ffffff" + border.color: "#353637" } - Menu { - title: qsTr("Advanced") - // ... + MenuItem { + text: qsTr("New...") } - - topPadding: 2 - bottomPadding: 2 - - delegate: MenuItem { - id: menuItem - implicitWidth: 200 - implicitHeight: 40 - - arrow: Canvas { - x: parent.width - width - implicitWidth: 40 - implicitHeight: 40 - visible: menuItem.subMenu - onPaint: { - var ctx = getContext("2d") - ctx.fillStyle = menuItem.highlighted ? "#ffffff" : "#21be2b" - ctx.moveTo(15, 15) - ctx.lineTo(width - 15, height / 2) - ctx.lineTo(15, height - 15) - ctx.closePath() - ctx.fill() - } - } - - indicator: Item { - implicitWidth: 40 - implicitHeight: 40 - Rectangle { - width: 26 - height: 26 - anchors.centerIn: parent - visible: menuItem.checkable - border.color: "#21be2b" - radius: 3 - Rectangle { - width: 14 - height: 14 - anchors.centerIn: parent - visible: menuItem.checked - color: "#21be2b" - radius: 2 - } - } - } - - contentItem: Text { - leftPadding: menuItem.indicator.width - rightPadding: menuItem.arrow.width - text: menuItem.text - font: menuItem.font - opacity: enabled ? 1.0 : 0.3 - color: menuItem.highlighted ? "#ffffff" : "#21be2b" - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - } - - background: Rectangle { - implicitWidth: 200 - implicitHeight: 40 - opacity: enabled ? 1 : 0.3 - color: menuItem.highlighted ? "#21be2b" : "transparent" - } + MenuItem { + text: qsTr("Open...") } - - background: Rectangle { - implicitWidth: 200 - implicitHeight: 40 - color: "#ffffff" - border.color: "#21be2b" - radius: 2 + MenuItem { + text: qsTr("Save") } } -} //! [eof] +} +//! [file] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Item { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Item { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.2 - -Item { - id: root - width: 200 - height: 200 - - Binding { - target: popup - property: "visible" - value: root.Window.active - } -//! [1] -Popup { - id: popup - width: 400 - height: 400 - modal: true - visible: true - - Overlay.modal: Rectangle { - color: "#aacfdbe7" - } -} -//! [1] -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.2 - -Item { - id: root - width: 200 - height: 200 - - Binding { - target: popup - property: "visible" - value: root.Window.active - } -//! [1] -Popup { - id: popup - width: 400 - height: 400 - dim: true - visible: true - - Overlay.modeless: Rectangle { - color: "#aacfdbe7" - } -} -//! [1] -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 PageIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-delegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-delegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-delegate.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-delegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,40 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +PageIndicator { + count: 5 + currentIndex: 2 + Rectangle { + parent: contentItem.children[0] + anchors.fill: parent + color: 'transparent' + border.color: 'red' + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Pane { //! [1] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -24,8 +24,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 //! [1] PageIndicator { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Pane { background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.1 //! [1] Pane { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 import QtQuick.Window 2.2 Item { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -Item { -//! [centerIn] -ApplicationWindow { - id: window - // ... - - Pane { - // ... - - Popup { - anchors.centerIn: Overlay.overlay - } - } -} -//! [centerIn] -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ProgressBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 RadioButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 RadioDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 RangeSlider { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 //! [1] RoundButton { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 Item { width: 100 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.7 +import QtQuick.Controls 2.0 Item { width: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 //! [1] Flickable { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 Item { width: 100 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ScrollIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.7 +import QtQuick.Controls 2.0 Item { width: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Item { width: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 //! [file] ScrollView { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Item { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 //! [file] ScrollView { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Rectangle { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Slider { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-slider-handle.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-slider-handle.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-slider-handle.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-slider-handle.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Slider { + value: 0.5 + Rectangle { + anchors.fill: handle + color: "transparent" + border.color: "red" + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 SpinBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 //! [1] SpinBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-down.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-down.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-down.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-down.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +SpinBox { + value: 50 + Rectangle { + anchors.fill: down.indicator + color: "transparent" + border.color: "red" + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 //! [1] SpinBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 //! [1] SpinBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-up.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-up.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-up.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-up.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +SpinBox { + value: 50 + Rectangle { + anchors.fill: up.indicator + color: "transparent" + border.color: "red" + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 StackView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 //! [1] StackView { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 SwipeDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.8 +import QtQuick.Controls 2.1 //! [1] ListView { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 //! [1] SwipeDelegate { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 SwipeView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 Item { width: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switch-checked.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switch-checked.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switch-checked.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switch-checked.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Switch { + text: "Checked" + checked: true +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Switch { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 SwitchDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switch-disabled.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switch-disabled.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switch-disabled.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switch-disabled.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Switch { + text: "Disabled" + enabled: false +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switch-focused.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switch-focused.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switch-focused.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switch-focused.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Switch { + text: "Focused" + focus: true +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switch-normal.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switch-normal.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-switch-normal.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-switch-normal.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,33 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Switch { + text: "Normal" +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 TabBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 Item { width: 360 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 Item { width: 360 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.1 Column { width: 300 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 //! [1] TabBar { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 TextArea { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.2 Item { width: 100 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 TextField { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 TextField { width: 80 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 TextField { width: 80 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 TextField { width: 80 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.1 //! [file] ToolBar { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.1 Item { width: children[0].implicitWidth * 2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ToolButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.8 +import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 //! [file] ToolBar { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.8 +import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 //! [1] ToolBar { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Item { ToolTip { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 //! [1] Button { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.1 //! [1] Button { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.0 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Item { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.0 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Item { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Tumbler { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-delegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-delegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-delegate.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-delegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Controls 2.1 + +Tumbler { + id: tumbler + model: 5 + + Column { + Repeater { + model: 3 + + Rectangle { + width: tumbler.contentItem.width + height: tumbler.contentItem.height / 3 + color: 'transparent' + border.color: 'red' + } + } + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.8 +import QtQuick.Controls 2.1 //! [contentItem] Tumbler { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.8 +import QtQuick.Controls 2.1 //! [contentItem] Tumbler { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml 2018-03-21 07:59:29.000000000 +0000 @@ -26,9 +26,9 @@ ****************************************************************************/ //! [tumbler] -import QtQuick 2.12 +import QtQuick 2.8 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Rectangle { width: frame.implicitWidth + 10 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Universal 2.0 Pane { padding: 10 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Universal 2.0 Pane { padding: 10 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Universal 2.0 Pane { padding: 10 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml 2018-03-21 07:59:29.000000000 +0000 @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.0 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Universal 2.0 Pane { padding: 10 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickdial.qdocinc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickdial.qdocinc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickdial.qdocinc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickdial.qdocinc 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -//! [inputMode] -Dial supports three \l {inputMode}{input modes}: \c Dial.Circular, -\c Dial.Horizontal and \c Dial.Vertical. The circular input mode operates on an -absolute input system, where the position of the cursor within the dial -directly reflects its value. The horizontal and vertical input modes use a -relative input system, where changes in the cursor's position are "added" to -the value of the dial. - -The following image illustrates the directions in which the various input modes -track movement: - -\image qtquickcontrols2-dial-inputmode.png -//! [inputMode] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickicon.qdocinc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickicon.qdocinc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickicon.qdocinc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickicon.qdocinc 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -//! [grouped-properties] -\table -\header - \li Name - \li Description -\row - \li name - \li This property holds the name of the icon to use. - - The icon will be loaded from the platform theme. If the icon is found - in the theme, it will always be used; even if \l icon.source is also set. - If the icon is not found, \l icon.source will be used instead. - - For more information on theme icons, see \l {QIcon::fromTheme()}. -\row - \li source - \li This property holds the name of the icon to use. - - The icon will be loaded as a regular image. - - If \l icon.name is set and refers to a valid theme icon, it will always - be used instead of this property. -\row - \li width - \li This property holds the width of the icon. - - The icon's width will never exceed this value, though it will - shrink when necessary. -\row - \li height - \li This property holds the height of the icon. - - The icon's height will never exceed this value, though it will - shrink when necessary. -\row - \li color - \li This property holds the color of the icon. - - The icon is tinted with the specified color, unless the color is - set to \c "transparent". -\endtable -//! [grouped-properties] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -//! [conf] -\table - \header - \li Variable - \li Description - \row - \li \c Path - \li Specifies the \l {imagine-path-attached-prop}{path} to the directory that contains - the Imagine style assets. If not specified, the built-in assets are used. - - For example, to specify a path to a directory stored in the - \l {The Qt Resource System}{resource system}: - - \badcode - [Imagine] - Path=:/imagine-assets - \endcode - - To specify a relative path to a local directory: - - \badcode - [Imagine] - Path=imagine-assets - \endcode - - \note Due to a technical limitation, the path should not be named - \e "imagine" if it is relative to the \c qtquickcontrols2.conf file. -\endtable -//! [conf] - -//! [env] -\table - \header - \li Variable - \li Description - \row - \li \c QT_QUICK_CONTROLS_IMAGINE_PATH - \li Specifies the path to the directory that contains the Imagine style assets. - If not specified, the built-in assets are used. - - For example, to specify a path to a directory stored in the - \l {The Qt Resource System}{resource system}: - - \badcode - QT_QUICK_CONTROLS_IMAGINE_PATH=:/imagine-assets - \endcode - - To specify a relative path to a local directory: - - \badcode - QT_QUICK_CONTROLS_IMAGINE_PATH=imagine-assets - \endcode - - \note Due to a technical limitation, the path should not be named - \e "imagine" if it is relative to the \c qtquickcontrols2.conf file. -\endtable -//! [env] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickmaterialstyle.qdocinc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickmaterialstyle.qdocinc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickmaterialstyle.qdocinc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickmaterialstyle.qdocinc 2018-03-21 07:59:29.000000000 +0000 @@ -8,14 +8,6 @@ \li Specifies the default \l {material-theme-attached-prop}{Material theme}. The value can be one of the available themes, for example \c "Dark". \row - \li \c Variant - \li Specifies the Material variant. The Material Design has two - variants: a normal variant designed for touch devices, and a dense - variant for desktop. The dense variant uses smaller sizes for - controls and their fonts. - - The value can be \c "Normal" or \c "Dense". - \row \li \c Accent \li Specifies the default \l {material-accent-attached-prop}{Material accent color}. The value can be any \l {colorbasictypedocs}{color}, but it is recommended to use @@ -48,14 +40,6 @@ \li Specifies the default \l {material-theme-attached-prop}{Material theme}. The value can be one of the available themes, for example \c "Dark". \row - \li \c QT_QUICK_CONTROLS_MATERIAL_VARIANT - \li Specifies the Material variant. The Material Design has two - variants: a normal variant designed for touch devices, and a dense - variant for desktop. The dense variant uses smaller sizes for - controls and their fonts. - - The value can be \c "Normal" or \c "Dense". - \row \li \c QT_QUICK_CONTROLS_MATERIAL_ACCENT \li Specifies the default \l {material-accent-attached-prop}{Material accent color}. The value can be any \l {colorbasictypedocs}{color}, but it is recommended to use diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickoverlay-popup-parent.qdocinc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickoverlay-popup-parent.qdocinc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickoverlay-popup-parent.qdocinc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickoverlay-popup-parent.qdocinc 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -The following example uses the attached \l {Overlay::overlay}{Overlay.overlay} -property to position a popup in the center of the window, despite the position -of the button that opens the popup: - -\code -Button { - onClicked: popup.open() - - Popup { - id: popup - - parent: Overlay.overlay - - x: Math.round((parent.width - width) / 2) - y: Math.round((parent.height - height) / 2) - width: 100 - height: 100 - } -} -\endcode diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickstackview.qdocinc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickstackview.qdocinc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/includes/qquickstackview.qdocinc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/includes/qquickstackview.qdocinc 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -//! [pop-ownership] -Only items that StackView created itself (from a \l Component or \l [QML] -url) will be destroyed when popped. See \l {Item Ownership} for more -information. -//! [pop-ownership] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -27,9 +27,7 @@ /*! \page qtquickcontrols2-configuration.html - \keyword Qt Quick Controls Configuration File - \title Qt Quick Controls Configuration File - \keyword Qt Quick Controls 2 Configuration File + \title Qt Quick Controls 2 Configuration File Qt Quick Controls 2 support a special configuration file, \c :/qtquickcontrols2.conf, that is built into an application's resources. @@ -80,98 +78,20 @@ By default, the \l {Default Style}{Default} style is used. \endtable - \section1 Imagine Section - - The following table lists values that can be used to configure the - \l {Imagine style} in an \c Imagine section of the configuration file: - - \include qquickimaginestyle.qdocinc conf - \section1 Material Section - The following table lists values that can be used to configure the - \l {Material style} in a \c Material section of the configuration file: + The following \l {Material style} specific values can be specified in a \c Material + section of the configuration file: \include qquickmaterialstyle.qdocinc conf \section1 Universal Section - The following table lists values that can be used to configure the - \l {Universal style} in a \c Universal section of the configuration file: + The following \l {Universal style} specific values can be specified in a \c Universal + section of the configuration file: \include qquickuniversalstyle.qdocinc conf - \section1 Font Configuration - - The default \l {Control::font}{font} can be specified in a \c Font sub-group - in each style's section in the configuration file. The \c Font sub-group can - be defined in two alternative ways: - - \code - [Default] - Font\Family=Open Sans - Font\PixelSize=20 - - [Material\Font] - Family=Open Sans - PixelSize=20 - \endcode - - Supported font attributes: - \table - \header - \li Variable - \li Description - \row - \li \c Family - \li The \l {QFont::family}{font family}. - \row - \li \c PointSize - \li The \l {QFont::pointSizeF}{point size}. - \row - \li \c PixelSize - \li The \l {QFont::pixelSize}{pixel size}. - \row - \li \c StyleHint - \li The \l {QFont::styleHint}{style hint}. - Available values: \c SansSerif, \c Helvetica, \c Serif, \c Times, \c TypeWriter, \c Courier, - \c OldEnglish, \c Decorative, \c Monospace, \c Fantasy, \c Cursive. - \row - \li \c Weight - \li The \l {QFont::}{weight}. Qt uses a weighting scale from \c 0 to \c 99 similar to, - but not the same as, the scales used in Windows or CSS. A weight of \c 0 will be thin, - whilst \c 99 will be extremely black. - Available pre-defined weights: \c Thin (0), \c ExtraLight (12), \c Light (25), \c Normal (50), - \c Medium (57), \c DemiBold (63), \c Bold (75), \c ExtraBold (81), - \c Black (87). - \row - \li \c Style - \li The \l {QFont::}{style}. - Available values: \c StyleNormal, \c StyleItalic, \c StyleOblique. - \endtable - - \section1 Palette Configuration - - The default \l {Control::palette}{palette} can be specified in a \c Palette sub-group - in each style's section in the configuration file. The \c Palette sub-group can be - defined in two alternative ways: - - \code - [Fusion] - Palette\Window=#dedede - Palette\WindowText=#212121 - \endcode - - or: - \code - [Fusion\Palette] - Window=#dedede - WindowText=#212121 - \endcode - - See \l {qtquickcontrols2-palette}{palette QML Basic Type} for a full list of supported - attributes. - \section1 Using the Configuration File in a Project In order to make it possible for Qt Quick Controls 2 to find the configuration file, diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -27,12 +27,8 @@ /*! \module QtQuickControls2 - \keyword Qt Quick Controls C++ Classes - \title Qt Quick Controls C++ Classes - \keyword Qt Quick Controls 2 C++ Classes + \title Qt Quick Controls 2 C++ Classes \ingroup modules - \qtvariable quickcontrols2 - \brief Provides classes for setting up the controls from C++. The C++ types can be included into your application using the following diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -47,9 +47,9 @@ can override the \l {Control::}{background} item and set the radius property of Rectangle: - \qml \QtMinorVersion - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 + \qml + import QtQuick 2.6 + import QtQuick.Controls 2.1 ApplicationWindow { width: 400 @@ -91,8 +91,8 @@ module itself, we'll call the file \c MyButton.qml. To use the control in your application, refer to it by its filename: - \qml \QtMinorVersion - import QtQuick.Controls 2.\1 + \qml + import QtQuick.Controls 2.1 ApplicationWindow { MyButton { @@ -107,8 +107,8 @@ subfolder in your project named (for example) \c controls. To use the control, first import the folder into a namespace: - \qml \QtMinorVersion - import QtQuick.Controls 2.\1 + \qml + import QtQuick.Controls 2.1 import "controls" as MyControls ApplicationWindow { @@ -171,22 +171,6 @@ your custom style, and place them almost anywhere. It also allows users to create their own styles for your application. - \section3 Previewing Custom Styles in Qt Quick Designer - - Using the approach above, it is possible to preview a custom style - in \l {Using Qt Quick Designer}{Qt Quick Designer}. In order to do so, - ensure that the project has a - \l {Qt Quick Controls 2 Configuration File}{qtquickcontrols2.conf} file, - and that the following entry exists: - - \badcode - [Controls] - Style=MyStyle - \endcode - - For more information, take a look at the - \l {Qt Quick Controls 2 - Flat Style}{Flat Style example}. - \section2 Style-specific C++ Extensions Sometimes you may need to use C++ to extend your custom style. There are two @@ -328,9 +312,9 @@ Next, we add a drop shadow to the \l {Control::}{background} delegate of the Button: - \code \QtMinorVersion + \code // ... - import QtGraphicalEffects 1.\1 + import QtGraphicalEffects 1.0 import MyStyle 1.0 // ... @@ -359,9 +343,9 @@ To try out the attached property, we create a \l Row with two Buttons in \c main.qml: - \qml \QtMinorVersion - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 + \qml + import QtQuick 2.6 + import QtQuick.Controls 2.1 import MyStyle 1.0 @@ -416,9 +400,9 @@ to customize the \l {ApplicationWindow::overlay}{modal} and \l {ApplicationWindow::overlay}{modeless} items. - \code \QtMinorVersion - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 + \code + import QtQuick 2.7 + import QtQuick.Controls 2.0 ApplicationWindow { visible: true @@ -568,38 +552,41 @@ \section2 Customizing Menu - \list - \li \l Menu consists of a visual \l {Popup::background}{background} item. - \li \l MenuItem consists of four visual items: \l {Control::background}{background}, - \l {Control::contentItem}{content item}, \l {AbstractButton::}{indicator}, and - \l {MenuItem::}{arrow}. - \li \l MenuSeparator consists of a visual \l {Control::background}{background} and - \l {Control::contentItem}{content item}. - \endlist - - \image qtquickcontrols2-menu-custom.png + Menu consists of a \l {Popup::}{contentItem}. \quotefromfile qtquickcontrols2-menu-custom.qml - \skipto import QtQuick - \printuntil import QtQuick.Controls + \skipto import QtQuick 2.6 + \printuntil import QtQuick.Controls 2.1 \skipto Menu - \printto eof + \printto contentItem.parent: window + \skipline contentItem.parent: window + \printuntil text: qsTr("Save") + \printuntil } + \printuntil } - \section2 Customizing MenuBar + \section2 Customizing MenuItem - MenuBar can have a visual \l {Control::background}{background} item, - and MenuBarItem consists of two visual items: \l {Control::background} - {background} and \l {Control::contentItem}{content item}. + MenuItem can be customized in the same manner as + \l {Customizing Button}{Button}. - \image qtquickcontrols2-menubar-custom.png - \quotefromfile qtquickcontrols2-menubar-custom.qml - \skipto import QtQuick - \printuntil import QtQuick.Controls - \skipto MenuBar - \printto eof + \section2 Customizing MenuSeparator + + MenuSeparator consists of two visual items: \l {Control::background}{background} + and \l {Control::contentItem}{content item}. + \image qtquickcontrols2-menuseparator-custom.png + + \quotefromfile qtquickcontrols2-menuseparator-custom.qml + \skipto import QtQuick 2.6 + \printuntil import QtQuick.Controls 2.1 + \skipto Menu + \printto contentItem.parent: window + \skipline contentItem.parent: window + \printuntil text: qsTr("Exit") + \printuntil } + \printuntil } \section2 Customizing PageIndicator @@ -627,8 +614,8 @@ \image qtquickcontrols2-popup-custom.png \quotefromfile qtquickcontrols2-popup-custom.qml - \skipto import QtQuick 2.12 - \printuntil import QtQuick.Controls 2.12 + \skipto import QtQuick 2.6 + \printuntil import QtQuick.Controls 2.0 \codeline \skipto Popup \printuntil { @@ -853,8 +840,8 @@ and \l {Popup::contentItem}{content item}. \quotefromfile qtquickcontrols2-tooltip-custom.qml - \skipto import QtQuick - \printuntil import QtQuick.Controls + \skipto import QtQuick 2.6 + \printuntil import QtQuick.Controls 2.1 \skipto ToolTip \printuntil } \printuntil } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -27,16 +27,16 @@ /*! \page qtquickcontrols2-differences.html - \title Differences between Qt Quick Controls 1 + \title Differences between Qt Quick Controls - Qt Quick Controls 1 was originally developed to support desktop platforms, + Qt Quick Controls were originally developed to support desktop platforms, with mobile and embedded support coming shortly afterwards. They have a very broad scope, in that they provide a styling system flexible enough to allow the development of applications that have either a platform-dependent or platform-independent style. On embedded systems, where the hardware has limited resources, this approach - can be inefficient. Qt Quick Controls 2 was designed to solve this problem, + can be inefficient. Qt Quick Controls 2 were designed to solve this problem, using \l {https://blog.qt.io/blog/2015/03/31/qt-quick-controls-for-embedded/}{benchmarks} to guide the development. @@ -98,7 +98,7 @@ \table \header \li - \li Qt Quick Controls 1 + \li Qt Quick Controls \li Qt Quick Controls 2 \row \li Stylable delegates @@ -136,17 +136,17 @@ \li Performance may not be optimal \endlist - \section2 Porting Qt Quick Controls 1 Code + \section2 Porting Qt Quick Controls Code - The API of Qt Quick Controls 2 is very similar to Qt Quick Controls 1, but it + The API of Qt Quick Controls 2 is very similar to Qt Quick Controls, but it does come with some changes necessary to facilitate the improvements. The majority of changes are to do with styling; all of a control's delegates are now accessible in the control itself, instead of in a separate style object. - For example, to style a button in Qt Quick Controls 1: + For example, to style a button in Qt Quick Controls: - \qml + \badcode Button { style: ButtonStyle { label: Label { @@ -154,7 +154,7 @@ } } } - \endqml + \endcode To style a button in Qt Quick Controls 2: @@ -170,25 +170,25 @@ With this in mind, a good way to prepare for a migration to Qt Quick Controls 2 is to place each control that you have a custom style for in its - own QML file. For example, the Qt Quick Controls 1 button above could be + own QML file. For example, the Qt Quick Controls button above could be moved to a file named \c Button.qml in a directory named \c controls, and used in the following manner: - \qml + \badcode import "controls" as Controls Controls.Button { - // ... + ... } - \endqml + \endcode This works with both modules, and will reduce the amount of work needed when the migration begins. \section2 Type Comparison Table - The first column lists all types available in \l {Qt Quick Controls 1}, - \l {Qt Quick Dialogs}, and \l {Qt Quick Extras}. + The first column lists all types available in \l {Qt Quick Controls} + {Qt Quick Controls 1}, \l {Qt Quick Dialogs}, and \l {Qt Quick Extras}. The second column documents the respective type in Qt Quick Controls 2. When a direct alternative is not available, the third column contains an alternative that provides related functionality. The last column @@ -202,27 +202,33 @@ \li Alternatives \li Remarks \row - \li \l [QML QtQuickControls1] {Action} - \li \l [QML QtQuickControls2] {Action} + \li \l [QML QtQuickControls] {Action} + \li \mdash \li \l [QML QtQuick] {Shortcut} \br\sup {(Qt Quick)} - \li + \li \list + \li \b {Qt Quick Controls 1}: \c Action is an abstract user interface + action that is bound to buttons and menu items, and can provide + shortcuts. + \li \b {Qt Quick}: \c Shortcut provides the shortcut functionality that + was previously only provided by \c Action. + \endlist \row - \li \l [QML QtQuickControls1] {ApplicationWindow} + \li \l [QML QtQuickControls] {ApplicationWindow} \li \l [QML QtQuickControls2] {ApplicationWindow} \li \li \row - \li \l [QML QtQuickControls1] {BusyIndicator} + \li \l [QML QtQuickControls] {BusyIndicator} \li \l [QML QtQuickControls2] {BusyIndicator} \li \li \row - \li \l [QML QtQuickControls1] {Button} + \li \l [QML QtQuickControls] {Button} \li \l [QML QtQuickControls2] {Button} \li \li \row - \li \l [QML QtQuickControls1] {Calendar} + \li \l [QML QtQuickControls] {Calendar} \li \mdash \li \l [QML QtLabsCalendar] {MonthGrid},\br \l [QML QtLabsCalendar] {DayOfWeekRow},\br @@ -232,35 +238,34 @@ are \e experimental unstyled building blocks for calendar views. \endlist \row - \li \l [QML QtQuickControls1] {CheckBox} + \li \l [QML QtQuickControls] {CheckBox} \li \l [QML QtQuickControls2] {CheckBox} \li \li \row - \li \l [QML QtQuickControls1] {ComboBox} + \li \l [QML QtQuickControls] {ComboBox} \li \l [QML QtQuickControls2] {ComboBox} \li \li \row - \li \l [QML QtQuickControls1] {ExclusiveGroup} + \li \l [QML QtQuickControls] {ExclusiveGroup} \li \mdash - \li \l [QML QtQuickControls2] {ActionGroup},\br - \l [QML QtQuickControls2] {ButtonGroup} \br\sup {(Qt Quick Controls 2)} + \li \l [QML QtQuickControls2] {ButtonGroup} \br\sup {(Qt Quick Controls 2)} \li \list - \li \b {Qt Quick Controls 2}: \c ActionGroup and \c ButtonGroup offer similar functionality. + \li \b {Qt Quick Controls 2}: \c ButtonGroup offers similar functionality. \endlist \row - \li \l [QML QtQuickControls1] {GroupBox} + \li \l [QML QtQuickControls] {GroupBox} \li \l [QML QtQuickControls2] {GroupBox} \li \li \row - \li \l [QML QtQuickControls1] {Label} + \li \l [QML QtQuickControls] {Label} \li \l [QML QtQuickControls2] {Label} \li \li \row - \li \l [QML QtQuickControls1] {Menu} + \li \l [QML QtQuickControls] {Menu} \li \l [QML QtQuickControls2] {Menu} \li \l [QML QtLabsPlatform] {Menu} \br\sup {(Qt Labs Platform)} \li \list @@ -281,22 +286,20 @@ is not available in the Qt Platform Abstraction Layer. \endlist \row - \li \l [QML QtQuickControls1] {MenuBar} - \li \l [QML QtQuickControls2] {MenuBar} + \li \l [QML QtQuickControls] {MenuBar} + \li \mdash \li \l [QML QtLabsPlatform] {MenuBar} \br\sup {(Qt Labs Platform)} \li \list \li \b {Qt Quick Controls 1}: \c MenuBar is native on platforms where an implementation is available in the Qt Platform Abstraction Layer. Other platforms use a QML-based menubar item stacked at the top of the window. - \li \b {Qt Quick Controls 2}: \c MenuBar is a non-native QML-based menubar - that can be fully customized using QML and Qt Quick. \li \b {Qt Labs Platform}: \c MenuBar is an \e experimental native menubar. It is only available on platforms where a native implementation is available in the Qt Platform Abstraction Layer. \endlist \row - \li \l [QML QtQuickControls1] {MenuItem},\br - \l [QML QtQuickControls1] {MenuSeparator} + \li \l [QML QtQuickControls] {MenuItem},\br + \l [QML QtQuickControls] {MenuSeparator} \li \l [QML QtQuickControls2] {MenuItem},\br \l [QML QtQuickControls2] {MenuSeparator} \li \l [QML QtLabsPlatform] {MenuItem},\br @@ -312,39 +315,39 @@ native menu items and separators. \endlist \row - \li \l [QML QtQuickControls1] {ProgressBar} + \li \l [QML QtQuickControls] {ProgressBar} \li \l [QML QtQuickControls2] {ProgressBar} \li \li \row - \li \l [QML QtQuickControls1] {RadioButton} + \li \l [QML QtQuickControls] {RadioButton} \li \l [QML QtQuickControls2] {RadioButton} \li \li \row - \li \l [QML QtQuickControls1] {ScrollView} + \li \l [QML QtQuickControls] {ScrollView} \li \l [QML QtQuickControls2] {ScrollView} \li \li \row - \li \l [QML QtQuickControls1] {Slider} + \li \l [QML QtQuickControls] {Slider} \li \l [QML QtQuickControls2] {Slider} \li \li \row - \li \l [QML QtQuickControls1] {SpinBox} + \li \l [QML QtQuickControls] {SpinBox} \li \l [QML QtQuickControls2] {SpinBox} \li \li \row - \li \l [QML QtQuickControls1] {SplitView} + \li \l [QML QtQuickControls] {SplitView} \li \mdash \li \li \row - \li \l [QML QtQuickControls1] {StackView},\br - \l [QML QtQuickControls1] {StackViewDelegate},\br - \l [QML QtQuickControls1] {Stack} + \li \l [QML QtQuickControls] {StackView},\br + \l [QML QtQuickControls] {StackViewDelegate},\br + \l [QML QtQuickControls] {Stack} \li \l [QML QtQuickControls2] {StackView} \li \li \list @@ -352,7 +355,7 @@ and attached properties via a single \c StackView type. \endlist \row - \li \l [QML QtQuickControls1] {StatusBar} + \li \l [QML QtQuickControls] {StatusBar} \li \mdash \li \l [QML QtQuickControls2] {ToolBar} \br\sup {(Qt Quick Controls 2)} \li \list @@ -360,13 +363,13 @@ item or control, such as \c ToolBar, as a header or footer. \endlist \row - \li \l [QML QtQuickControls1] {Switch} + \li \l [QML QtQuickControls] {Switch} \li \l [QML QtQuickControls2] {Switch} \li \li \row - \li \l [QML QtQuickControls1] {TabView},\br - \l [QML QtQuickControls1] {Tab} + \li \l [QML QtQuickControls] {TabView},\br + \l [QML QtQuickControls] {Tab} \li \mdash \li \l [QML QtQuickControls2] {TabBar},\br \l [QML QtQuickControls2] {TabButton} \br\sup {(Qt Quick Controls 2)} @@ -375,12 +378,12 @@ functionality, and can be used to build tabbed views. \endlist \row - \li \l [QML QtQuickControls1] {TableView} + \li \l [QML QtQuickControls] {TableView} \li \mdash \li \li \row - \li \l [QML QtQuickControls1] {TextArea} + \li \l [QML QtQuickControls] {TextArea} \li \l [QML QtQuickControls2] {TextArea} \li \li \list @@ -392,22 +395,22 @@ scrollable areas, which can be problematic and cause usability issues. \endlist \row - \li \l [QML QtQuickControls1] {TextField} + \li \l [QML QtQuickControls] {TextField} \li \l [QML QtQuickControls2] {TextField} \li \li \row - \li \l [QML QtQuickControls1] {ToolBar} + \li \l [QML QtQuickControls] {ToolBar} \li \l [QML QtQuickControls2] {ToolBar} \li \li \row - \li \l [QML QtQuickControls1] {ToolButton} + \li \l [QML QtQuickControls] {ToolButton} \li \l [QML QtQuickControls2] {ToolButton} \li \li \row - \li \l [QML QtQuickControls1] {TreeView} + \li \l [QML QtQuickControls] {TreeView} \li \mdash \li \li @@ -518,15 +521,8 @@ \li \row \li \mdash - \li \l [QML QtQuickControls2] {ActionGroup} - \li \l [QML QtQuickControls1] {ExclusiveGroup} \br\sup {(Qt Quick Controls 1)} - \li \list - \li \b {Qt Quick Controls 1}: \c ExclusiveGroup offers similar functionality. - \endlist - \row - \li \mdash \li \l [QML QtQuickControls2] {ButtonGroup} - \li \l [QML QtQuickControls1] {ExclusiveGroup} \br\sup {(Qt Quick Controls 1)} + \li \l [QML QtQuickControls] {ExclusiveGroup} \br\sup {(Qt Quick Controls 1)} \li \list \li \b {Qt Quick Controls 1}: \c ExclusiveGroup offers similar functionality. \endlist @@ -599,7 +595,7 @@ \li \mdash \li \l [QML QtQuickControls2] {ScrollBar},\br \l [QML QtQuickControls2] {ScrollIndicator} - \li \l [QML QtQuickControls1] {ScrollView} \br\sup {(Qt Quick Controls 1)} + \li \l [QML QtQuickControls] {ScrollView} \br\sup {(Qt Quick Controls 1)} \li \list \li \b {Qt Quick Controls 1}: \c ScrollView offers similar functionality. It combines horizontal and vertical scrollbars, and the background and @@ -644,7 +640,7 @@ \li \mdash \li \l [QML QtQuickControls2] {TabBar},\br \l [QML QtQuickControls2] {TabButton} - \li \l [QML QtQuickControls1] {TabView} \br\sup {(Qt Quick Controls 1)} + \li \l [QML QtQuickControls] {TabView} \br\sup {(Qt Quick Controls 1)} \li \list \li \b {Qt Quick Controls 1}: \c TabView offers similar functionality. It combines the tab bar, background and frame around the tabs. @@ -670,7 +666,7 @@ \list \li \l{Qt Quick} \li \l{Qt Quick Controls 2 QML Types} - \li \l{Qt Quick Controls 1 QML Types} + \li \l{Qt Quick Controls QML Types} \li \l{Qt Quick Extras QML Types} \li \l{Qt Labs Calendar QML Types} \li \l{Qt Labs Platform QML Types} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-environment.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-environment.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-environment.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-environment.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -63,10 +63,6 @@ The value can be set to \c 0 or \c 1 to disable or enable hover effects, respectively. \endtable - \l {Imagine style} specific environment variables: - - \include qquickimaginestyle.qdocinc env - \l {Material style} specific environment variables: \include qquickmaterialstyle.qdocinc env diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -28,9 +28,7 @@ /*! \group qtquickcontrols2-examples \ingroup all-examples - \keyword Qt Quick Controls Examples - \title Qt Quick Controls Examples - \keyword Qt Quick Controls 2 Examples + \title Qt Quick Controls 2 Examples \brief A collection of examples for \l {Qt Quick Controls 2} These examples demonstrate creating user interfaces using \l {Qt Quick Controls 2}. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -59,10 +59,10 @@ \c material selector will be present and the \c +material/CustomButton.qml version will be used instead. - \code \QtMinorVersion + \code // main.qml - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 + import QtQuick 2.6 + import QtQuick.Controls 2.1 ApplicationWindow { id: window @@ -78,10 +78,10 @@ The base implementation of the custom button is a simple rounded flat button. - \code \QtMinorVersion + \code // CustomButton.qml - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 + import QtQuick 2.6 + import QtQuick.Controls 2.1 Button { id: control @@ -99,12 +99,12 @@ Material style, requests a dark theme to get light text, and creates a drop shadow for the background. - \code \QtMinorVersion + \code // +material/CustomButton.qml - import QtQuick 2.\1 - import QtGraphicalEffects 1.\1 - import QtQuick.Controls 2.\1 - import QtQuick.Controls.Material 2.\1 + import QtQuick 2.6 + import QtGraphicalEffects 1.0 + import QtQuick.Controls 2.1 + import QtQuick.Controls.Material 2.1 Button { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qtquickcontrols2-focus.html - \title Focus Management in Qt Quick Controls 2 - \brief Overview of focus handling with Qt Quick Controls 2 - - Qt Quick Controls 2 follows the standard - \l {Keyboard Focus in Qt Quick}{Qt Quick focus system}, while also - providing some added convenience. For example, the - \l {Control::}{focusPolicy} property can be used to control the ways in - which a control receives focus. - - \section1 Focus Scope Controls - - Qt Quick Controls 2 offers a selection of controls that act as - \l {Acquiring Focus and Focus Scopes}{focus scopes}: - - \annotatedlist qtquickcontrols2-focusscopes - - \sa {Keyboard Focus in Qt Quick} -*/ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qtquickcontrols2-fusion.html - \title Fusion Style - - The Fusion style is a desktop-oriented style. - - The Fusion style is a platform-agnostic style that offers a desktop-oriented - look'n'feel. It implements the same design language as the \l {Qt Widget Gallery} - {Fusion style for Qt Widgets}. - - \image qtquickcontrols2-fusion.png - - To run an application with the Fusion style, see - \l {Using Styles in Qt Quick Controls 2}. - - \note The Fusion style is not a native desktop style. The style runs on any - platform, and looks similar everywhere. Minor differences may occur due to - differences in the standard system palettes, available fonts, and font - rendering engines. - - \section2 Customization - - The Fusion style uses the standard system \l {Control::palette}{palettes} - to provide colors that match the desktop environment. - - \image qtquickcontrols2-fusion-palettes.png - - Custom palettes can be specified for any \l {Control::palette}{control}, - \l {Popup::palette}{popup}, or \l {ApplicationWindow::palette}{application window}. - Explicit palette attributes are automatically propagated from parent to children, - overriding any system defaults for that attribute. In the following example, - the window and all three switches appear with a violet highlight color: - - \table - \row - \li - \qml - import QtQuick 2.12 - import QtQuick.Controls 2.12 - - ApplicationWindow { - visible: true - - palette.highlight: "violet" - - Column { - anchors.centerIn: parent - - Switch { text: qsTr("First"); checked: true } - Switch { text: qsTr("Second"); checked: true } - Switch { text: qsTr("Third") } - } - } - \endqml - \li - \image qtquickcontrols2-fusion-violet.png - \endtable - - \b {See also} \l {Default Style}, \l {Material Style}, \l {Universal Style} - - \section1 Related Information - - \list - \li \l{Styling Qt Quick Controls 2} - \endlist -*/ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -31,9 +31,9 @@ A basic example of a QML file that makes use of controls is shown here: - \qml \QtMinorVersion - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 + \qml + import QtQuick 2.6 + import QtQuick.Controls 2.1 ApplicationWindow { title: "My Application" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -27,9 +27,7 @@ /*! \page qtquickcontrols2-guidelines.html - \keyword Qt Quick Controls Guidelines - \title Qt Quick Controls Guidelines - \keyword Qt Quick Controls 2 Guidelines + \title Qt Quick Controls 2 Guidelines Qt Quick Controls 2 offers a selection of controls that can be used to build complete interfaces in Qt Quick. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc 1970-01-01 00:00:00.000000000 +0000 @@ -1,169 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qtquickcontrols2-icons.html - \title Icons in Qt Quick Controls 2 - - Qt Quick Controls 2.3 (Qt 5.10) introduced built-in support for icons. Buttons, - item delegates, and menu items are now capable of presenting an icon in addition - to a text label. - - \section1 Using Icons - - \l {AbstractButton::icon}{AbstractButton} and \l {Action::icon}{Action} provide - the following properties through which icons can be set: - \list - \li \c icon.name - \li \c icon.source - \li \c icon.width - \li \c icon.height - \li \c icon.color - \endlist - - Theme icons are referenced by a name, and regular icons by a source URL. Both - \c icon.name and \c icon.source can be set to ensure that an icon will always - be found. If the icon is found in the theme, it will always be used; even if - \c icon.source is also set. If the icon is not found in the theme, \c icon.source - will be used instead. - - \code - Button { - icon.name: "edit-cut" - icon.source: "images/cut.png" - } - \endcode - - Each \l {Styling Qt Quick Controls 2}{Qt Quick Controls 2 style} requests a - default icon size and color according to their guidelines, but it is possible - to override these by setting the \c icon.width, \c icon.height, and \c icon.color - properties. - - The image that is loaded by an icon whose \c width and \c height are not set - depends on the type of icon in use. For theme icons, the closest available size - will be chosen. For regular icons, the behavior is the same as the \l {Image::} - {sourceSize} property of \l Image. - - The icon color is specified by default so that it matches the text color in - different states. In order to use an icon with the original colors, set the - color to \c "transparent". - - \code - Button { - icon.color: "transparent" - icon.source: "images/logo.png" - } - \endcode - - For buttons, the \l {AbstractButton::}{display} property can be used to control - how the icon and text are displayed within the button. - - \section1 Icon Themes - - Compliant icon themes must follow the freedesktop icon theme specification, - which can be obtained here: \l {http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html}. - - Traditionally, only Linux and UNIX support icon themes on the platform level, - but it is possible to bundle a compliant icon theme in an application to use - themed icons on any platform. - - The default \l {QIcon::themeSearchPaths()}{icon theme search paths} depend on - the platform. On Linux and UNIX, the search path will use the \c XDG_DATA_DIRS - environment variable if available. All platforms have the resource directory - \c :/icons as a fallback. Custom icon theme search paths can be set with - \l QIcon::setThemeSearchPaths(). - - The following example bundles an icon theme called \e mytheme into the application's - resources using \l {The Qt Resource System}{Qt's resource system}. - - \badcode - - - icons/mytheme/index.theme - icons/mytheme/32x32/myicon.png - icons/mytheme/32x32@2/myicon.png - - - \endcode - - The \c index.theme file describes the general attributes of the icon theme, and - lists the available theme icon directories: - - \badcode - [Icon Theme] - Name=mytheme - Comment=My Icon Theme - - Directories=32x32,32x32@2 - - [32x32] - Size=32 - Type=Fixed - - [32x32@2] - Size=32 - Scale=2 - Type=Fixed - \endcode - - In order to use the bundled icon theme, an application should call \l QIcon::setThemeName() - before loading the main QML file: - - \code - #include - #include - #include - - int main(int argc, char *argv[]) - { - QGuiApplication app(argc, argv); - - QIcon::setThemeName("mytheme"); // <-- - - QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); - return app.exec(); - } - \endcode - - Now it is possible to use named icons from the bundled icon theme without having - to specify any fallback source: - - \code - Button { - icon.name: "myicon" - } - \endcode - - The \l {Qt Quick Controls 2 - Gallery}{Gallery example} and \l {Qt Quick Controls 2 - Wearable Demo} - {Wearable Demo} provide complete runnable applications with a bundled icon theme. - - \section1 Related Information - \list - \li \l {High-DPI Support in Qt Quick Controls 2} - \endlist -*/ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc 1970-01-01 00:00:00.000000000 +0000 @@ -1,2529 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qtquickcontrols2-imagine.html - \title Imagine Style - - The Imagine Style is based on configurable image assets. \l{detailed-desc-imagine}{More...} - - \styleimport {QtQuick.Controls.Imagine 2.12} {Qt 5.10} - - \section1 Attached Properties - - \list - \li \l {imagine-path-attached-prop}{\b path} : string - \endlist - - \section1 Detailed Description - \target detailed-desc-imagine - - The Imagine style is based on image assets. The style comes with a default - set of images, but the images can be easily changed by providing a directory - with images using a predefined naming convention. - - \image qtquickcontrols2-imagine.png - \caption The Imagine style with the default images - - To run an application with the Imagine style, see - \l {Using Styles in Qt Quick Controls 2}. - - \section2 File Names - - The image files are named using the following convention: - - \c -- - - The \c and \c sections are mandatory, but the - \c section is optional. For example, if a single file named - \c "button-background.9.png" is provided for \l {Button}, it will be used - for every state that \c Button supports. It is up to the developer to - decide the set of states that they will provide images for. However, it - is recommended to provide images for the most common control states where - possible, such as \c disabled, \c pressed, etc. This will ensure that - interactive controls visually behave as the end user would expect them to. - - \section2 Element Reference - - The following table lists which elements are supported for each control, - along with the possible states for that element, and the file extension - that it expects. An element is an image that represents a certain visual - part of the control. For example, \c {Button}'s \c "background" element - represents its \l {Control::}{background}. - - \table - \header - \li Control - \li Element - \li States - \li Extension - \row - \li \l ApplicationWindow - \li background - \li active - \li .9.png (or .png) - \row - \li - \li overlay - \li modal - \li .9.png (or .png) - \row - \li \l BusyIndicator - \li animation - \li disabled, running, mirrored, hovered - \li .webp - \row - \li - \li background - \li same as above - \li .webp - \row - \li \l Button - \li background - \li disabled, pressed, checked, checkable, focused, highlighted, flat, mirrored, hovered - \li .9.png - \row - \li \l CheckBox - \li background - \li disabled, pressed, checked, partially-checked, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li indicator - \li same as above - \li .png - \row - \li \l CheckDelegate - \li background - \li disabled, pressed, checked, partially-checked, focused, highlighted, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li indicator - \li same as above - \li .png - \row - \li \l ComboBox - \li background - \li disabled, pressed, editable, open, focused, mirrored, hovered, flat - \li .9.png (or .png) - \row - \li - \li indicator - \li same as above - \li .png - \row - \li - \li popup - \li same as above - \li .9.png (or .png) - \row - \li \l DelayButton - \li background - \li disabled, pressed, checked, checkable, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li progress - \li same as above - \li .9.png (or .png) - \row - \li - \li mask - \li same as above - \li .9.png (or .png) - \row - \li \l Dial - \li background - \li disabled, pressed, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li handle - \li same as above - \li .9.png (or .png) - \row - \li \l Dialog - \li background - \li modal, dim - \li .9.png (or .png) - \row - \li - \li title - \li same as above - \li .9.png (or .png) - \row - \li - \li overlay - \li modal - \li .9.png (or .png) - \row - \li \l DialogButtonBox - \li background - \li disabled, mirrored - \li .9.png (or .png) - \row - \li \l Drawer - \li background - \li modal, dim, top, left, right, bottom - \li .9.png (or .png) - \row - \li - \li overlay - \li modal - \li .9.png (or .png) - \row - \li \l Frame - \li background - \li disabled, mirrored - \li .9.png (or .png) - \row - \li \l GroupBox - \li background - \li disabled, mirrored - \li .9.png (or .png) - \row - \li - \li title - \li same as above - \li .9.png (or .png) - \row - \li \l ItemDelegate - \li background - \li disabled, pressed, focused, highlighted, mirrored, hovered - \li .9.png (or .png) - \row - \li \l Label - \li background - \li disabled, mirrored, hovered - \li .9.png (or .png) - \row - \li \l Menu - \li background - \li modal, dim - \li .9.png (or .png) - \row - \li - \li overlay - \li modal - \li .9.png (or .png) - \row - \li \l MenuItem - \li arrow - \li disabled, pressed, checked, focused, highlighted, mirrored, hovered - \li .png - \row - \li - \li background - \li same as above - \li .9.png (or .png) - \row - \li - \li indicator - \li same as above - \li .png - \row - \li \l MenuSeparator - \li background - \li disabled, mirrored - \li .9.png (or .png) - \row - \li - \li separator - \li same as above - \li .9.png (or .png) - \row - \li \l Page - \li background - \li disabled, mirrored - \li .9.png (or .png) - \row - \li \l PageIndicator - \li background - \li disabled, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li delegate - \li disabled, pressed, current, mirrored, hovered - \li .png - \row - \li \l Pane - \li background - \li disabled, mirrored - \li .9.png (or .png) - \row - \li \l Popup - \li background - \li modal, dim - \li .9.png (or .png) - \row - \li - \li overlay - \li modal - \li .9.png (or .png) - \row - \li \l ProgressBar - \li animation - \li disabled, mirrored, hovered - \li .png - \row - \li - \li background - \li disabled, indeterminate, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li mask - \li same as above - \li .9.png (or .png) - \row - \li - \li progress - \li same as above - \li .9.png (or .png) - \row - \li \l RadioButton - \li background - \li disabled, pressed, checked, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li indicator - \li same as above - \li .png - \row - \li \l RadioDelegate - \li background - \li disabled, pressed, checked, focused, highlighted, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li indicator - \li same as above - \li .png - \row - \li \l RangeSlider - \li background - \li vertical, horizontal, disabled, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li \l RangeSlider - \li progress - \li same as above - \li .9.png (or .png) - \row - \li - \li handle - \li first, second, vertical, horizontal, disabled, pressed, focused, mirrored, hovered - \li .png - \row - \li \l RoundButton - \li background - \li disabled, pressed, checked, checkable, focused, highlighted, flat, mirrored, hovered - \li .9.png (or .png) - \row - \li \l ScrollBar - \li background - \li vertical, horizontal, disabled, interactive, pressed, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li handle - \li same as above - \li .9.png (or .png) - \row - \li \l ScrollIndicator - \li background - \li vertical, horizontal, disabled, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li handle - \li same as above - \li .9.png (or .png) - \row - \li \l ScrollView - \li background - \li disabled, mirrored - \li .9.png (or .png) - \row - \li \l Slider - \li background - \li vertical, horizontal, disabled, pressed, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li handle - \li same as above - \li .9.png (or .png) - \row - \li - \li progress - \li same as above - \li .9.png (or .png) - \row - \li \l SpinBox - \li background - \li disabled, editable, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li editor - \li disabled, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li indicator - \li up, down, disabled, editable, pressed, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li \l StackView - \li background - \li disabled, mirrored - \li .9.png (or .png) - \row - \li \l SwipeDelegate - \li background - \li disabled, pressed, focused, highlighted, mirrored, hovered - \li .9.png (or .png) - \row - \li \l SwipeView - \li background - \li vertical, horizontal, disabled, interactive, focused, mirrored - \li .9.png (or .png) - \row - \li \l Switch - \li background - \li disabled, pressed, checked, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li handle - \li same as above - \li .9.png (or .png) - \row - \li - \li indicator - \li same as above - \li .9.png (or .png) - \row - \li \l SwitchDelegate - \li background - \li disabled, pressed, checked, focused, highlighted, mirrored, hovered - \li .9.png (or .png) - \row - \li - \li handle - \li same as above - \li .9.png (or .png) - \row - \li - \li indicator - \li same as above - \li .9.png (or .png) - \row - \li \l TabBar - \li background - \li disabled, header, footer, mirrored - \li .9.png (or .png) - \row - \li \l TabButton - \li background - \li disabled, pressed, checked, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li \l TextArea - \li background - \li disabled, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li \l TextField - \li background - \li disabled, focused, mirrored, hovered - \li .9.png (or .png) - \row - \li \l ToolBar - \li background - \li disabled, header, footer, mirrored - \li .9.png (or .png) - \row - \li \l ToolButton - \li background - \li disabled, pressed, checked, checkable, focused, highlighted, flat, mirrored, hovered - \li .9.png (or .png) - \row - \li \l ToolSeparator - \li background - \li vertical, horizontal, disabled, mirrored - \li .9.png (or .png) - \row - \li - \li separator - \li same as above - \li .9.png (or .png) - \row - \li \l ToolTip - \li background - \li - \li .9.png (or .png) - \row - \li \l Tumbler - \li background - \li disabled, focused, mirrored, hovered - \li .9.png (or .png) - \endtable - - \section2 Asset Examples - - The following table lists examples of assets (taken from the default - Imagine style assets) for all controls. The list is not exhaustive, - as not all elements need assets, but it can be used as a guide - when creating your own assets. - - \table - \header - \li Control - \li Element - \li States - \li Asset - \li Notes - \row - \li \l ApplicationWindow - \li background - \li - \li \image imagine/images/applicationwindow-background.png - \li \l {sup1}{See footnote} \sup 1 - \row - \li - \li overlay - \li - \li \image imagine/images/applicationwindow-overlay.png - \li \l {sup1}{See footnote} \sup 1 - \row - \li - \li overlay - \li modal - \li \image imagine/images/applicationwindow-overlay-modal.png - \li \l {sup1}{See footnote} \sup 1 - \row - \li \l Button - \li background - \li - \li \image imagine/images/button-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/button-background-disabled.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/button-background-focused.9.png - \li - \row - \li - \li background - \li pressed - \li \image imagine/images/button-background-pressed.9.png - \li - \row - \li - \li background - \li checked - \li \image imagine/images/button-background-checked.9.png - \li - \row - \li - \li background - \li checked, disabled - \li \image imagine/images/button-background-checked-disabled.9.png - \li - \row - \li - \li background - \li checked, focused - \li \image imagine/images/button-background-checked-focused.9.png - \li - \row - \li - \li background - \li checked, hovered - \li \image imagine/images/button-background-checked-hovered.9.png - \li - \row - \li - \li background - \li highlighted - \li \image imagine/images/button-background-highlighted.9.png - \li - \row - \li - \li background - \li highlighted, disabled - \li \image imagine/images/button-background-highlighted-disabled.9.png - \li - \row - \li - \li background - \li highlighted, focused - \li \image imagine/images/button-background-highlighted-focused.9.png - \li - \row - \li - \li background - \li highlighted, hovered - \li \image imagine/images/button-background-highlighted-hovered.9.png - \li - \row - \li - \li background - \li highlighted, pressed - \li \image imagine/images/button-background-highlighted-pressed.9.png - \li - \row - \li - \li background - \li highlighted, checked - \li \image imagine/images/button-background-highlighted-checked.9.png - \li - \row - \li - \li background - \li hovered - \li \image imagine/images/button-background-hovered.9.png - \li - \row - \li - \li background - \li flat - \li \image imagine/images/button-background-flat.9.png - \li - \row - \li - \li background - \li flat, disabled - \li \image imagine/images/button-background-flat-disabled.9.png - \li - \row - \li - \li background - \li flat, hovered - \li \image imagine/images/button-background-flat-hovered.9.png - \li - \row - \li - \li background - \li flat, pressed - \li \image imagine/images/button-background-flat-pressed.9.png - \li - \row - \li - \li background - \li flat, checked - \li \image imagine/images/button-background-flat-checked.9.png - \li - \row - \li \l CheckBox - \li indicator - \li - \li \image imagine/images/checkbox-indicator.png - \li - \row - \li - \li indicator - \li disabled - \li \image imagine/images/checkbox-indicator-disabled.png - \li - \row - \li - \li indicator - \li pressed - \li \image imagine/images/checkbox-indicator-pressed.png - \li - \row - \li - \li indicator - \li checked - \li \image imagine/images/checkbox-indicator-checked.png - \li - \row - \li - \li indicator - \li checked, pressed - \li \image imagine/images/checkbox-indicator-checked-pressed.png - \li - \row - \li - \li indicator - \li checked, hovered - \li \image imagine/images/checkbox-indicator-checked-hovered.png - \li - \row - \li - \li indicator - \li checked, focused - \li \image imagine/images/checkbox-indicator-checked-focused.png - \li - \row - \li - \li indicator - \li partially, checked - \li \image imagine/images/checkbox-indicator-partially-checked.png - \li - \row - \li - \li indicator - \li partially, checked, pressed - \li \image imagine/images/checkbox-indicator-partially-checked-pressed.png - \li - \row - \li - \li indicator - \li partially, checked, focused - \li \image imagine/images/checkbox-indicator-partially-checked-focused.png - \li - \row - \li - \li indicator - \li partially, checked, hovered - \li \image imagine/images/checkbox-indicator-partially-checked-hovered.png - \li - \row - \li - \li indicator - \li focused - \li \image imagine/images/checkbox-indicator-focused.png - \li - \row - \li - \li indicator - \li hovered - \li \image imagine/images/checkbox-indicator-hovered.png - \li - \row - \li \l CheckDelegate - \li background - \li - \li \image imagine/images/checkdelegate-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/checkdelegate-background-disabled.9.png - \li - \row - \li - \li background - \li pressed - \li \image imagine/images/checkdelegate-background-pressed.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/checkdelegate-background-focused.9.png - \li - \row - \li - \li background - \li hovered - \li \image imagine/images/checkdelegate-background-hovered.9.png - \li - \row - \li - \li indicator - \li - \li \image imagine/images/checkdelegate-indicator.png - \li - \row - \li - \li indicator - \li disabled - \li \image imagine/images/checkdelegate-indicator-disabled.png - \li - \row - \li - \li indicator - \li pressed - \li \image imagine/images/checkdelegate-indicator-pressed.png - \li - \row - \li - \li indicator - \li checked - \li \image imagine/images/checkdelegate-indicator-checked.png - \li - \row - \li - \li indicator - \li checked, pressed - \li \image imagine/images/checkdelegate-indicator-checked-pressed.png - \li - \row - \li - \li indicator - \li checked, focused - \li \image imagine/images/checkdelegate-indicator-checked-focused.png - \li - \row - \li - \li indicator - \li checked, hovered - \li \image imagine/images/checkdelegate-indicator-checked-hovered.png - \li - \row - \li - \li indicator - \li focused - \li \image imagine/images/checkdelegate-indicator-focused.png - \li - \row - \li - \li indicator - \li hovered - \li \image imagine/images/checkdelegate-indicator-hovered.png - \li - \row - \li - \li indicator - \li partially, checked - \li \image imagine/images/checkdelegate-indicator-partially-checked.png - \li - \row - \li - \li indicator - \li partially, checked, pressed - \li \image imagine/images/checkdelegate-indicator-partially-checked-pressed.png - \li - \row - \li - \li indicator - \li partially, checked, focused - \li \image imagine/images/checkdelegate-indicator-partially-checked-focused.png - \li - \row - \li - \li indicator - \li partially, checked, hovered - \li \image imagine/images/checkdelegate-indicator-partially-checked-hovered.png - \li - \row - \li - \li indicator - \li hovered - \li \image imagine/images/checkdelegate-indicator-hovered.png - \li - \row - \li \l ComboBox - \li background - \li - \li \image imagine/images/combobox-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/combobox-background-disabled.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/combobox-background-focused.9.png - \li - \row - \li - \li background - \li hovered - \li \image imagine/images/combobox-background-hovered.9.png - \li - \row - \li - \li background - \li pressed - \li \image imagine/images/combobox-background-pressed.9.png - \li - \row - \li - \li background - \li open - \li \image imagine/images/combobox-background-open.9.png - \li - \row - \li - \li background - \li editable - \li \image imagine/images/combobox-background-editable.9.png - \li - \row - \li - \li background - \li editable, focused - \li \image imagine/images/combobox-background-editable-focused.9.png - \li - \row - \li - \li background - \li editable, disabled - \li \image imagine/images/combobox-background-editable-disabled.9.png - \li - \row - \li - \li indicator - \li - \li \image imagine/images/combobox-indicator.png - \li - \row - \li - \li indicator - \li disabled - \li \image imagine/images/combobox-indicator-disabled.png - \li - \row - \li - \li indicator - \li editable - \li \image imagine/images/combobox-indicator-editable.png - \li - \row - \li - \li indicator - \li editable, disabled - \li \image imagine/images/combobox-indicator-editable-disabled.png - \li - \row - \li - \li indicator - \li editable, mirrored - \li \image imagine/images/combobox-indicator-editable-mirrored.png - \li - \row - \li - \li indicator - \li editable, mirrored, disabled - \li \image imagine/images/combobox-indicator-editable-mirrored-disabled.png - \li - \row - \li - \li popup - \li - \li \image imagine/images/combobox-popup.9.png - \li - \row - \li \l DelayButton - \li background - \li - \li \image imagine/images/delaybutton-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/delaybutton-background-disabled.9.png - \li - \row - \li - \li background - \li disabled, checked - \li \image imagine/images/delaybutton-background-disabled-checked.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/delaybutton-background-focused.9.png - \li - \row - \li - \li background - \li pressed - \li \image imagine/images/delaybutton-background-pressed.9.png - \li - \row - \li - \li background - \li checked - \li \image imagine/images/delaybutton-background-checked.9.png - \li - \row - \li - \li background - \li checked, focused - \li \image imagine/images/delaybutton-background-checked-focused.9.png - \li - \row - \li - \li background - \li checked, hovered - \li \image imagine/images/delaybutton-background-checked-hovered.9.png - \li - \row - \li - \li background - \li hovered - \li \image imagine/images/delaybutton-background-hovered.9.png - \li - \row - \li - \li progress - \li - \li \image imagine/images/delaybutton-progress.9.png - \li - \row - \li - \li progress - \li disabled - \li \image imagine/images/delaybutton-progress-disabled.9.png - \li - \row - \li - \li mask - \li - \li \image imagine/images/delaybutton-mask.9.png - \li - \row - \li \l Dial - \li background - \li - \li \image imagine/images/dial-background.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/dial-background-disabled.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/dial-background-focused.png - \li - \row - \li - \li handle - \li - \li \image imagine/images/dial-handle.png - \li - \row - \li - \li handle - \li disabled - \li \image imagine/images/dial-handle-disabled.png - \li - \row - \li - \li handle - \li focused - \li \image imagine/images/dial-handle-focused.png - \li - \row - \li - \li handle - \li focused, pressed - \li \image imagine/images/dial-handle-focused-pressed.png - \li - \row - \li - \li handle - \li focused, hovered - \li \image imagine/images/dial-handle-focused-hovered.png - \li - \row - \li - \li handle - \li pressed - \li \image imagine/images/dial-handle-pressed.png - \li - \row - \li - \li handle - \li hovered - \li \image imagine/images/dial-handle-hovered.png - \li - \row - \li \l Dialog - \li background - \li - \li \image imagine/images/dialog-background.9.png - \li - \row - \li - \li overlay - \li - \li \image imagine/images/dialog-overlay.png - \li \l {sup1}{See footnote} \sup 1 - \row - \li - \li overlay - \li modal - \li \image imagine/images/dialog-overlay-modal.png - \li \l {sup1}{See footnote} \sup 1 - \row - \li \l DialogButtonBox - \li background - \li - \li \image imagine/images/dialogbuttonbox-background.9.png - \li - \row - \li \l Drawer - \li background - \li left - \li \image imagine/images/drawer-background-left.9.png - \li - \row - \li - \li background - \li right - \li \image imagine/images/drawer-background-right.9.png - \li - \row - \li - \li background - \li top - \li \image imagine/images/drawer-background-top.9.png - \li - \row - \li - \li background - \li bottom - \li \image imagine/images/drawer-background-bottom.9.png - \li - \row - \li - \li overlay - \li - \li \image imagine/images/drawer-overlay.png - \li \l {sup1}{See footnote} \sup 1 - \row - \li - \li overlay - \li modal - \li \image imagine/images/drawer-overlay-modal.png - \li \l {sup1}{See footnote} \sup 1 - \row - \li \l Frame - \li background - \li - \li \image imagine/images/frame-background.9.png - \li - \row - \li \l GroupBox - \li background - \li - \li \image imagine/images/groupbox-background.9.png - \li - \row - \li - \li title - \li - \li \image imagine/images/groupbox-title.9.png - \li - \row - \li \l ItemDelegate - \li background - \li - \li \image imagine/images/itemdelegate-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/itemdelegate-background-disabled.9.png - \li - \row - \li - \li background - \li pressed - \li \image imagine/images/itemdelegate-background-pressed.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/itemdelegate-background-focused.9.png - \li - \row - \li - \li background - \li hovered - \li \image imagine/images/itemdelegate-background-hovered.9.png - \li - \row - \li - \li background - \li highlighted - \li \image imagine/images/itemdelegate-background-highlighted.9.png - \li - \row - \li \l Menu - \li background - \li - \li \image imagine/images/menu-background.9.png - \li - \row - \li \l MenuItem - \li background - \li - \li \image imagine/images/menuitem-background.9.png - \li - \row - \li - \li background - \li highlighted - \li \image imagine/images/menuitem-background-highlighted.9.png - \li - \row - \li - \li arrow - \li - \li \image imagine/images/menuitem-arrow.png - \li - \row - \li - \li arrow - \li mirrored - \li \image imagine/images/menuitem-arrow-mirrored.png - \li - \row - \li - \li arrow - \li disabled - \li \image imagine/images/menuitem-arrow-disabled.png - \li - \row - \li - \li arrow - \li mirrored, disabled - \li \image imagine/images/menuitem-arrow-mirrored-disabled.png - \li - \row - \li - \li indicator - \li - \li \image imagine/images/menuitem-indicator.png - \li - \row - \li - \li indicator - \li disabled - \li \image imagine/images/menuitem-indicator-disabled.png - \li - \row - \li - \li indicator - \li pressed - \li \image imagine/images/menuitem-indicator-pressed.png - \li - \row - \li - \li indicator - \li checked - \li \image imagine/images/menuitem-indicator-checked.png - \li - \row - \li - \li indicator - \li checked, pressed - \li \image imagine/images/menuitem-indicator-checked-pressed.png - \li - \row - \li - \li indicator - \li checked, focused - \li \image imagine/images/menuitem-indicator-checked-focused.png - \li - \row - \li - \li indicator - \li checked, hovered - \li \image imagine/images/menuitem-indicator-checked-hovered.png - \li - \row - \li - \li indicator - \li focused - \li \image imagine/images/menuitem-indicator-focused.png - \li - \row - \li - \li indicator - \li hovered - \li \image imagine/images/menuitem-indicator-hovered.png - \li - \row - \li \l MenuSeparator - \li separator - \li - \li \image imagine/images/menuseparator-separator.9.png - \li - \row - \li \l Page - \li background - \li - \li \image imagine/images/page-background.png - \li \l {sup1}{See footnote} \sup 1 - \row - \li \l PageIndicator - \li delegate - \li - \li \image imagine/images/pageindicator-delegate.png - \li - \row - \li - \li delegate - \li disabled - \li \image imagine/images/pageindicator-delegate-disabled.png - \li - \row - \li - \li delegate - \li disabled, current - \li \image imagine/images/pageindicator-delegate-disabled-current.png - \li - \row - \li - \li delegate - \li pressed - \li \image imagine/images/pageindicator-delegate-pressed.png - \li - \row - \li - \li delegate - \li current - \li \image imagine/images/pageindicator-delegate-current.png - \li - \row - \li \l Pane - \li background - \li - \li \image imagine/images/pane-background.9.png - \li - \row - \li \l Popup - \li background - \li - \li \image imagine/images/popup-background.9.png - \li \l {sup1}{See footnote} \sup 1 - \row - \li - \li overlay - \li - \li \image imagine/images/popup-overlay.png - \li \l {sup1}{See footnote} \sup 1 - \row - \li - \li overlay - \li modal - \li \image imagine/images/popup-overlay-modal.png - \li - \row - \li \l ProgressBar - \li background - \li - \li \image imagine/images/progressbar-background.9.png - \li - \row - \li - \li progress - \li - \li \image imagine/images/progressbar-progress.png - \li - \row - \li - \li mask - \li - \li \image imagine/images/progressbar-mask.9.png - \li - \row - \li \l RadioButton - \li indicator - \li - \li \image imagine/images/radiobutton-indicator.png - \li - \row - \li - \li indicator - \li disabled - \li \image imagine/images/radiobutton-indicator-disabled.png - \li - \row - \li - \li indicator - \li pressed - \li \image imagine/images/radiobutton-indicator-pressed.png - \li - \row - \li - \li indicator - \li checked - \li \image imagine/images/radiobutton-indicator-checked.png - \li - \row - \li - \li indicator - \li checked, focused - \li \image imagine/images/radiobutton-indicator-checked-focused.png - \li - \row - \li - \li indicator - \li checked, hovered - \li \image imagine/images/radiobutton-indicator-checked-hovered.png - \li - \row - \li - \li indicator - \li checked, pressed - \li \image imagine/images/radiobutton-indicator-checked-pressed.png - \li - \row - \li - \li indicator - \li focused - \li \image imagine/images/radiobutton-indicator-focused.png - \li - \row - \li - \li indicator - \li hovered - \li \image imagine/images/radiobutton-indicator-hovered.png - \li - \row - \li \l RadioDelegate - \li background - \li - \li \image imagine/images/radiodelegate-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/radiodelegate-background-disabled.9.png - \li - \row - \li - \li background - \li pressed - \li \image imagine/images/radiodelegate-background-pressed.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/radiodelegate-background-focused.9.png - \li - \row - \li - \li background - \li hovered - \li \image imagine/images/radiodelegate-background-hovered.9.png - \li - \row - \li - \li indicator - \li - \li \image imagine/images/radiodelegate-indicator.png - \li - \row - \li - \li indicator - \li disabled - \li \image imagine/images/radiodelegate-indicator-disabled.png - \li - \row - \li - \li indicator - \li pressed - \li \image imagine/images/radiodelegate-indicator-pressed.png - \li - \row - \li - \li indicator - \li checked - \li \image imagine/images/radiodelegate-indicator-checked.png - \li - \row - \li - \li indicator - \li checked, focused - \li \image imagine/images/radiodelegate-indicator-checked-focused.png - \li - \row - \li - \li indicator - \li checked, hovered - \li \image imagine/images/radiodelegate-indicator-checked-hovered.png - \li - \row - \li - \li indicator - \li checked, pressed - \li \image imagine/images/radiodelegate-indicator-checked-pressed.png - \li - \row - \li - \li indicator - \li focused - \li \image imagine/images/radiodelegate-indicator-focused.png - \li - \row - \li - \li indicator - \li hovered - \li \image imagine/images/radiodelegate-indicator-hovered.png - \li - \row - \li \l RangeSlider - \li background - \li vertical - \li \image imagine/images/rangeslider-background-vertical.9.png - \li - \row - \li - \li background - \li horizontal - \li \image imagine/images/rangeslider-background-horizontal.9.png - \li - \row - \li - \li progress - \li vertical - \li \image imagine/images/rangeslider-progress-vertical.9.png - \li - \row - \li - \li progress - \li vertical, disabled - \li \image imagine/images/rangeslider-progress-vertical-disabled.9.png - \li - \row - \li - \li progress - \li horizontal - \li \image imagine/images/rangeslider-progress-horizontal.9.png - \li - \row - \li - \li progress - \li horizontal, disabled - \li \image imagine/images/rangeslider-progress-horizontal-disabled.9.png - \li - \row - \li - \li handle - \li - \li \image imagine/images/rangeslider-handle.png - \li - \row - \li - \li handle - \li disabled - \li \image imagine/images/rangeslider-handle-disabled.png - \li - \row - \li - \li handle - \li focused - \li \image imagine/images/rangeslider-handle-focused.png - \li - \row - \li - \li handle - \li focused, hovered - \li \image imagine/images/rangeslider-handle-focused-hovered.png - \li - \row - \li - \li handle - \li focused, pressed - \li \image imagine/images/rangeslider-handle-focused-pressed.png - \li - \row - \li - \li handle - \li hovered - \li \image imagine/images/rangeslider-handle-hovered.png - \li - \row - \li - \li handle - \li pressed - \li \image imagine/images/rangeslider-handle-pressed.png - \li - \row - \li \l RoundButton - \li background - \li - \li \image imagine/images/roundbutton-background.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/roundbutton-background-disabled.png - \li - \row - \li - \li background - \li disabled, checked - \li \image imagine/images/roundbutton-background-disabled-checked.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/roundbutton-background-focused.png - \li - \row - \li - \li background - \li pressed - \li \image imagine/images/roundbutton-background-pressed.png - \li - \row - \li - \li background - \li checked - \li \image imagine/images/roundbutton-background-checked.png - \li - \row - \li - \li background - \li checked, focused - \li \image imagine/images/roundbutton-background-checked-focused.png - \li - \row - \li - \li background - \li checked, hovered - \li \image imagine/images/roundbutton-background-checked-hovered.png - \li - \row - \li - \li background - \li highlighted - \li \image imagine/images/roundbutton-background-highlighted.png - \li - \row - \li - \li background - \li highlighted, pressed - \li \image imagine/images/roundbutton-background-highlighted-pressed.png - \li - \row - \li - \li background - \li highlighted, focused - \li \image imagine/images/roundbutton-background-highlighted-focused.png - \li - \row - \li - \li background - \li highlighted, hovered - \li \image imagine/images/roundbutton-background-highlighted-hovered.png - \li - \row - \li - \li background - \li hovered - \li \image imagine/images/roundbutton-background-hovered.png - \li - \row - \li \l ScrollBar - \li handle - \li - \li \image imagine/images/scrollbar-handle.png - \li - \row - \li - \li handle - \li disabled - \li \image imagine/images/scrollbar-handle-disabled.png - \li - \row - \li - \li handle - \li interactive - \li \image imagine/images/scrollbar-handle-interactive.png - \li - \row - \li - \li handle - \li interactive, disabled - \li \image imagine/images/scrollbar-handle-interactive-disabled.png - \li - \row - \li - \li handle - \li interactive, pressed - \li \image imagine/images/scrollbar-handle-interactive-pressed.png - \li - \row - \li - \li handle - \li interactive, hovered - \li \image imagine/images/scrollbar-handle-interactive-hovered.png - \li - \row - \li \l ScrollIndicator - \li handle - \li - \li \image imagine/images/scrollindicator-handle.png - \li - \row - \li \l Slider - \li background - \li vertical - \li \image imagine/images/slider-background-vertical.9.png - \li - \row - \li - \li background - \li horizontal - \li \image imagine/images/slider-background-horizontal.9.png - \li - \row - \li - \li progress - \li vertical - \li \image imagine/images/slider-progress-vertical.9.png - \li - \row - \li - \li progress - \li vertical, disabled - \li \image imagine/images/slider-progress-vertical-disabled.9.png - \li - \row - \li - \li progress - \li horizontal - \li \image imagine/images/slider-progress-horizontal.9.png - \li - \row - \li - \li progress - \li horizontal, disabled - \li \image imagine/images/slider-progress-horizontal-disabled.9.png - \li - \row - \li - \li handle - \li - \li \image imagine/images/slider-handle.png - \li - \row - \li - \li handle - \li disabled - \li \image imagine/images/slider-handle-disabled.png - \li - \row - \li - \li handle - \li focused - \li \image imagine/images/slider-handle-focused.png - \li - \row - \li - \li handle - \li focused, hovered - \li \image imagine/images/slider-handle-focused-hovered.png - \li - \row - \li - \li handle - \li focused, pressed - \li \image imagine/images/slider-handle-focused-pressed.png - \li - \row - \li - \li handle - \li hovered - \li \image imagine/images/slider-handle-hovered.png - \li - \row - \li - \li handle - \li pressed - \li \image imagine/images/slider-handle-pressed.png - \li - \row - \li \l SpinBox - \li background - \li - \li \image imagine/images/spinbox-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/spinbox-background-disabled.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/spinbox-background-focused.9.png - \li - \row - \li - \li background - \li editable - \li \image imagine/images/spinbox-background-editable.9.png - \li - \row - \li - \li indicator - \li up - \li \image imagine/images/spinbox-indicator-up.9.png - \li - \row - \li - \li indicator - \li up, disabled - \li \image imagine/images/spinbox-indicator-up-disabled.9.png - \li - \row - \li - \li indicator - \li up, pressed - \li \image imagine/images/spinbox-indicator-up-pressed.9.png - \li - \row - \li - \li indicator - \li up, focused - \li \image imagine/images/spinbox-indicator-up-focused.9.png - \li - \row - \li - \li indicator - \li up, mirrored - \li \image imagine/images/spinbox-indicator-up-mirrored.9.png - \li - \row - \li - \li indicator - \li up, hovered - \li \image imagine/images/spinbox-indicator-up-hovered.9.png - \li - \row - \li - \li indicator - \li up, editable - \li \image imagine/images/spinbox-indicator-up-editable.9.png - \li - \row - \li - \li indicator - \li up, editable, pressed - \li \image imagine/images/spinbox-indicator-up-editable-pressed.9.png - \li - \row - \li - \li indicator - \li up, editable, focused - \li \image imagine/images/spinbox-indicator-up-editable-focused.9.png - \li - \row - \li - \li indicator - \li up, editable, mirrored - \li \image imagine/images/spinbox-indicator-up-editable-mirrored.9.png - \li - \row - \li - \li indicator - \li up, editable, hovered - \li \image imagine/images/spinbox-indicator-up-editable-hovered.9.png - \li - \row - \li - \li indicator - \li down - \li \image imagine/images/spinbox-indicator-down.9.png - \li - \row - \li - \li indicator - \li down, disabled - \li \image imagine/images/spinbox-indicator-down-disabled.9.png - \li - \row - \li - \li indicator - \li down, pressed - \li \image imagine/images/spinbox-indicator-down-pressed.9.png - \li - \row - \li - \li indicator - \li down, focused - \li \image imagine/images/spinbox-indicator-down-focused.9.png - \li - \row - \li - \li indicator - \li down, mirrored - \li \image imagine/images/spinbox-indicator-down-mirrored.9.png - \li - \row - \li - \li indicator - \li down, hovered - \li \image imagine/images/spinbox-indicator-down-hovered.9.png - \li - \row - \li - \li indicator - \li down, editable - \li \image imagine/images/spinbox-indicator-down-editable.9.png - \li - \row - \li - \li indicator - \li down, editable, pressed - \li \image imagine/images/spinbox-indicator-down-editable-pressed.9.png - \li - \row - \li - \li indicator - \li down, editable, focused - \li \image imagine/images/spinbox-indicator-down-editable-focused.9.png - \li - \row - \li - \li indicator - \li down, editable, mirrored - \li \image imagine/images/spinbox-indicator-down-editable-mirrored.9.png - \li - \row - \li - \li indicator - \li down, editable, hovered - \li \image imagine/images/spinbox-indicator-down-editable-hovered.9.png - \li - \row - \li \l SwipeDelegate - \li background - \li - \li \image imagine/images/swipedelegate-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/swipedelegate-background-disabled.9.png - \li - \row - \li - \li background - \li pressed - \li \image imagine/images/swipedelegate-background-pressed.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/swipedelegate-background-focused.9.png - \li - \row - \li - \li background - \li hovered - \li \image imagine/images/swipedelegate-background-hovered.9.png - \li - \row - \li \l Switch - \li indicator - \li - \li \image imagine/images/switch-indicator.png - \li - \row - \li - \li indicator - \li disabled - \li \image imagine/images/switch-indicator-disabled.png - \li - \row - \li - \li indicator - \li pressed - \li \image imagine/images/switch-indicator-pressed.png - \li - \row - \li - \li indicator - \li checked - \li \image imagine/images/switch-indicator-checked.png - \li - \row - \li - \li indicator - \li checked, focused - \li \image imagine/images/switch-indicator-checked-focused.png - \li - \row - \li - \li indicator - \li checked, hovered - \li \image imagine/images/switch-indicator-checked-hovered.png - \li - \row - \li - \li indicator - \li checked, pressed - \li \image imagine/images/switch-indicator-checked-pressed.png - \li - \row - \li - \li indicator - \li focused - \li \image imagine/images/switch-indicator-focused.png - \li - \row - \li - \li indicator - \li hovered - \li \image imagine/images/switch-indicator-hovered.png - \li - \row - \li - \li handle - \li - \li \image imagine/images/switch-handle.png - \li - \row - \li - \li handle - \li disabled - \li \image imagine/images/switch-handle-disabled.png - \li - \row - \li - \li handle - \li pressed - \li \image imagine/images/switch-handle-pressed.png - \li - \row - \li \l SwitchDelegate - \li background - \li - \li \image imagine/images/switchdelegate-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/switchdelegate-background-disabled.9.png - \li - \row - \li - \li background - \li pressed - \li \image imagine/images/switchdelegate-background-pressed.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/switchdelegate-background-focused.9.png - \li - \row - \li - \li background - \li hovered - \li \image imagine/images/switchdelegate-background-hovered.9.png - \li - \row - \li - \li indicator - \li - \li \image imagine/images/switchdelegate-indicator.png - \li - \row - \li - \li indicator - \li disabled - \li \image imagine/images/switchdelegate-indicator-disabled.png - \li - \row - \li - \li indicator - \li pressed - \li \image imagine/images/switchdelegate-indicator-pressed.png - \li - \row - \li - \li indicator - \li checked - \li \image imagine/images/switchdelegate-indicator-checked.png - \li - \row - \li - \li indicator - \li checked, focused - \li \image imagine/images/switchdelegate-indicator-checked-focused.png - \li - \row - \li - \li indicator - \li checked, hovered - \li \image imagine/images/switchdelegate-indicator-checked-hovered.png - \li - \row - \li - \li indicator - \li checked, pressed - \li \image imagine/images/switchdelegate-indicator-checked-pressed.png - \li - \row - \li - \li indicator - \li focused - \li \image imagine/images/switchdelegate-indicator-focused.png - \li - \row - \li - \li indicator - \li hovered - \li \image imagine/images/switchdelegate-indicator-hovered.png - \li - \row - \li - \li handle - \li - \li \image imagine/images/switchdelegate-handle.png - \li - \row - \li - \li handle - \li disabled - \li \image imagine/images/switchdelegate-handle-disabled.png - \li - \row - \li \l TabBar - \li background - \li - \li \image imagine/images/tabbar-background.png - \li - \row - \li \l TabButton - \li background - \li - \li \image imagine/images/tabbutton-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/tabbutton-background-disabled.9.png - \li - \row - \li - \li background - \li pressed - \li \image imagine/images/tabbutton-background-pressed.9.png - \li - \row - \li - \li background - \li checked - \li \image imagine/images/tabbutton-background-checked.9.png - \li - \row - \li - \li background - \li hovered - \li \image imagine/images/tabbutton-background-hovered.9.png - \li - \row - \li - \li background - \li disabled, checked - \li \image imagine/images/tabbutton-background-disabled-checked.9.png - \li - \row - \li \l TextArea - \li background - \li - \li \image imagine/images/textarea-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/textarea-background-disabled.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/textarea-background-focused.9.png - \li - \row - \li \l TextField - \li background - \li - \li \image imagine/images/textfield-background.9.png - \li - \row - \li - \li background - \li disabled - \li \image imagine/images/textfield-background-disabled.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/textfield-background-focused.9.png - \li - \row - \li \l ToolBar - \li background - \li - \li \image imagine/images/toolbar-background.png - \li - \row - \li \l ToolButton - \li background - \li - \li \image imagine/images/toolbutton-background.9.png - \li - \row - \li - \li background - \li disabled, checked - \li \image imagine/images/toolbutton-background-disabled-checked.9.png - \li - \row - \li - \li background - \li focused - \li \image imagine/images/toolbutton-background-focused.9.png - \li - \row - \li - \li background - \li pressed - \li \image imagine/images/toolbutton-background-pressed.9.png - \li - \row - \li - \li background - \li checked - \li \image imagine/images/toolbutton-background-checked.9.png - \li - \row - \li - \li background - \li checked, focused - \li \image imagine/images/toolbutton-background-checked-focused.9.png - \li - \row - \li - \li background - \li checked, hovered - \li \image imagine/images/toolbutton-background-checked-hovered.9.png - \li - \row - \li - \li background - \li hovered - \li \image imagine/images/toolbutton-background-hovered.9.png - \li - \row - \li \l ToolSeparator - \li separator - \li horizontal - \li \image imagine/images/toolseparator-separator-horizontal.9.png - \li - \row - \li - \li separator - \li vertical - \li \image imagine/images/toolseparator-separator-vertical.9.png - \li - \row - \li \l ToolTip - \li background - \li - \li \image imagine/images/tooltip-background.9.png - \li - \endtable - - \target sup1 - \sup 1 A 1x1 image containing one color, stretched to fill the control. - - \section2 9-Patch Images - - The Imagine style uses \l - {https://developer.android.com/guide/topics/graphics/2d-graphics.html#nine-patch}{9-patch - images} in order to give designers control over how a particular element - responds to being resized. Here is an example of a 9-patch image that - represents a \l {Button}'s \l {Control::}{background}, alongside a - magnified version (to make it easier to see the 9-patch lines): - - \image qtquickcontrols2-imagine-9-patch-4x.png - - The content of the image is 44 pixels wide by 32 pixels high. Every 9-patch - image needs a one pixel thick line (collectively referred to as - "9-patch lines") around every side, so the actual size of the image becomes - 46 pixels wide by 34 pixels high. Note that the 9-patch lines must be one - pixel thick regardless of the target DPI of the image. For example, - the 9-patch lines for button-background.9.png and button-background@2x.9.png - must both be one pixel thick. - - The 9-patch lines must be black, and the remaining areas must be transparent - or white: - - \image qtquickcontrols2-imagine-9-patch-size.png - - \section3 Stretchable Areas - - The 9-patch lines on the top and left edges determine which parts of the - image are stretched when it is resized. - - Below are examples of the 9-patch image being resized to one and a half - times its original size in various dimensions: - - \image qtquickcontrols2-imagine-9-patch-resized-stretchable.png - - Notice how the the rounded corners keep their original size, as they are - outside the range of the lines. - - \section3 Padding Areas - - The 9-patch lines on the right and bottom edges determine how much space - is available for the control's \l {Control::}{contentItem}, which means it - can also be thought of as controlling the \l {Control::}{padding}. For a - diagram that illustrates padding, see \l {Control Layout}. - - Below are more examples of the 9-patch image being resized, but this time - demonstrating how the padding 9-patch lines work. - - \image qtquickcontrols2-imagine-9-patch-resized-padding.png - - The \c contentItem can take up as much space as it needs within the shaded - areas. If the padding lines are left out, the \c contentItem will take as - much space as it needs without exceeding the stretchable areas. - - \section3 Inset Areas - - In some cases it is necessary for a control to have a drop shadow, for - example. However, if we were to add a drop shadow to the button above, it - would affect its size, which presents problems for both layouting and - mouse/touch input boundaries. - - Inset areas accounts for this by telling the control that a certain area of - the 9-patch image should go outside of the control: - - \image qtquickcontrols2-imagine-9-patch-inset.png - - In the image below, the dashed line represents the button's clickable area, - as well as the space that it will take up in a layout. The shadow is marked - by the striped area behind it: - - \image qtquickcontrols2-imagine-9-patch-inset-boundaries.png - - \section3 Exporting 9-Patch Images - - Various vector and bitmap editors can be used to create 9-patch images - suitable for use with the Imagine style. The following sections briefly - explain the export process for each editor, and the last section explains - how to ensure the exported images are 9-patch-conformant. - - \section4 Illustrator - - See Adobe's - \l {https://helpx.adobe.com/in/illustrator/using/collect-assets-export-for-screens.html#panel} - {Asset Export panel} documentation. - - \section4 Inkscape - - The \l {https://github.com/mitchcurtis/inkscape-9-patch-export} - {Inkscape 9-Patch Export Extension} can be used to export assets with - Inkscape. - - \section4 Photoshop - - See Adobe's - \l {https://helpx.adobe.com/photoshop/using/generate-assets-layers.html} - {Generate image assets from layers} documentation. - - \section4 Sketch - - See Sketch's \l {https://sketchapp.com/docs/exporting/}{Exporting} documentation. - - Qt Quick Controls 2 also provides a - \l {http://code.qt.io/cgit/qt/qtquickcontrols2.git/tree/src/imports/controls/imagine/design} - {plugin} for Sketch that automatically fixes the thickness of the 9-patch lines - after the assets are exported. To install this file, double-click on it. - Once Sketch has confirmed that the 9-patch export plugin has been installed, - the plugin will automatically process images when they are exported. - - \section4 Fixing 9-Patch Lines - - When exporting 9-patch images in several DPI variants (\c {@2x}, \c {@3x}, - etc.), the 9-patch lines will typically be scaled up along with the image. - There are several ways to fix this, but perhaps the simplest approach is - to use \l {https://www.imagemagick.org/script/mogrify.php}{ImageMagick's mogrify} - tool. The tool has a \c -shave feature that can be used to crop the image - to reduce the thickness of the 9-patch lines: - - \badcode - mogrify -shave 1x1 -path path/to/images *@2x.9.png - mogrify -shave 2x2 -path path/to/images *@3x.9.png - mogrify -shave 3x3 -path path/to/images *@4x.9.png - \endcode - - Regular DPI images (those without the \c @Nx prefix) are not affected, so it - is only necessary to run the command on images intended for high DPI displays. - - \section2 Animated Images - - The \l {https://developers.google.com/speed/webp/}{WebP} and GIF animated - image formats are supported by the Imagine style. - - \section2 Customization - - \section3 Path - - The Imagine style allows customizing the \l {imagine-path-attached-prop}{path} - that is used to do the image asset selection. The path can be specified for any - window or item, and it automatically propagates to children in the same manner as - \l {Control::font}{fonts}. In the following example, the window and all three radio - buttons appear with dark image assets (files that are located in "qrc:/themes/dark"). - - \table - \row - \li - \qml - import QtQuick 2.12 - import QtQuick.Controls 2.12 - import QtQuick.Controls.Imagine 2.12 - - ApplicationWindow { - visible: true - - Imagine.path: "qrc:/themes/dark" - - Column { - anchors.centerIn: parent - - RadioButton { text: qsTr("Small") } - RadioButton { text: qsTr("Medium"); checked: true } - RadioButton { text: qsTr("Large") } - } - } - \endqml - \li - \image qtquickcontrols2-imagine-customization-dark.png - \endtable - - In addition to specifying the path in QML, it is also possible to specify - it via an \l {imagine-customization-environment-variable}{environment variable} - or in a \l {imagine-customization-configuration-file}{configuration file}. - Attributes specified in QML take precedence over all other methods. - - \section4 Configuration File - \target imagine-customization-configuration-file - - \include qquickimaginestyle.qdocinc conf - - See \l {Qt Quick Controls 2 Configuration File} for more details about the - configuration file. - - \section4 Environment Variables - \target imagine-customization-environment-variable - - \include qquickimaginestyle.qdocinc env - - See \l {Supported Environment Variables in Qt Quick Controls 2} for the full - list of supported environment variables. - - \section3 Palette - - The Imagine style supports palette customization via the \l {Control::}{palette} - property and the \l {Palette Configuration}{qtquickcontrols2.conf} file. - As with other styles, the exact \l {palette QML Basic Type}{palette roles} - that the Imagine style uses are style-dependent. However, as most of the visual - appearance of controls (for example: backgrounds) are managed through image assets, - only the roles that are typically used for text will have an effect. - - \section3 Font - - Custom fonts can be set via the \l {Control::}{font} property and the - \l {Font Configuration}{configuration} file. - - \section2 Dependency - - The Imagine style must be separately imported to gain access to the - attributes that are specific to the Imagine style. It should be noted - that regardless of the references to the Imagine style, the same - application code runs with any other style. Imagine-specific attributes - only have an effect when the application is run with the Imagine style. - - If the Imagine style is imported in a QML file that is always loaded, the - Imagine style must be deployed with the application in order to be able - to run the application regardless of which style the application is run with. - By using \l {Using File Selectors with Qt Quick Controls 2}{file selectors}, - style-specific tweaks can be applied without creating a hard dependency to - a style. - - \b {See also} \l {Styling Qt Quick Controls 2} - - \section1 Attached Property Documentation - - \styleproperty {Imagine.path} {string} {imagine-path-attached-prop} - \target imagine-path-attached-prop - This attached property holds the path to the image assets... - - \code - Button { - Imagine.path: "qrc:/themes/dark" - } - \endcode - - \endstyleproperty - - \section1 Related Information - - \list - \li \l{Styling Qt Quick Controls 2} - \li \l{Qt Quick Controls 2 - Imagine Style Example: Automotive}{Automotive Example} - \li \l{Qt Quick Controls 2 - Imagine Style Example: Music Player}{Music Player Example} - \endlist -*/ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -26,9 +26,8 @@ ****************************************************************************/ /*! - \page qtquickcontrols-index.html - \keyword Qt Quick Controls 2 - \title Qt Quick Controls + \page qtquickcontrols2-index.html + \title Qt Quick Controls 2 \brief Provides a set of UI controls for Qt Quick. @@ -46,8 +45,8 @@ The \l{Qt Quick Controls 2 QML Types}{QML types} can be imported into your application using the following import statement in your \c {.qml} file: - \code \QtMinorVersion - import QtQuick.Controls 2.\1 + \code + import QtQuick.Controls 2.2 \endcode The \l{Qt Quick Controls 2 C++ Classes}{C++ classes} can be included into @@ -66,20 +65,10 @@ For more details, see \l {Getting Started with Qt Quick Controls 2}. - \section2 Building From Source - - When building from source, ensure that the \l {Qt Graphical Effects} module - is also built, as Qt Quick Controls 2 requires it. - - The \l {Qt Image Formats} module is recommended, but not - required. It provides support for the \c {.webp} format used by the - \l {Animated Images}{Imagine style}. - \section1 Versions Qt Quick Controls 2.0 was introduced in Qt 5.7. Subsequent minor Qt releases - increment the import version of the Qt Quick Controls 2 modules by one, - until Qt 5.12, where the import versions match Qt's minor version. The + increment the import version of the Qt Quick Controls 2 modules by one. The experimental Qt Labs modules use import version 1.0. \table @@ -108,21 +97,6 @@ \li 2.2 \li 1.0 \row - \li 5.10 - \li 2.10 - \li 2.3 - \li 1.0 - \row - \li 5.11 - \li 2.11 - \li 2.4 - \li 1.0 - \row - \li 5.12 - \li 2.12 - \li 2.12 - \li 1.0 - \row \li ... \li ... \li ... @@ -140,21 +114,20 @@ Furthermore Qt Quick Controls 2 potentially contains third party modules under following permissive licenses: - \generatelist{groupsbymodule attributions-qtquickcontrols} + \generatelist{groupsbymodule attributions-qtquickcontrols2} \section1 Topics \list \li \l{Qt Quick Controls 2 Guidelines}{Guidelines} \li \l{Styling Qt Quick Controls 2}{Styling} - \li \l{Icons in Qt Quick Controls 2}{Icons} \li \l{Customizing Qt Quick Controls 2}{Customization} \li \l{High-DPI Support in Qt Quick Controls 2}{High-DPI Support} \li \l{Using File Selectors with Qt Quick Controls 2}{Using File Selectors} \li \l{Deploying Qt Quick Controls 2 Applications}{Deployment} \li \l{Qt Quick Controls 2 Configuration File}{Configuration File} \li \l{Supported Environment Variables in Qt Quick Controls 2}{Environment Variables} - \li \l{Differences between Qt Quick Controls 1} + \li \l{Differences between Qt Quick Controls} \endlist \section1 Reference @@ -171,8 +144,6 @@ \li \l{Qt Quick Controls 2 - Chat Tutorial}{Chat Tutorial} \li \l{Qt Quick Controls 2 - Text Editor}{Text Editor} \li \l{Qt Quick Controls 2 - Wearable Demo}{Wearable Demo} - \li \l{Qt Quick Controls 2 - Imagine Style Example: Automotive}{Automotive Example} - \li \l{Qt Quick Controls 2 - Imagine Style Example: Music Player}{Music Player Example} \li \l{Qt Quick Controls 2 Examples}{All Examples} \endlist diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -67,16 +67,6 @@ The dial is rotated by clicking and dragging, with the handle indicating the value of the dial. - For applications where fast input is important, the circular - \l {Dial::inputMode}{input mode} is useful, as clicking on the dial will - move it directly to that position. - - For applications where precise input is important, the horizontal and - vertical input modes are recommended, as these allow small adjustments to - be made relative to where the dial is clicked. These modes are also better - for dials where large jumps in values could be unsafe, such as a dial that - controls audio volume. - \b {See also} \l {Tumbler Control}. \section1 TextArea Control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -32,7 +32,7 @@ The Material Style is based on the Google Material Design Guidelines. \l{detailed-desc-material}{More...} - \styleimport {QtQuick.Controls.Material 2.12} {Qt 5.7} + \styleimport {QtQuick.Controls.Material 2.2} {Qt 5.7} \section1 Attached Properties @@ -93,9 +93,9 @@ \row \li \qml - import QtQuick 2.12 - import QtQuick.Controls 2.12 - import QtQuick.Controls.Material 2.12 + import QtQuick 2.0 + import QtQuick.Controls 2.1 + import QtQuick.Controls.Material 2.1 ApplicationWindow { visible: true @@ -222,33 +222,6 @@ \b {See also} \l {Default Style}, \l {Universal Style} - \section2 Variants - - The Material style also supports a dense variant, where controls like - buttons and delegates are smaller in height and use smaller font sizes. - It is recommended to use the dense variant on desktop platforms, where - a mouse and keyboard allow more precise and flexible user interaction. - - To use the dense variant, either set the - \c QT_QUICK_CONTROLS_MATERIAL_VARIANT environment variable to \c Dense, - or specify \c Variant=Dense in the - \l {Qt Quick Controls 2 Configuration File}{qtquickcontrols2.conf} file. - The default value in both cases is \c Normal. - - The following images illustrate the differences between some of the - controls when using the normal and dense variants: - - \table - \row - \li - \image qtquickcontrols2-material-variant-normal.png - \li - \image qtquickcontrols2-material-variant-dense.png - \endtable - - Note that the heights shown above may vary based on differences in fonts - across platforms. - \section1 Attached Property Documentation \styleproperty {Material.accent} {color} {material-accent-attached-prop} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -45,24 +45,11 @@ right-clicking. It can also be used for popup menus; for example, a menu that is shown after clicking a button. - \l MenuItem is an item in the Menu control. Each item in a menu: - \list - \li displays text to the user - \li allows checking/unchecking - \li is highlighted (for example, on keyboard navigation) - \li performs some action on activation - \endlist - - \section1 MenuBar Control - - \image qtquickcontrols2-menubar.png - - \l MenuBar control can be used for window menu bars. - - \l MenuBarItem is an item in the MenuBar control. Each item in a menu bar: - \list - \li displays text to the user - \li is highlighted (for example, on keyboard navigation) - \li pops up the respective menu on activation - \endlist + \l MenuItem is an item in the Menu control. Each item in a menu: + \list + \li displays text to the user + \li allows checking/unchecking + \li is highlighted (for example, on keyboard navigation) + \li performs some action on activation + \endlist */ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-palette.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-palette.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-palette.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-palette.qdoc 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \qmlbasictype palette - \brief a palette of colors. - \target qtquickcontrols2-palette - - The \c palette type refers to a palette of colors for various roles. - - Available properties: - \table - \header - \li Property - \li Description - \row - \li \b palette.alternateBase : color - \li Used as the alternate background color in item views with alternating row colors. - \row - \li \b palette.base : color - \li Used mostly as the background color for text editor controls and items views. - It is usually white or another light color. - \row - \li \b palette.brightText : color - \li A text color that is very different from \c palette.windowText, and contrasts - well with e.g. \c palette.dark. Typically used for text that needs to be drawn - where \c palette.text, \c palette.windowText or \c palette.buttonText would - give poor contrast, such as on highlighted buttons. - \row - \li \b palette.button : color - \li The general button background color. This background can be different from - \c palette.window as some styles require a different background color for buttons. - \row - \li \b palette.buttonText : color - \li A foreground color used with the \c palette.button color. - \row - \li \b palette.dark : color - \li Darker than \c palette.button. - \row - \li \b palette.highlight : color - \li A color to indicate a selected item or the current item. - \row - \li \b palette.highlightedText : color - \li A text color that contrasts with \c palette.highlight. - \row - \li \b palette.light : color - \li Lighter than \c palette.button. - \row - \li \b palette.link : color - \li A text color used for hyperlinks. - \row - \li \b palette.linkVisited : color - \li A text color used for already visited hyperlinks. - \row - \li \b palette.mid : color - \li Between \c palette.button and \c palette.dark. - \row - \li \b palette.midlight : color - \li Between \c palette.button and \c palette.light. - \row - \li \b palette.shadow : color - \li A very dark color. - \row - \li \b palette.text : color - \li The foreground color used with \c palette.base. This is usually the same as - the \c palette.windowText, in which case it must provide good contrast with - \c palette.window and \c palette.base. - \row - \li \b palette.toolTipBase : color - \li Used as the background color for tooltips. - \row - \li \b palette.toolTipText : color - \li Used as the foreground color for tooltips. - \row - \li \b palette.window : color - \li A general background color. - \row - \li \b palette.windowText : color - \li A general foreground color. - \endtable - - \sa Control::palette, Popup::palette, ApplicationWindow::palette, QPalette::ColorRole -*/ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -26,10 +26,8 @@ ****************************************************************************/ /*! - \qmlmodule QtQuick.Controls 2.5 - \keyword Qt Quick Controls QML Types - \title Qt Quick Controls QML Types - \keyword Qt Quick Controls 2 QML Types + \qmlmodule QtQuick.Controls 2.2 + \title Qt Quick Controls 2 QML Types \ingroup qmlmodules \brief Provides QML types for user interfaces (Qt Quick Controls 2). @@ -40,8 +38,8 @@ Qt Quick Controls 2 QML types can be imported into your application using the following import statement in your .qml file: - \badcode \QtMinorVersion - import QtQuick.Controls 2.\1 + \badcode + import QtQuick.Controls 2.2 \endcode \section1 QML Types diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -39,19 +39,6 @@ The \l {Default Style} is a simple and light-weight all-round style that offers the maximum performance for Qt Quick Controls 2. - \section2 Fusion Style - - \image qtquickcontrols2-fusion-thumbnail.png - The \l {Fusion Style} is a platform-agnostic style that offers a desktop-oriented - look'n'feel for Qt Quick Controls 2. - - \section2 Imagine Style - - \image qtquickcontrols2-imagine-thumbnail.png - The \l {Imagine Style} is based on image assets. The style comes with a default - set of images which can easily be changed by providing a directory - with images using a predefined naming convention. - \section2 Material Style \image qtquickcontrols2-material-thumbnail.png @@ -133,8 +120,6 @@ \section1 Related Information \list \li \l {Default Style} - \li \l {Fusion Style} - \li \l {Imagine Style} \li \l {Material Style} \li \l {Universal Style} \li \l {Customizing Qt Quick Controls 2} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -32,7 +32,7 @@ The Universal Style is based on the Microsoft Universal Design Guidelines. \l {detailed-desc-universal}{More...} - \styleimport {QtQuick.Controls.Universal 2.12} {Qt 5.7} + \styleimport {QtQuick.Controls.Universal 2.2} {Qt 5.7} \section1 Attached Properties @@ -92,9 +92,9 @@ \row \li \qml - import QtQuick 2.12 - import QtQuick.Controls 2.12 - import QtQuick.Controls.Universal 2.12 + import QtQuick 2.0 + import QtQuick.Controls 2.1 + import QtQuick.Controls.Universal 2.1 ApplicationWindow { visible: true diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Drawer.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,21 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.Drawer { id: control - parent: T.Overlay.overlay + parent: T.ApplicationWindow.overlay - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) topPadding: control.edge === Qt.BottomEdge leftPadding: control.edge === Qt.RightEdge @@ -58,22 +59,13 @@ exit: Transition { SmoothedAnimation { velocity: 5 } } background: Rectangle { - color: control.palette.window Rectangle { readonly property bool horizontal: control.edge === Qt.LeftEdge || control.edge === Qt.RightEdge width: horizontal ? 1 : parent.width height: horizontal ? parent.height : 1 - color: control.palette.dark + color: Default.frameDarkColor x: control.edge === Qt.LeftEdge ? parent.width - 1 : 0 y: control.edge === Qt.TopEdge ? parent.height - 1 : 0 } } - - T.Overlay.modal: Rectangle { - color: Color.transparent(control.palette.shadow, 0.5) - } - - T.Overlay.modeless: Rectangle { - color: Color.transparent(control.palette.shadow, 0.12) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Frame.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,23 +34,24 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.Frame { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 12 background: Rectangle { color: "transparent" - border.color: control.palette.mid + border.color: Default.frameLightColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ApplicationWindow.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ApplicationWindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ApplicationWindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ApplicationWindow.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.ApplicationWindow { - id: window - - color: palette.window - - overlay.modal: Rectangle { - color: Fusion.topShadow - } - - overlay.modeless: Rectangle { - color: Fusion.topShadow - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/BusyIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/BusyIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/BusyIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/BusyIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.BusyIndicator { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: 6 - - contentItem: BusyIndicatorImpl { - implicitWidth: 28 - implicitHeight: 28 - color: control.palette.text - - running: control.running - opacity: control.running ? 1 : 0 - Behavior on opacity { OpacityAnimator { duration: 250 } } - - RotationAnimator on rotation { - running: control.running || contentItem.visible - from: 0 - to: 360 - duration: 1000 - loops: Animation.Infinite - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ButtonPanel.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ButtonPanel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ButtonPanel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ButtonPanel.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -Rectangle { - id: panel - - property Item control - property bool highlighted: control.highlighted - - visible: !control.flat || control.down || control.checked - - color: Fusion.buttonColor(control.palette, panel.highlighted, control.down || control.checked, control.hovered) - gradient: control.down || control.checked ? null : buttonGradient - - Gradient { - id: buttonGradient - GradientStop { - position: 0 - color: Fusion.gradientStart(Fusion.buttonColor(control.palette, panel.highlighted, control.down, control.hovered)) - } - GradientStop { - position: 1 - color: Fusion.gradientStop(Fusion.buttonColor(control.palette, panel.highlighted, control.down, control.hovered)) - } - } - - radius: 2 - border.color: Fusion.buttonOutline(control.palette, panel.highlighted || control.visualFocus, control.enabled) - - Rectangle { - x: 1; y: 1 - width: parent.width - 2 - height: parent.height - 2 - border.color: Fusion.innerContrastLine - color: "transparent" - radius: 2 - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Button.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Button { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: 4 - spacing: 6 - - icon.width: 16 - icon.height: 16 - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon - text: control.text - font: control.font - color: control.palette.buttonText - } - - background: ButtonPanel { - implicitWidth: 80 - implicitHeight: 24 - - control: control - visible: !control.flat || control.down || control.checked || control.highlighted || control.visualFocus || control.hovered - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/CheckBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.CheckBox { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - indicator: CheckIndicator { - x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 - y: control.topPadding + (control.availableHeight - height) / 2 - control: control - } - - contentItem: Text { - leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 - - text: control.text - font: control.font - color: control.palette.windowText - elide: Text.ElideRight - verticalAlignment: Text.AlignVCenter - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/CheckDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/CheckDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/CheckDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/CheckDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.CheckDelegate { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - icon.width: 16 - icon.height: 16 - - contentItem: IconLabel { - leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0 - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.highlighted ? Fusion.highlightedText(control.palette) : control.palette.text - } - - indicator: CheckIndicator { - x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding - y: control.topPadding + (control.availableHeight - height) / 2 - - control: control - } - - background: Rectangle { - implicitWidth: 100 - implicitHeight: 20 - color: control.down ? Fusion.buttonColor(control.palette, false, true, true) - : control.highlighted ? Fusion.highlight(control.palette) : control.palette.base - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/CheckIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/CheckIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/CheckIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/CheckIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -Rectangle { - id: indicator - - property Item control - readonly property color pressedColor: Fusion.mergedColors(control.palette.base, control.palette.windowText, 85) - readonly property color checkMarkColor: Qt.darker(control.palette.text, 1.2) - - implicitWidth: 14 - implicitHeight: 14 - - color: control.down ? indicator.pressedColor : control.palette.base - border.color: control.visualFocus ? Fusion.highlightedOutline(control.palette) - : Qt.lighter(Fusion.outline(control.palette), 1.1) - - Rectangle { - x: 1; y: 1 - width: parent.width - 2 - height: 1 - color: Fusion.topShadow - visible: control.enabled && !control.down - } - - ColorImage { - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - color: Color.transparent(indicator.checkMarkColor, 210 / 255) - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Fusion/images/checkmark.png" - visible: control.checkState === Qt.Checked || (control.checked && control.checkState === undefined) - } - - Rectangle { - x: 3; y: 3 - width: parent.width - 6 - height: parent.width - 6 - - visible: control.checkState === Qt.PartiallyChecked - - gradient: Gradient { - GradientStop { - position: 0 - color: Color.transparent(indicator.checkMarkColor, 80 / 255) - } - GradientStop { - position: 1 - color: Color.transparent(indicator.checkMarkColor, 140 / 255) - } - } - border.color: Color.transparent(indicator.checkMarkColor, 180 / 255) - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ComboBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ComboBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ComboBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ComboBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,175 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.ComboBox { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) - rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) - - delegate: MenuItem { - width: parent.width - text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData - font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal - highlighted: control.highlightedIndex === index - hoverEnabled: control.hoverEnabled - } - - indicator: ColorImage { - x: control.mirrored ? control.padding : control.width - width - control.padding - y: control.topPadding + (control.availableHeight - height) / 2 - color: control.editable ? control.palette.text : control.palette.buttonText - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Fusion/images/arrow.png" - width: 20 - fillMode: Image.Pad - } - - contentItem: T.TextField { - topPadding: 4 - leftPadding: 4 - control.padding - rightPadding: 4 - control.padding - bottomPadding: 4 - - text: control.editable ? control.editText : control.displayText - - enabled: control.editable - autoScroll: control.editable - readOnly: control.down - inputMethodHints: control.inputMethodHints - validator: control.validator - - font: control.font - color: control.editable ? control.palette.text : control.palette.buttonText - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText - verticalAlignment: Text.AlignVCenter - - background: PaddedRectangle { - clip: true - radius: 2 - padding: 1 - leftPadding: control.mirrored ? -2 : padding - rightPadding: !control.mirrored ? -2 : padding - color: control.palette.base - visible: control.editable && !control.flat - - Rectangle { - x: parent.width - width - y: 1 - width: 1 - height: parent.height - 2 - color: Fusion.buttonOutline(control.palette, control.activeFocus, control.enabled) - } - - Rectangle { - x: 1 - y: 1 - width: parent.width - 3 - height: 1 - color: Fusion.topShadow - } - } - - Rectangle { - x: 1 - control.leftPadding - y: 1 - width: control.width - 2 - height: control.height - 2 - color: "transparent" - border.color: Color.transparent(Fusion.highlightedOutline(control.palette), 40 / 255) - visible: control.activeFocus - radius: 1.7 - } - } - - background: ButtonPanel { - implicitWidth: 120 - implicitHeight: 24 - - control: control - visible: !control.flat || control.down - // ### TODO: fix control.contentItem.activeFocus - highlighted: control.visualFocus || control.contentItem.activeFocus - } - - popup: T.Popup { - width: control.width - height: Math.min(contentItem.implicitHeight + 2, control.Window.height - topMargin - bottomMargin) - topMargin: 6 - bottomMargin: 6 - palette: control.palette - padding: 1 - - contentItem: ListView { - clip: true - implicitHeight: contentHeight - model: control.delegateModel - currentIndex: control.highlightedIndex - highlightRangeMode: ListView.ApplyRange - highlightMoveDuration: 0 - - T.ScrollBar.vertical: ScrollBar { } - } - - background: Rectangle { - color: popup.palette.window - border.color: Fusion.outline(control.palette) - - Rectangle { - z: -1 - x: 1; y: 1 - width: parent.width - height: parent.height - color: control.palette.shadow - opacity: 0.2 - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/DelayButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/DelayButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/DelayButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/DelayButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.DelayButton { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: 6 - - transition: Transition { - NumberAnimation { - duration: control.delay * (control.pressed ? 1.0 - control.progress : 0.3 * control.progress) - } - } - - contentItem: ItemGroup { - ClippedText { - clip: control.progress > 0 - clipX: -control.leftPadding + (control.mirrored ? 0 : control.progress * control.width) - clipWidth: control.width - visible: control.mirrored ? control.progress > 0 : control.progress < 1 - - text: control.text - font: control.font - color: control.mirrored ? control.palette.brightText : control.palette.buttonText - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - } - - ClippedText { - clip: control.progress > 0 - clipX: -control.leftPadding - clipWidth: (control.mirrored ? 1.0 - control.progress : control.progress) * control.width - visible: control.mirrored ? control.progress < 1 : control.progress > 0 - - text: control.text - font: control.font - color: control.mirrored ? control.palette.buttonText : control.palette.brightText - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - } - } - - background: ButtonPanel { - implicitWidth: 80 - implicitHeight: 24 - - control: control - highlighted: false - scale: control.mirrored ? -1 : 1 - - Rectangle { - width: control.progress * parent.width - height: parent.height - - radius: 2 - border.color: Qt.darker(Fusion.highlight(control.palette), 1.4) - gradient: Gradient { - GradientStop { - position: 0 - color: Qt.lighter(Fusion.highlight(control.palette), 1.2) - } - GradientStop { - position: 1 - color: Fusion.highlight(control.palette) - } - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/DialogButtonBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/DialogButtonBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/DialogButtonBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/DialogButtonBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.DialogButtonBox { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - spacing: 6 - padding: 6 - alignment: Qt.AlignRight - - delegate: Button { } - - contentItem: ListView { - model: control.contentModel - spacing: control.spacing - orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds - snapMode: ListView.SnapToItem - } - - background: Rectangle { - implicitHeight: 32 - x: 1; y: 1 - width: parent.width - 2 - height: parent.height - 2 - color: control.palette.window - radius: 2 - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Dialog.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Dialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Dialog { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitHeaderWidth, - implicitFooterWidth) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding - + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) - + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) - - padding: 6 - - background: Rectangle { - color: control.palette.window - border.color: control.palette.mid - radius: 2 - - Rectangle { - z: -1 - x: 1; y: 1 - width: parent.width - height: parent.height - color: control.palette.shadow - opacity: 0.2 - radius: 2 - } - } - - header: Label { - text: control.title - visible: control.title - elide: Label.ElideRight - font.bold: true - padding: 6 - background: Rectangle { - x: 1; y: 1 - width: parent.width - 2 - height: parent.height - 1 - color: control.palette.window - radius: 2 - } - } - - footer: DialogButtonBox { - visible: count > 0 - } - - T.Overlay.modal: Rectangle { - color: Fusion.topShadow - } - - T.Overlay.modeless: Rectangle { - color: Fusion.topShadow - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Dial.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Dial.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Dial { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) || 100 // ### remove 100 in Qt 6 - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) || 100 // ### remove 100 in Qt 6 - - background: DialImpl { - implicitWidth: 100 - implicitHeight: 100 - palette: control.palette - highlight: control.visualFocus - } - - handle: KnobImpl { - x: background.x + background.width / 2 - handle.width / 2 - y: background.y + background.height / 2 - handle.height / 2 - width: control.width / 7 - height: control.height / 7 - palette: control.palette - transform: [ - Translate { - y: -Math.min(background.width, background.height) * 0.42 + handle.height - }, - Rotation { - angle: control.angle - origin.x: handle.width / 2 - origin.y: handle.height / 2 - } - ] - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Drawer.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Drawer.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Drawer { - id: control - - parent: T.Overlay.overlay - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topPadding: control.edge === Qt.BottomEdge - leftPadding: control.edge === Qt.RightEdge - rightPadding: control.edge === Qt.LeftEdge - bottomPadding: control.edge === Qt.TopEdge - - enter: Transition { SmoothedAnimation { velocity: 5 } } - exit: Transition { SmoothedAnimation { velocity: 5 } } - - background: Rectangle { - color: control.palette.window - readonly property bool horizontal: control.edge === Qt.LeftEdge || control.edge === Qt.RightEdge - Rectangle { - width: parent.horizontal ? 1 : parent.width - height: parent.horizontal ? parent.height : 1 - color: control.palette.mid - x: control.edge === Qt.LeftEdge ? parent.width - 1 : 0 - y: control.edge === Qt.TopEdge ? parent.height - 1 : 0 - } - Rectangle { - width: parent.horizontal ? 1 : parent.width - height: parent.horizontal ? parent.height : 1 - color: control.palette.shadow - opacity: 0.2 - x: control.edge === Qt.LeftEdge ? parent.width : 0 - y: control.edge === Qt.TopEdge ? parent.height : 0 - } - } - - T.Overlay.modal: Rectangle { - color: Fusion.topShadow - } - - T.Overlay.modeless: Rectangle { - color: Fusion.topShadow - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Frame.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Frame.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Frame { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - padding: 9 - - background: Rectangle { - color: "transparent" - border.color: Qt.lighter(Fusion.outline(control.palette), 1.08) - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/fusion.pri qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/fusion.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/fusion.pri 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/fusion.pri 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -HEADERS += \ - $$PWD/qquickfusionbusyindicator_p.h \ - $$PWD/qquickfusiondial_p.h \ - $$PWD/qquickfusionknob_p.h \ - $$PWD/qquickfusionstyle_p.h \ - $$PWD/qquickfusiontheme_p.h - -SOURCES += \ - $$PWD/qquickfusionbusyindicator.cpp \ - $$PWD/qquickfusiondial.cpp \ - $$PWD/qquickfusionknob.cpp \ - $$PWD/qquickfusionstyle.cpp \ - $$PWD/qquickfusiontheme.cpp - -QML_FILES += \ - $$PWD/ApplicationWindow.qml \ - $$PWD/BusyIndicator.qml \ - $$PWD/Button.qml \ - $$PWD/ButtonPanel.qml \ - $$PWD/CheckBox.qml \ - $$PWD/CheckDelegate.qml \ - $$PWD/CheckIndicator.qml \ - $$PWD/ComboBox.qml \ - $$PWD/DelayButton.qml \ - $$PWD/Dial.qml \ - $$PWD/Dialog.qml \ - $$PWD/DialogButtonBox.qml \ - $$PWD/Drawer.qml \ - $$PWD/Frame.qml \ - $$PWD/GroupBox.qml \ - $$PWD/ItemDelegate.qml \ - $$PWD/Label.qml \ - $$PWD/Menu.qml \ - $$PWD/MenuBar.qml \ - $$PWD/MenuBarItem.qml \ - $$PWD/MenuItem.qml \ - $$PWD/MenuSeparator.qml \ - $$PWD/Page.qml \ - $$PWD/PageIndicator.qml \ - $$PWD/Pane.qml \ - $$PWD/Popup.qml \ - $$PWD/ProgressBar.qml \ - $$PWD/RadioButton.qml \ - $$PWD/RadioDelegate.qml \ - $$PWD/RadioIndicator.qml \ - $$PWD/RangeSlider.qml \ - $$PWD/RoundButton.qml \ - $$PWD/ScrollBar.qml \ - $$PWD/ScrollIndicator.qml \ - $$PWD/Slider.qml \ - $$PWD/SliderGroove.qml \ - $$PWD/SliderHandle.qml \ - $$PWD/SpinBox.qml \ - $$PWD/SwipeDelegate.qml \ - $$PWD/SwitchDelegate.qml \ - $$PWD/SwitchIndicator.qml \ - $$PWD/Switch.qml \ - $$PWD/TabBar.qml \ - $$PWD/TabButton.qml \ - $$PWD/TextArea.qml \ - $$PWD/TextField.qml \ - $$PWD/ToolBar.qml \ - $$PWD/ToolButton.qml \ - $$PWD/ToolSeparator.qml \ - $$PWD/ToolTip.qml \ - $$PWD/Tumbler.qml diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/fusion.pro qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/fusion.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/fusion.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/fusion.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -TARGET = qtquickcontrols2fusionstyleplugin -TARGETPATH = QtQuick/Controls.2/Fusion -IMPORT_VERSION = 2.5 - -QT += qml quick -QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private - -DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII - -include(fusion.pri) - -OTHER_FILES += \ - qmldir \ - $$QML_FILES - -SOURCES += \ - $$PWD/qtquickcontrols2fusionstyleplugin.cpp - -RESOURCES += \ - $$PWD/qtquickcontrols2fusionstyle.qrc - -CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler -load(qml_plugin) - -requires(qtConfig(quickcontrols2-fusion)) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/GroupBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/GroupBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/GroupBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/GroupBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.GroupBox { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitLabelWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - spacing: 6 - padding: 9 - topPadding: padding + (implicitLabelWidth > 0 ? implicitLabelHeight + spacing : 0) - - label: Text { - x: control.leftPadding - width: control.availableWidth - - text: control.title - font: control.font - color: control.palette.windowText - elide: Text.ElideRight - verticalAlignment: Text.AlignVCenter - } - - background: Rectangle { - y: control.topPadding - control.bottomPadding - width: parent.width - height: parent.height - control.topPadding + control.bottomPadding - - radius: 2 - color: Color.transparent("black", 3 / 255) - border.color: Qt.lighter(Fusion.outline(control.palette), 1.08) - } -} Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/arrow@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/arrow@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/arrow@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/arrow@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/arrow@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/arrow@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/arrow.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/arrow.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/arrow.svg qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/arrow.svg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/arrow.svg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/arrow.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/checkmark@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/checkmark@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/checkmark@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/checkmark@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/checkmark@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/checkmark@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/checkmark.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/checkmark.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/checkmark.svg qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/checkmark.svg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/checkmark.svg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/checkmark.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/progressmask@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/progressmask@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/progressmask@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/progressmask@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/progressmask@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/progressmask@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/progressmask.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/progressmask.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/progressmask.svg qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/progressmask.svg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/images/progressmask.svg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/images/progressmask.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ItemDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ItemDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ItemDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ItemDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.ItemDelegate { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - icon.width: 16 - icon.height: 16 - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.highlighted ? Fusion.highlightedText(control.palette) : control.palette.text - } - - background: Rectangle { - implicitWidth: 100 - implicitHeight: 20 - color: control.down ? Fusion.buttonColor(control.palette, false, true, true) - : control.highlighted ? Fusion.highlight(control.palette) : control.palette.base - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Label.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Label.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Label { - id: control - - color: control.palette.windowText - linkColor: control.palette.link -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/MenuBarItem.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/MenuBarItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/MenuBarItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/MenuBarItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.MenuBarItem { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - icon.width: 16 - icon.height: 16 - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.down || control.highlighted ? Fusion.highlightedText(control.palette) : control.palette.text - } - - background: Rectangle { - implicitWidth: 20 - implicitHeight: 20 - - color: Fusion.highlight(control.palette) - visible: control.down || control.highlighted - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/MenuBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/MenuBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/MenuBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/MenuBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.MenuBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - delegate: MenuBarItem { } - - contentItem: Row { - spacing: control.spacing - Repeater { - model: control.contentModel - } - } - - background: Rectangle { - implicitHeight: 20 - - color: control.palette.window - - Rectangle { - y: parent.height - height - width: parent.width - height: 1 - color: Fusion.mergedColors(Qt.darker(control.palette.window, 1.2), - Qt.lighter(Fusion.outline(control.palette), 1.4), 60) - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/MenuItem.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/MenuItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/MenuItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/MenuItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.MenuItem { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - icon.width: 16 - icon.height: 16 - - contentItem: IconLabel { - readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0 - readonly property real indicatorPadding: control.checkable && control.indicator ? control.indicator.width + control.spacing : 0 - leftPadding: !control.mirrored ? indicatorPadding : arrowPadding - rightPadding: control.mirrored ? indicatorPadding : arrowPadding - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.down || control.highlighted ? Fusion.highlightedText(control.palette) : control.palette.text - } - - arrow: ColorImage { - x: control.mirrored ? control.padding : control.width - width - control.padding - y: control.topPadding + (control.availableHeight - height) / 2 - width: 20 - - visible: control.subMenu - rotation: control.mirrored ? 90 : -90 - color: control.down || control.hovered || control.highlighted ? Fusion.highlightedText(control.palette) : control.palette.text - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Fusion/images/arrow.png" - fillMode: Image.Pad - } - - indicator: CheckIndicator { - x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding - y: control.topPadding + (control.availableHeight - height) / 2 - - control: control - visible: control.checkable - } - - background: Rectangle { - implicitWidth: 200 - implicitHeight: 20 - - color: Fusion.highlight(control.palette) - visible: control.down || control.highlighted - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Menu.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Menu.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 -import QtQuick.Window 2.12 - -T.Menu { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - margins: 0 - padding: 1 - overlap: 2 - - delegate: MenuItem { } - - contentItem: ListView { - implicitHeight: contentHeight - model: control.contentModel - interactive: Window.window ? contentHeight > Window.window.height : false - clip: true - currentIndex: control.currentIndex - - ScrollIndicator.vertical: ScrollIndicator {} - } - - background: Rectangle { - implicitWidth: 200 - implicitHeight: 20 - - color: control.palette.base - border.color: Fusion.outline(control.palette) - - Rectangle { - z: -1 - x: 1; y: 1 - width: parent.width - height: parent.height - color: control.palette.shadow - opacity: 0.2 - } - } - - T.Overlay.modal: Rectangle { - color: Fusion.topShadow - } - - T.Overlay.modeless: Rectangle { - color: Fusion.topShadow - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/MenuSeparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/MenuSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/MenuSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/MenuSeparator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.MenuSeparator { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: 5 - verticalPadding: 1 - - contentItem: Rectangle { - implicitWidth: 188 - implicitHeight: 1 - color: Qt.lighter(Fusion.darkShade, 1.06) - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/PageIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.PageIndicator { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: 4 - spacing: 4 - - delegate: Rectangle { - implicitWidth: 6 - implicitHeight: 6 - - radius: width / 2 - color: control.palette.shadow - - opacity: index === currentIndex ? 0.95 : pressed ? 0.75 : 0.45 - Behavior on opacity { OpacityAnimator { duration: 100 } } - } - - contentItem: Row { - spacing: control.spacing - - Repeater { - model: control.count - delegate: control.delegate - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Page.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Page.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Page { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitHeaderWidth, - implicitFooterWidth) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding - + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) - + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) - - background: Rectangle { - color: palette.window - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Pane.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Pane.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Pane { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - padding: 9 - - background: Rectangle { - color: palette.window - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/plugins.qmltypes qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/plugins.qmltypes --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/plugins.qmltypes 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/plugins.qmltypes 1970-01-01 00:00:00.000000000 +0000 @@ -1,146 +0,0 @@ -import QtQuick.tooling 1.2 - -// This file describes the plugin-supplied types contained in the library. -// It is used for QML tooling purposes only. -// -// This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Controls.Fusion 2.3' - -Module { - dependencies: [ ] - Component { - name: "QQuickFusionBusyIndicator" - defaultProperty: "data" - prototype: "QQuickPaintedItem" - exports: ["QtQuick.Controls.Fusion.impl/BusyIndicatorImpl 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "color"; type: "QColor" } - Property { name: "running"; type: "bool" } - } - Component { - name: "QQuickFusionDial" - defaultProperty: "data" - prototype: "QQuickPaintedItem" - exports: ["QtQuick.Controls.Fusion.impl/DialImpl 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "highlight"; type: "bool" } - Property { name: "palette"; type: "QPalette" } - } - Component { - name: "QQuickFusionKnob" - defaultProperty: "data" - prototype: "QQuickPaintedItem" - exports: ["QtQuick.Controls.Fusion.impl/KnobImpl 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "palette"; type: "QPalette" } - } - Component { - name: "QQuickFusionStyle" - prototype: "QObject" - exports: ["QtQuick.Controls.Fusion.impl/Fusion 2.3"] - isCreatable: false - isSingleton: true - exportMetaObjectRevisions: [0] - Property { name: "lightShade"; type: "QColor"; isReadonly: true } - Property { name: "darkShade"; type: "QColor"; isReadonly: true } - Property { name: "topShadow"; type: "QColor"; isReadonly: true } - Property { name: "innerContrastLine"; type: "QColor"; isReadonly: true } - Method { - name: "highlight" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - } - Method { - name: "highlightedText" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - } - Method { - name: "outline" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - } - Method { - name: "highlightedOutline" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - } - Method { - name: "tabFrameColor" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - } - Method { - name: "buttonColor" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - Parameter { name: "highlighted"; type: "bool" } - Parameter { name: "down"; type: "bool" } - Parameter { name: "hovered"; type: "bool" } - } - Method { - name: "buttonColor" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - Parameter { name: "highlighted"; type: "bool" } - Parameter { name: "down"; type: "bool" } - } - Method { - name: "buttonColor" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - Parameter { name: "highlighted"; type: "bool" } - } - Method { - name: "buttonColor" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - } - Method { - name: "buttonOutline" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - Parameter { name: "highlighted"; type: "bool" } - Parameter { name: "enabled"; type: "bool" } - } - Method { - name: "buttonOutline" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - Parameter { name: "highlighted"; type: "bool" } - } - Method { - name: "buttonOutline" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - } - Method { - name: "gradientStart" - type: "QColor" - Parameter { name: "baseColor"; type: "QColor" } - } - Method { - name: "gradientStop" - type: "QColor" - Parameter { name: "baseColor"; type: "QColor" } - } - Method { - name: "mergedColors" - type: "QColor" - Parameter { name: "colorA"; type: "QColor" } - Parameter { name: "colorB"; type: "QColor" } - Parameter { name: "factor"; type: "int" } - } - Method { - name: "mergedColors" - type: "QColor" - Parameter { name: "colorA"; type: "QColor" } - Parameter { name: "colorB"; type: "QColor" } - } - Method { - name: "grooveColor" - type: "QColor" - Parameter { name: "palette"; type: "QPalette" } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Popup.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Popup.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Popup { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - padding: 6 - - background: Rectangle { - color: control.palette.window - border.color: control.palette.mid - radius: 2 - } - - T.Overlay.modal: Rectangle { - color: Fusion.topShadow - } - - T.Overlay.modeless: Rectangle { - color: Fusion.topShadow - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ProgressBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ProgressBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ProgressBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ProgressBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.ProgressBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - contentItem: Item { - implicitWidth: 120 - implicitHeight: 24 - scale: control.mirrored ? -1 : 1 - - Rectangle { - height: parent.height - width: (control.indeterminate ? 1.0 : control.position) * parent.width - - radius: 2 - border.color: Qt.darker(Fusion.highlight(control.palette), 1.4) - gradient: Gradient { - GradientStop { - position: 0 - color: Qt.lighter(Fusion.highlight(control.palette), 1.2) - } - GradientStop { - position: 1 - color: Fusion.highlight(control.palette) - } - } - } - - Item { - x: 1; y: 1 - width: parent.width - 2 - height: parent.height - 2 - visible: control.indeterminate - clip: true - - ColorImage { - width: Math.ceil(parent.width / implicitWidth + 1) * implicitWidth - height: parent.height - - mirror: control.mirrored - fillMode: Image.TileHorizontally - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Fusion/images/progressmask.png" - color: Color.transparent(Qt.lighter(Fusion.highlight(control.palette), 1.2), 160 / 255) - - visible: control.indeterminate - NumberAnimation on x { - running: control.indeterminate && control.visible - from: -31 // progressmask.png width - to: 0 - loops: Animation.Infinite - duration: 750 - } - } - } - } - - background: Rectangle { - implicitWidth: 120 - implicitHeight: 24 - - radius: 2 - color: control.palette.base - border.color: Fusion.outline(control.palette) - - Rectangle { - x: 1; y: 1; height: 1 - width: parent.width - 2 - color: Fusion.topShadow - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qmldir qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qmldir --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qmldir 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qmldir 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -module QtQuick.Controls.Fusion -plugin qtquickcontrols2fusionstyleplugin -classname QtQuickControls2FusionStylePlugin -depends QtQuick.Controls 2.5 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionbusyindicator.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionbusyindicator.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionbusyindicator.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionbusyindicator.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickfusionbusyindicator_p.h" - -#include - -QT_BEGIN_NAMESPACE - -QQuickFusionBusyIndicator::QQuickFusionBusyIndicator(QQuickItem *parent) - : QQuickPaintedItem(parent) -{ -} - -QColor QQuickFusionBusyIndicator::color() const -{ - return m_color; -} - -void QQuickFusionBusyIndicator::setColor(const QColor &color) -{ - if (color == m_color) - return; - - m_color = color; - update(); -} - -bool QQuickFusionBusyIndicator::isRunning() const -{ - return isVisible(); -} - -void QQuickFusionBusyIndicator::setRunning(bool running) -{ - if (running) { - setVisible(true); - update(); - } -} - -void QQuickFusionBusyIndicator::paint(QPainter *painter) -{ - const qreal w = width(); - const qreal h = height(); - if (w <= 0 || h <= 0 || !isRunning()) - return; - - const qreal sz = qMin(w, h); - const qreal dx = (w - sz) / 2; - const qreal dy = (h - sz) / 2; - const int hpw = qRound(qMax(qreal(1), sz / 14)) & -1; - const int pw = 2 * hpw; - const QRectF bounds(dx + hpw, dy + hpw, sz - pw - 1, sz - pw - 1); - - QConicalGradient gradient; - gradient.setCenter(QPointF(dx + sz / 2, dy + sz / 2)); - gradient.setColorAt(0, m_color); - gradient.setColorAt(0.1, m_color); - gradient.setColorAt(1, Qt::transparent); - - painter->translate(0.5, 0.5); - painter->setRenderHint(QPainter::Antialiasing, true); - painter->setPen(QPen(gradient, pw, Qt::SolidLine)); - painter->drawArc(bounds, 0, 360 * 16); - painter->setPen(QPen(m_color, pw, Qt::SolidLine, Qt::RoundCap)); - painter->drawArc(bounds, 0, 20 * 16); -} - -void QQuickFusionBusyIndicator::itemChange(ItemChange change, const ItemChangeData &data) -{ - QQuickPaintedItem::itemChange(change, data); - - if (change == ItemOpacityHasChanged && qFuzzyIsNull(data.realValue)) - setVisible(false); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionbusyindicator_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionbusyindicator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionbusyindicator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionbusyindicator_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKFUSIONBUSYINDICATOR_P_H -#define QQUICKFUSIONBUSYINDICATOR_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickFusionBusyIndicator : public QQuickPaintedItem -{ - Q_OBJECT - Q_PROPERTY(QColor color READ color WRITE setColor FINAL) - Q_PROPERTY(bool running READ isRunning WRITE setRunning) - -public: - explicit QQuickFusionBusyIndicator(QQuickItem *parent = nullptr); - - QColor color() const; - void setColor(const QColor &color); - - bool isRunning() const; - void setRunning(bool running); - - void paint(QPainter *painter) override; - -protected: - void itemChange(ItemChange change, const ItemChangeData &data) override; - -private: - QColor m_color; -}; - -QT_END_NAMESPACE - -#endif // QQUICKFUSIONBUSYINDICATOR_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusiondial.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusiondial.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusiondial.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusiondial.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,151 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickfusiondial_p.h" - -#include -#include - -QT_BEGIN_NAMESPACE - -QQuickFusionDial::QQuickFusionDial(QQuickItem *parent) - : QQuickPaintedItem(parent) -{ -} - -bool QQuickFusionDial::highlight() const -{ - return m_highlight; -} - -void QQuickFusionDial::setHighlight(bool highlight) -{ - if (m_highlight == highlight) - return; - - m_highlight = highlight; - update(); -} - -QPalette QQuickFusionDial::palette() const -{ - return m_palette; -} - -void QQuickFusionDial::setPalette(const QPalette &palette) -{ - if (palette == m_palette) - return; - - m_palette = palette; - update(); -} - -// based on QStyleHelper::drawDial() -void QQuickFusionDial::paint(QPainter *painter) -{ - const int width = QQuickItem::width(); - const int height = QQuickItem::height(); - if (width <= 0 || height <= 0 || !isVisible()) - return; - - QColor buttonColor = m_palette.button().color(); - const bool enabled = isEnabled(); - qreal r = qMin(width, height) / 2; - r -= r/50; - const qreal penSize = r/20.0; - - painter->setRenderHint(QPainter::Antialiasing); - - const qreal d_ = r / 6; - const qreal dx = d_ + (width - 2 * r) / 2 + 1; - const qreal dy = d_ + (height - 2 * r) / 2 + 1; - - QRectF br = QRectF(dx + 0.5, dy + 0.5, - int(r * 2 - 2 * d_ - 2), - int(r * 2 - 2 * d_ - 2)); - buttonColor.setHsv(buttonColor .hue(), - qMin(140, buttonColor .saturation()), - qMax(180, buttonColor.value())); - - if (enabled) { - // Drop shadow - qreal shadowSize = qMax(1.0, penSize/2.0); - QRectF shadowRect= br.adjusted(-2*shadowSize, -2*shadowSize, - 2*shadowSize, 2*shadowSize); - QRadialGradient shadowGradient(shadowRect.center().x(), - shadowRect.center().y(), shadowRect.width()/2.0, - shadowRect.center().x(), shadowRect.center().y()); - shadowGradient.setColorAt(qreal(0.91), QColor(0, 0, 0, 40)); - shadowGradient.setColorAt(qreal(1.0), Qt::transparent); - painter->setBrush(shadowGradient); - painter->setPen(Qt::NoPen); - painter->translate(shadowSize, shadowSize); - painter->drawEllipse(shadowRect); - painter->translate(-shadowSize, -shadowSize); - - // Main gradient - QRadialGradient gradient(br.center().x() - br.width()/3, dy, - br.width()*1.3, br.center().x(), - br.center().y() - br.height()/2); - gradient.setColorAt(0, buttonColor.lighter(110)); - gradient.setColorAt(qreal(0.5), buttonColor); - gradient.setColorAt(qreal(0.501), buttonColor.darker(102)); - gradient.setColorAt(1, buttonColor.darker(115)); - painter->setBrush(gradient); - } else { - painter->setBrush(Qt::NoBrush); - } - - painter->setPen(QPen(buttonColor.darker(280))); - painter->drawEllipse(br); - painter->setBrush(Qt::NoBrush); - painter->setPen(buttonColor.lighter(110)); - painter->drawEllipse(br.adjusted(1, 1, -1, -1)); - - if (m_highlight) { - QColor highlight = m_palette.highlight().color(); - highlight.setHsv(highlight.hue(), - qMin(160, highlight.saturation()), - qMax(230, highlight.value())); - highlight.setAlpha(127); - painter->setPen(QPen(highlight, 2.0)); - painter->setBrush(Qt::NoBrush); - painter->drawEllipse(br.adjusted(-1, -1, 1, 1)); - } -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusiondial_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusiondial_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusiondial_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusiondial_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKFUSIONDIAL_P_H -#define QQUICKFUSIONDIAL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickFusionDial : public QQuickPaintedItem -{ - Q_OBJECT - Q_PROPERTY(bool highlight READ highlight WRITE setHighlight FINAL) - Q_PROPERTY(QPalette palette READ palette WRITE setPalette FINAL) - -public: - explicit QQuickFusionDial(QQuickItem *parent = nullptr); - - bool highlight() const; - void setHighlight(bool highlight); - - QPalette palette() const; - void setPalette(const QPalette &palette); - - void paint(QPainter *painter) override; - -private: - bool m_highlight = false; - QPalette m_palette; -}; - -QT_END_NAMESPACE - -#endif // QQUICKFUSIONDIAL_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionknob.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionknob.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionknob.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionknob.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickfusionknob_p.h" - -#include -#include - -QT_BEGIN_NAMESPACE - -QQuickFusionKnob::QQuickFusionKnob(QQuickItem *parent) - : QQuickPaintedItem(parent) -{ -} - -QPalette QQuickFusionKnob::palette() const -{ - return m_palette; -} - -void QQuickFusionKnob::setPalette(const QPalette &palette) -{ - if (palette == m_palette) - return; - - m_palette = palette; - update(); -} - -// extracted from QStyleHelper::drawDial() -void QQuickFusionKnob::paint(QPainter *painter) -{ - const qreal w = width(); - const qreal h = height(); - if (w <= 0 || h <= 0) - return; - - QColor color = m_palette.color(QPalette::Button); - color.setHsv(color.hue(), - qMin(140, color .saturation()), - qMax(180, color.value())); - color = color.lighter(104); - color.setAlphaF(qreal(0.8)); - - const qreal sz = qMin(w, h); - QRectF rect(0, 0, sz, sz); - rect.moveCenter(QPointF(w / 2.0, h / 2.0)); - const QPointF center = rect.center(); - - QRadialGradient gradient(center.x() + rect.width() / 2, - center.y() + rect.width(), - rect.width() * 2, - center.x(), center.y()); - gradient.setColorAt(1, color.darker(140)); - gradient.setColorAt(qreal(0.4), color.darker(120)); - gradient.setColorAt(0, color.darker(110)); - - painter->setRenderHint(QPainter::Antialiasing); - painter->setBrush(gradient); - painter->setPen(QColor(255, 255, 255, 150)); - painter->drawEllipse(rect); - painter->setPen(QColor(0, 0, 0, 80)); - painter->drawEllipse(rect.adjusted(1, 1, -1, -1)); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionknob_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionknob_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionknob_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionknob_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKFUSIONKNOB_P_H -#define QQUICKFUSIONKNOB_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickFusionKnob : public QQuickPaintedItem -{ - Q_OBJECT - Q_PROPERTY(QPalette palette READ palette WRITE setPalette FINAL) - -public: - explicit QQuickFusionKnob(QQuickItem *parent = nullptr); - - QPalette palette() const; - void setPalette(const QPalette &palette); - - void paint(QPainter *painter) override; - -private: - QPalette m_palette; -}; - -QT_END_NAMESPACE - -#endif // QQUICKFUSIONKNOB_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionstyle.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionstyle.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionstyle.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionstyle.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,153 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickfusionstyle_p.h" - -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -QQuickFusionStyle::QQuickFusionStyle(QObject *parent) - : QObject(parent) -{ -} - -QColor QQuickFusionStyle::lightShade() -{ - return QColor(255, 255, 255, 90); -} - -QColor QQuickFusionStyle::darkShade() -{ - return QColor(0, 0, 0, 60); -} - -QColor QQuickFusionStyle::topShadow() -{ - return QColor(0, 0, 0, 18); -} - -QColor QQuickFusionStyle::innerContrastLine() -{ - return QColor(255, 255, 255, 30); -} - -QColor QQuickFusionStyle::highlight(const QPalette &palette) -{ - return palette.color(QPalette::Highlight); -} - -QColor QQuickFusionStyle::highlightedText(const QPalette &palette) -{ - return palette.color(QPalette::HighlightedText); -} - -QColor QQuickFusionStyle::outline(const QPalette &palette) -{ - if (palette.window().style() == Qt::TexturePattern) - return QColor(0, 0, 0, 160); - return palette.background().color().darker(140); -} - -QColor QQuickFusionStyle::highlightedOutline(const QPalette &palette) -{ - QColor highlightedOutline = highlight(palette).darker(125); - if (highlightedOutline.value() > 160) - highlightedOutline.setHsl(highlightedOutline.hue(), highlightedOutline.saturation(), 160); - return highlightedOutline; -} - -QColor QQuickFusionStyle::tabFrameColor(const QPalette &palette) -{ - if (palette.window().style() == Qt::TexturePattern) - return QColor(255, 255, 255, 8); - return buttonColor(palette).lighter(104); -} - -QColor QQuickFusionStyle::buttonColor(const QPalette &palette, bool highlighted, bool down, bool hovered) -{ - QColor buttonColor = palette.button().color(); - int val = qGray(buttonColor.rgb()); - buttonColor = buttonColor.lighter(100 + qMax(1, (180 - val)/6)); - buttonColor.setHsv(buttonColor.hue(), buttonColor.saturation() * 0.75, buttonColor.value()); - if (highlighted) - buttonColor = mergedColors(buttonColor, highlightedOutline(palette).lighter(130), 90); - if (!hovered) - buttonColor = buttonColor.darker(104); - if (down) - buttonColor = buttonColor.darker(110); - return buttonColor; -} - -QColor QQuickFusionStyle::buttonOutline(const QPalette &palette, bool highlighted, bool enabled) -{ - QColor darkOutline = enabled && highlighted ? highlightedOutline(palette) : outline(palette); - return !enabled ? darkOutline.lighter(115) : darkOutline; -} - -QColor QQuickFusionStyle::gradientStart(const QColor &baseColor) -{ - return baseColor.lighter(124); -} - -QColor QQuickFusionStyle::gradientStop(const QColor &baseColor) -{ - return baseColor.lighter(102); -} - -QColor QQuickFusionStyle::mergedColors(const QColor &colorA, const QColor &colorB, int factor) -{ - const int maxFactor = 100; - QColor tmp = colorA; - tmp.setRed((tmp.red() * factor) / maxFactor + (colorB.red() * (maxFactor - factor)) / maxFactor); - tmp.setGreen((tmp.green() * factor) / maxFactor + (colorB.green() * (maxFactor - factor)) / maxFactor); - tmp.setBlue((tmp.blue() * factor) / maxFactor + (colorB.blue() * (maxFactor - factor)) / maxFactor); - return tmp; -} - -QColor QQuickFusionStyle::grooveColor(const QPalette &palette) -{ - QColor color = buttonColor(palette); - color.setHsv(color.hue(), - qMin(255, color.saturation()), - qMin(255, color.value() * 0.9)); - return color; -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionstyle_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionstyle_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusionstyle_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusionstyle_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKFUSIONSTYLE_P_H -#define QQUICKFUSIONSTYLE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickFusionStyle : public QObject -{ - Q_OBJECT - Q_PROPERTY(QColor lightShade READ lightShade CONSTANT) - Q_PROPERTY(QColor darkShade READ darkShade CONSTANT) - Q_PROPERTY(QColor topShadow READ topShadow CONSTANT) - Q_PROPERTY(QColor innerContrastLine READ innerContrastLine CONSTANT) - -public: - explicit QQuickFusionStyle(QObject *parent = nullptr); - - static QColor lightShade(); - static QColor darkShade(); - static QColor topShadow(); - static QColor innerContrastLine(); - - Q_INVOKABLE static QColor highlight(const QPalette &palette); - Q_INVOKABLE static QColor highlightedText(const QPalette &palette); - Q_INVOKABLE static QColor outline(const QPalette &palette); - Q_INVOKABLE static QColor highlightedOutline(const QPalette &palette); - Q_INVOKABLE static QColor tabFrameColor(const QPalette &palette); - Q_INVOKABLE static QColor buttonColor(const QPalette &palette, bool highlighted = false, bool down = false, bool hovered = false); - Q_INVOKABLE static QColor buttonOutline(const QPalette &palette, bool highlighted = false, bool enabled = true); - Q_INVOKABLE static QColor gradientStart(const QColor &baseColor); - Q_INVOKABLE static QColor gradientStop(const QColor &baseColor); - Q_INVOKABLE static QColor mergedColors(const QColor &colorA, const QColor &colorB, int factor = 50); - Q_INVOKABLE static QColor grooveColor(const QPalette &palette); -}; - -QT_END_NAMESPACE - -#endif // QQUICKFUSIONSTYLE_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusiontheme.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusiontheme.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusiontheme.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusiontheme.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickfusiontheme_p.h" - -#include -#include - -QT_BEGIN_NAMESPACE - -void QQuickFusionTheme::initialize(QQuickTheme *theme) -{ - const bool isDarkSystemTheme = QQuickStylePrivate::isDarkSystemTheme(); - QPalette systemPalette; - systemPalette.setColor(QPalette::Active, QPalette::ButtonText, - isDarkSystemTheme ? QColor::fromRgb(0xe7e7e7) : QColor::fromRgb(0x252525)); - systemPalette.setColor(QPalette::Disabled, QPalette::ButtonText, - isDarkSystemTheme ? QColor::fromRgb(0x777777) : QColor::fromRgb(0xb6b6b6)); - theme->setPalette(QQuickTheme::System, systemPalette); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusiontheme_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusiontheme_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qquickfusiontheme_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qquickfusiontheme_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKFUSIONTHEME_P_H -#define QQUICKFUSIONTHEME_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -QT_BEGIN_NAMESPACE - -class QQuickTheme; - -class QQuickFusionTheme -{ -public: - static void initialize(QQuickTheme *theme); -}; - -QT_END_NAMESPACE - -#endif // QQUICKFUSIONTHEME_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#include "qquickfusionbusyindicator_p.h" -#include "qquickfusiondial_p.h" -#include "qquickfusionknob_p.h" -#include "qquickfusionstyle_p.h" -#include "qquickfusiontheme_p.h" - -QT_BEGIN_NAMESPACE - -static QObject *styleSingleton(QQmlEngine *engine, QJSEngine *scriptEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new QQuickFusionStyle; -} - -class QtQuickControls2FusionStylePlugin: public QQuickStylePlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) - -public: - QtQuickControls2FusionStylePlugin(QObject *parent = nullptr); - - void registerTypes(const char *uri) override; - - QString name() const override; - void initializeTheme(QQuickTheme *theme) override; -}; - -QtQuickControls2FusionStylePlugin::QtQuickControls2FusionStylePlugin(QObject *parent) : QQuickStylePlugin(parent) -{ -} - -void QtQuickControls2FusionStylePlugin::registerTypes(const char *uri) -{ - qmlRegisterModule(uri, 2, 3); // Qt 5.10->2.3 - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... - - QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... - - qmlRegisterSingletonType(import, 2, 3, "Fusion", styleSingleton); - - qmlRegisterType(import, 2, 3, "BusyIndicatorImpl"); - qmlRegisterType(import, 2, 3, "DialImpl"); - qmlRegisterType(import, 2, 3, "KnobImpl"); - - qmlRegisterType(resolvedUrl(QStringLiteral("ButtonPanel.qml")), import, 2, 3, "ButtonPanel"); - qmlRegisterType(resolvedUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 3, "CheckIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 3, "RadioIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("SliderGroove.qml")), import, 2, 3, "SliderGroove"); - qmlRegisterType(resolvedUrl(QStringLiteral("SliderHandle.qml")), import, 2, 3, "SliderHandle"); - qmlRegisterType(resolvedUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 3, "SwitchIndicator"); -} - -QString QtQuickControls2FusionStylePlugin::name() const -{ - return QStringLiteral("Fusion"); -} - -void QtQuickControls2FusionStylePlugin::initializeTheme(QQuickTheme *theme) -{ - QQuickFusionTheme::initialize(theme); -} - -QT_END_NAMESPACE - -#include "qtquickcontrols2fusionstyleplugin.moc" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qtquickcontrols2fusionstyle.qrc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qtquickcontrols2fusionstyle.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/qtquickcontrols2fusionstyle.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/qtquickcontrols2fusionstyle.qrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ - - - images/arrow.png - images/arrow@2x.png - images/arrow@3x.png - images/arrow@4x.png - images/checkmark.png - images/checkmark@2x.png - images/checkmark@3x.png - images/checkmark@4x.png - images/progressmask.png - images/progressmask@2x.png - images/progressmask@3x.png - images/progressmask@4x.png - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/RadioButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/RadioButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/RadioButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/RadioButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.RadioButton { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - indicator: RadioIndicator { - x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 - y: control.topPadding + (control.availableHeight - height) / 2 - control: control - } - - contentItem: Text { - leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 - - text: control.text - font: control.font - color: control.palette.windowText - elide: Text.ElideRight - verticalAlignment: Text.AlignVCenter - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/RadioDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/RadioDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/RadioDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/RadioDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.RadioDelegate { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - icon.width: 16 - icon.height: 16 - - contentItem: IconLabel { - leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0 - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.highlighted ? Fusion.highlightedText(control.palette) : control.palette.text - } - - indicator: RadioIndicator { - x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding - y: control.topPadding + (control.availableHeight - height) / 2 - - control: control - } - - background: Rectangle { - implicitWidth: 100 - implicitHeight: 20 - color: control.down ? Fusion.buttonColor(control.palette, false, true, true) - : control.highlighted ? Fusion.highlight(control.palette) : control.palette.base - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/RadioIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/RadioIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/RadioIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/RadioIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -Rectangle { - id: indicator - - property Item control - readonly property color pressedColor: Fusion.mergedColors(control.palette.base, control.palette.windowText, 85) - readonly property color checkMarkColor: Qt.darker(control.palette.text, 1.2) - - implicitWidth: 14 - implicitHeight: 14 - - radius: width / 2 - color: control.down ? indicator.pressedColor : control.palette.base - border.color: control.visualFocus ? Fusion.highlightedOutline(control.palette) - : Qt.darker(control.palette.window, 1.5) - - Rectangle { - y: 1 - width: parent.width - height: parent.height - 1 - radius: width / 2 - color: "transparent" - border.color: Fusion.topShadow - visible: control.enabled && !control.down - } - - Rectangle { - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - width: parent.width / 2.32 - height: parent.height / 2.32 - radius: width / 2 - color: Color.transparent(indicator.checkMarkColor, 180 / 255) - border.color: Color.transparent(indicator.checkMarkColor, 200 / 255) - visible: control.checked - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/RangeSlider.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/RangeSlider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/RangeSlider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/RangeSlider.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.RangeSlider { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - Math.max(first.implicitHandleWidth, - second.implicitHandleWidth) + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - Math.max(first.implicitHandleHeight, - second.implicitHandleHeight) + topPadding + bottomPadding) - - first.handle: SliderHandle { - x: control.leftPadding + Math.round(control.horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + Math.round(control.horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) - - palette: control.palette - pressed: control.first.pressed - hovered: control.first.hovered - vertical: control.vertical - visualFocus: activeFocus - } - - second.handle: SliderHandle { - x: control.leftPadding + Math.round(control.horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + Math.round(control.horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) - - palette: control.palette - pressed: control.second.pressed - hovered: control.second.hovered - vertical: control.vertical - visualFocus: activeFocus - } - - background: SliderGroove { - control: control - offset: control.first.position - progress: control.second.position - visualProgress: control.second.visualPosition - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/RoundButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/RoundButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/RoundButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/RoundButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.RoundButton { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - icon.width: 16 - icon.height: 16 - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon - text: control.text - font: control.font - color: control.palette.buttonText - } - - background: Rectangle { - implicitWidth: 32 - implicitHeight: 32 - visible: !control.flat || control.down || control.checked - - gradient: Gradient { - GradientStop { - position: 0 - color: control.down || control.checked ? Fusion.buttonColor(control.palette, control.highlighted, control.down || control.checked, control.hovered) - : Fusion.gradientStart(Fusion.buttonColor(control.palette, control.highlighted, control.down, control.hovered)) - } - GradientStop { - position: 1 - color: control.down || control.checked ? Fusion.buttonColor(control.palette, control.highlighted, control.down || control.checked, control.hovered) - : Fusion.gradientStop(Fusion.buttonColor(control.palette, control.highlighted, control.down, control.hovered)) - } - } - - radius: control.radius - border.color: Fusion.buttonOutline(control.palette, control.highlighted || control.visualFocus, control.enabled) - - Rectangle { - x: 1; y: 1 - width: parent.width - 2 - height: parent.height - 2 - border.color: Fusion.innerContrastLine - color: "transparent" - radius: control.radius - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ScrollBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ScrollBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ScrollBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ScrollBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.ScrollBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: 2 - visible: control.policy !== T.ScrollBar.AlwaysOff - - contentItem: Rectangle { - implicitWidth: control.interactive ? 6 : 2 - implicitHeight: control.interactive ? 6 : 2 - - radius: width / 2 - color: control.pressed ? control.palette.dark : control.palette.mid - opacity: 0.0 - - states: State { - name: "active" - when: control.policy === T.ScrollBar.AlwaysOn || (control.active && control.size < 1.0) - PropertyChanges { target: control.contentItem; opacity: 0.75 } - } - - transitions: Transition { - from: "active" - SequentialAnimation { - PauseAnimation { duration: 450 } - NumberAnimation { target: control.contentItem; duration: 200; property: "opacity"; to: 0.0 } - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ScrollIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ScrollIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ScrollIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ScrollIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.ScrollIndicator { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: 2 - - contentItem: Rectangle { - implicitWidth: 2 - implicitHeight: 2 - - color: control.palette.mid - visible: control.size < 1.0 - opacity: 0.0 - - states: State { - name: "active" - when: control.active - PropertyChanges { target: control.contentItem; opacity: 0.75 } - } - - transitions: [ - Transition { - from: "active" - SequentialAnimation { - PauseAnimation { duration: 450 } - NumberAnimation { target: control.contentItem; duration: 200; property: "opacity"; to: 0.0 } - } - } - ] - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SliderGroove.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SliderGroove.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SliderGroove.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SliderGroove.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -Rectangle { - id: groove - - property Item control - property real offset - property real progress - property real visualProgress - - x: control.horizontal ? 0 : (control.availableWidth - width) / 2 - y: control.horizontal ? (control.availableHeight - height) / 2 : 0 - - implicitWidth: control.horizontal ? 160 : 5 - implicitHeight: control.horizontal ? 5 : 160 - width: control.horizontal ? control.availableWidth : implicitWidth - height: control.horizontal ? implicitHeight : control.availableHeight - - radius: 2 - border.color: Fusion.outline(control.palette) - scale: control.horizontal && control.mirrored ? -1 : 1 - - gradient: Gradient { - GradientStop { - position: 0 - color: Qt.darker(Fusion.grooveColor(control.palette), 1.1) - } - GradientStop { - position: 1 - color: Qt.lighter(Fusion.grooveColor(control.palette), 1.1) - } - } - - Rectangle { - x: control.horizontal ? groove.offset * parent.width : 0 - y: control.horizontal ? 0 : groove.visualProgress * parent.height - width: control.horizontal ? groove.progress * parent.width - groove.offset * parent.width : 5 - height: control.horizontal ? 5 : groove.progress * parent.height - groove.offset * parent.height - - radius: 2 - border.color: Qt.darker(Fusion.highlightedOutline(control.palette), 1.1) - - gradient: Gradient { - GradientStop { - position: 0 - color: Fusion.highlight(control.palette) - } - GradientStop { - position: 1 - color: Qt.lighter(Fusion.highlight(control.palette), 1.2) - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SliderHandle.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SliderHandle.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SliderHandle.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SliderHandle.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -Rectangle { - id: handle - - property var palette - property bool pressed - property bool hovered - property bool vertical - property bool visualFocus - - implicitWidth: 13 - implicitHeight: 13 - - gradient: Gradient { - GradientStop { - position: 0 - color: Fusion.gradientStart(Fusion.buttonColor(handle.palette, handle.visualFocus, handle.pressed, handle.hovered)) - } - GradientStop { - position: 1 - color: Fusion.gradientStop(Fusion.buttonColor(handle.palette, handle.visualFocus, handle.pressed, handle.hovered)) - } - } - rotation: handle.vertical ? -90 : 0 - border.width: 1 - border.color: "transparent" - radius: 2 - - Rectangle { - width: parent.width - height: parent.height - border.color: handle.visualFocus ? Fusion.highlightedOutline(handle.palette) : Fusion.outline(handle.palette) - color: "transparent" - radius: 2 - - Rectangle { - x: 1; y: 1 - width: parent.width - 2 - height: parent.height - 2 - border.color: Fusion.innerContrastLine - color: "transparent" - radius: 2 - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Slider.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Slider.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Slider { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitHandleWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitHandleHeight + topPadding + bottomPadding) - - handle: SliderHandle { - x: control.leftPadding + Math.round(control.horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + Math.round(control.horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) - - palette: control.palette - pressed: control.pressed - hovered: control.hovered - vertical: control.vertical - visualFocus: control.visualFocus - } - - background: SliderGroove { - control: control - progress: control.position - visualProgress: control.visualPosition - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SpinBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SpinBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SpinBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SpinBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,182 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.SpinBox { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentItem.implicitWidth + 2 * padding + - Math.max(up.implicitIndicatorWidth, - down.implicitIndicatorWidth)) - implicitHeight: Math.max(implicitContentHeight + topPadding + bottomPadding, - implicitBackgroundHeight, - up.implicitIndicatorHeight + - down.implicitIndicatorHeight) - - padding: 4 - leftPadding: padding + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) - rightPadding: padding + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) - - validator: IntValidator { - locale: control.locale.name - bottom: Math.min(control.from, control.to) - top: Math.max(control.from, control.to) - } - - contentItem: TextInput { - z: 2 - text: control.displayText - - font: control.font - color: control.palette.text - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText - horizontalAlignment: Qt.AlignHCenter - verticalAlignment: Qt.AlignVCenter - - readOnly: !control.editable - validator: control.validator - inputMethodHints: control.inputMethodHints - } - - up.indicator: PaddedRectangle { - x: control.mirrored ? 1 : parent.width - width - 1 - y: 1 - height: parent.height / 2 - 1 - implicitWidth: 16 - implicitHeight: 10 - - radius: 1.7 - clip: true - topPadding: -2 - leftPadding: -2 - color: control.up.pressed ? Fusion.buttonColor(control.palette, false, true, true) : "transparent" - - ColorImage { - scale: -1 - width: parent.width - height: parent.height - opacity: enabled ? 1.0 : 0.5 - color: control.palette.buttonText - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Fusion/images/arrow.png" - fillMode: Image.Pad - } - } - - down.indicator: PaddedRectangle { - x: control.mirrored ? 1 : parent.width - width - 1 - y: parent.height - height - 1 - height: parent.height / 2 - 1 - implicitWidth: 16 - implicitHeight: 10 - - radius: 1.7 - clip: true - topPadding: -2 - leftPadding: -2 - color: control.down.pressed ? Fusion.buttonColor(control.palette, false, true, true) : "transparent" - - ColorImage { - width: parent.width - height: parent.height - opacity: enabled ? 1.0 : 0.5 - color: control.palette.buttonText - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Fusion/images/arrow.png" - fillMode: Image.Pad - } - } - - background: Rectangle { - implicitWidth: 120 - implicitHeight: 24 - - radius: 2 - color: control.palette.base - border.color: control.activeFocus ? Fusion.highlightedOutline(control.palette) : Fusion.outline(control.palette) - - Rectangle { - x: 2 - y: 1 - width: parent.width - 4 - height: 1 - color: Fusion.topShadow - } - - Rectangle { - x: control.mirrored ? 1 : parent.width - width - 1 - y: 1 - width: Math.max(up.indicator ? up.indicator.width : 0, - down.indicator ? down.indicator.width : 0) + 1 - height: parent.height - 2 - - radius: 2 - gradient: Gradient { - GradientStop { - position: 0 - color: Fusion.gradientStart(Fusion.buttonColor(control.palette, control.visualFocus, false, control.up.hovered || control.down.hovered)) - } - GradientStop { - position: 1 - color: Fusion.gradientStop(Fusion.buttonColor(control.palette, control.visualFocus, false, control.up.hovered || control.down.hovered)) - } - } - - Rectangle { - x: control.mirrored ? parent.width - 1 : 0 - height: parent.height - width: 1 - color: Fusion.outline(control.palette) - } - } - - Rectangle { - x: 1; y: 1 - width: parent.width - 2 - height: parent.height - 2 - color: "transparent" - border.color: Color.transparent(Fusion.highlightedOutline(control.palette), 40 / 255) - visible: control.activeFocus - radius: 1.7 - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SwipeDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SwipeDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SwipeDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SwipeDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.SwipeDelegate { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - icon.width: 16 - icon.height: 16 - - swipe.transition: Transition { SmoothedAnimation { velocity: 3; easing.type: Easing.InOutCubic } } - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.highlighted ? Fusion.highlightedText(control.palette) : control.palette.text - } - - background: Rectangle { - implicitWidth: 100 - implicitHeight: 20 - color: control.down ? Fusion.buttonColor(control.palette, false, true, true) - : control.highlighted ? Fusion.highlight(control.palette) : control.palette.base - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SwitchDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SwitchDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SwitchDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SwitchDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.SwitchDelegate { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - icon.width: 16 - icon.height: 16 - - indicator: SwitchIndicator { - x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 - y: control.topPadding + (control.availableHeight - height) / 2 - control: control - } - - contentItem: IconLabel { - leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0 - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.highlighted ? Fusion.highlightedText(control.palette) : control.palette.text - } - - background: Rectangle { - implicitWidth: 100 - implicitHeight: 20 - color: control.down ? Fusion.buttonColor(control.palette, false, true, true) - : control.highlighted ? Fusion.highlight(control.palette) : control.palette.base - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SwitchIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SwitchIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/SwitchIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/SwitchIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,137 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -Rectangle { - id: indicator - - property Item control - readonly property color pressedColor: Fusion.mergedColors(control.palette.base, control.palette.windowText, 85) - readonly property color checkMarkColor: Qt.darker(control.palette.text, 1.2) - - implicitWidth: 40 - implicitHeight: 16 - - radius: 2 - border.color: Fusion.outline(control.palette) - - gradient: Gradient { - GradientStop { - position: 0 - color: Qt.darker(Fusion.grooveColor(control.palette), 1.1) - } - GradientStop { - position: 1 - color: Qt.lighter(Fusion.grooveColor(control.palette), 1.1) - } - } - - Rectangle { - x: control.mirrored ? handle.x : 0 - width: control.mirrored ? parent.width - handle.x : handle.x + handle.width - height: parent.height - - opacity: control.checked ? 1 : 0 - Behavior on opacity { - enabled: !control.down - NumberAnimation { duration: 80 } - } - - radius: 2 - border.color: Qt.darker(Fusion.highlightedOutline(control.palette), 1.1) - border.width: control.enabled ? 1 : 0 - - gradient: Gradient { - GradientStop { - position: 0 - color: Fusion.highlight(control.palette) - } - GradientStop { - position: 1 - color: Qt.lighter(Fusion.highlight(control.palette), 1.2) - } - } - } - - Rectangle { - id: handle - x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2))) - y: (parent.height - height) / 2 - width: 20 - height: 16 - radius: 2 - - gradient: Gradient { - GradientStop { - position: 0 - color: Fusion.gradientStart(Fusion.buttonColor(control.palette, control.visualFocus, control.pressed, control.hovered)) - } - GradientStop { - position: 1 - color: Fusion.gradientStop(Fusion.buttonColor(control.palette, control.visualFocus, control.pressed, control.hovered)) - } - } - border.width: 1 - border.color: "transparent" - - Rectangle { - width: parent.width - height: parent.height - border.color: control.visualFocus ? Fusion.highlightedOutline(control.palette) : Fusion.outline(control.palette) - color: "transparent" - radius: 2 - - Rectangle { - x: 1; y: 1 - width: parent.width - 2 - height: parent.height - 2 - border.color: Fusion.innerContrastLine - color: "transparent" - radius: 2 - } - } - - Behavior on x { - enabled: !control.down - SmoothedAnimation { velocity: 200 } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Switch.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Switch.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Switch { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - indicator: SwitchIndicator { - x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 - y: control.topPadding + (control.availableHeight - height) / 2 - control: control - } - - contentItem: Text { - leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 - - text: control.text - font: control.font - color: control.palette.text - elide: Text.ElideRight - verticalAlignment: Text.AlignVCenter - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/TabBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/TabBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/TabBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/TabBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.TabBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - spacing: -1 - - contentItem: ListView { - model: control.contentModel - currentIndex: control.currentIndex - - spacing: control.spacing - orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds - flickableDirection: Flickable.AutoFlickIfNeeded - snapMode: ListView.SnapToItem - - highlightMoveDuration: 0 - highlightRangeMode: ListView.ApplyRange - preferredHighlightBegin: 40 - preferredHighlightEnd: width - 40 - } - - background: Item { - implicitHeight: 21 - - Rectangle { - width: parent.width - height: 1 - y: control.position === T.TabBar.Header ? parent.height - 1 : 0 - color: Fusion.outline(control.palette) - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/TabButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/TabButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/TabButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/TabButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.TabButton { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: 2 - horizontalPadding: 4 - spacing: 6 - - icon.width: 16 - icon.height: 16 - - z: checked - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon - text: control.text - font: control.font - color: control.palette.buttonText - } - - background: Rectangle { - y: control.checked || control.TabBar.position !== T.TabBar.Header ? 0 : 2 - implicitHeight: 21 - height: control.height - (control.checked ? 0 : 2) - - border.color: Qt.lighter(Fusion.outline(control.palette), 1.1) - - gradient: Gradient { - GradientStop { - position: 0 - color: control.checked ? Qt.lighter(Fusion.tabFrameColor(control.palette), 1.04) - : Qt.darker(Fusion.tabFrameColor(control.palette), 1.08) - } - GradientStop { - position: control.checked ? 0 : 0.85 - color: control.checked ? Qt.lighter(Fusion.tabFrameColor(control.palette), 1.04) - : Qt.darker(Fusion.tabFrameColor(control.palette), 1.08) - } - GradientStop { - position: 1 - color: control.checked ? Fusion.tabFrameColor(control.palette) - : Qt.darker(Fusion.tabFrameColor(control.palette), 1.16) - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/TextArea.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/TextArea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/TextArea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/TextArea.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.TextArea { - id: control - - implicitWidth: Math.max(contentWidth + leftPadding + rightPadding, - implicitBackgroundWidth + leftInset + rightInset, - placeholder.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, - implicitBackgroundHeight + topInset + bottomInset, - placeholder.implicitHeight + topPadding + bottomPadding) - - padding: 6 - leftPadding: padding + 4 - - color: control.palette.text - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText - placeholderTextColor: Color.transparent(control.color, 0.5) - - PlaceholderText { - id: placeholder - x: control.leftPadding - y: control.topPadding - width: control.width - (control.leftPadding + control.rightPadding) - height: control.height - (control.topPadding + control.bottomPadding) - - text: control.placeholderText - font: control.font - color: control.placeholderTextColor - verticalAlignment: control.verticalAlignment - visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) - elide: Text.ElideRight - renderType: control.renderType - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/TextField.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/TextField.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/TextField.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/TextField.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.TextField { - id: control - - implicitWidth: implicitBackgroundWidth + leftInset + rightInset - || Math.max(contentWidth, placeholder.implicitWidth) + leftPadding + rightPadding - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding, - placeholder.implicitHeight + topPadding + bottomPadding) - - padding: 4 - - color: control.palette.text - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText - placeholderTextColor: Color.transparent(control.color, 0.5) - verticalAlignment: TextInput.AlignVCenter - - PlaceholderText { - id: placeholder - x: control.leftPadding - y: control.topPadding - width: control.width - (control.leftPadding + control.rightPadding) - height: control.height - (control.topPadding + control.bottomPadding) - - text: control.placeholderText - font: control.font - color: control.placeholderTextColor - verticalAlignment: control.verticalAlignment - visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) - elide: Text.ElideRight - renderType: control.renderType - } - - background: Rectangle { - implicitWidth: 120 - implicitHeight: 24 - - radius: 2 - color: control.palette.base - border.color: control.activeFocus ? Fusion.highlightedOutline(control.palette) : Fusion.outline(control.palette) - - Rectangle { - x: 1; y: 1 - width: parent.width - 2 - height: parent.height - 2 - color: "transparent" - border.color: Color.transparent(Fusion.highlightedOutline(control.palette), 40 / 255) - visible: control.activeFocus - radius: 1.7 - } - - Rectangle { - x: 2 - y: 1 - width: parent.width - 4 - height: 1 - color: Fusion.topShadow - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ToolBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ToolBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.ToolBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - horizontalPadding: 6 - topPadding: control.position === T.ToolBar.Footer ? 1 : 0 - bottomPadding: control.position === T.ToolBar.Header ? 1 : 0 - - background: Rectangle { - implicitHeight: 26 - - gradient: Gradient { - GradientStop { - position: 0 - color: Qt.lighter(control.palette.window, 1.04) - } - GradientStop { - position: 1 - color: control.palette.window - } - } - - Rectangle { - width: parent.width - height: 1 - color: control.position === T.ToolBar.Header ? Fusion.lightShade : Fusion.darkShade - } - - Rectangle { - y: parent.height - height - width: parent.width - height: 1 - color: control.position === T.ToolBar.Header ? Fusion.darkShade : Fusion.lightShade - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ToolButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ToolButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ToolButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ToolButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.ToolButton { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: 6 - spacing: 6 - - icon.width: 16 - icon.height: 16 - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon - text: control.text - font: control.font - color: control.palette.buttonText - } - - background: ButtonPanel { - implicitWidth: 20 - implicitHeight: 20 - - control: control - visible: control.down || control.checked || control.highlighted || control.visualFocus || control.hovered - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ToolSeparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ToolSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ToolSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ToolSeparator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.ToolSeparator { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: vertical ? 6 : 2 - verticalPadding: vertical ? 2 : 6 - - contentItem: Rectangle { - implicitWidth: vertical ? 2 : 8 - implicitHeight: vertical ? 8 : 2 - color: Qt.darker(control.palette.window, 1.1) - - Rectangle { - x: 1 - width: 1 - height: parent.height - color: Qt.lighter(control.palette.window, 1.1) - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ToolTip.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ToolTip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/ToolTip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/ToolTip.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.ToolTip { - id: control - - x: parent ? (parent.width - implicitWidth) / 2 : 0 - y: -implicitHeight - 3 - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - margins: 6 - padding: 6 - - closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent - - contentItem: Text { - text: control.text - font: control.font - color: control.palette.toolTipText - // TODO: wrapMode: Label.Wrap - } - - background: Rectangle { - color: control.palette.toolTipBase - border.color: control.palette.toolTipText - - Rectangle { - z: -1 - x: 1; y: 1 - width: parent.width - height: parent.height - color: control.palette.shadow - opacity: 0.5 - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Tumbler.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/fusion/Tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/fusion/Tumbler.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Fusion.impl 2.12 - -T.Tumbler { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) || 60 // ### remove 60 in Qt 6 - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) || 200 // ### remove 200 in Qt 6 - - delegate: Text { - text: modelData - color: control.palette.windowText - font: control.font - opacity: (1.0 - Math.abs(Tumbler.displacement) / (control.visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - } - - contentItem: TumblerView { - implicitWidth: 60 - implicitHeight: 200 - model: control.model - delegate: control.delegate - path: Path { - startX: contentItem.width / 2 - startY: -contentItem.delegateHeight / 2 - PathLine { - x: contentItem.width / 2 - y: (control.visibleItemCount + 1) * contentItem.delegateHeight - contentItem.delegateHeight / 2 - } - } - - property real delegateHeight: control.availableHeight / control.visibleItemCount - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/GroupBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/GroupBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/GroupBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/GroupBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,23 +34,25 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.GroupBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitLabelWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) spacing: 6 padding: 12 - topPadding: padding + (implicitLabelWidth > 0 ? implicitLabelHeight + spacing : 0) + topPadding: padding + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) label: Text { x: control.leftPadding @@ -58,17 +60,17 @@ text: control.title font: control.font - color: control.palette.windowText + color: control.enabled ? Default.textColor : Default.textDisabledColor elide: Text.ElideRight verticalAlignment: Text.AlignVCenter } background: Rectangle { - y: control.topPadding - control.bottomPadding + y: control.topPadding - control.padding width: parent.width - height: parent.height - control.topPadding + control.bottomPadding + height: parent.height - control.topPadding + control.padding color: "transparent" - border.color: control.palette.mid + border.color: Default.frameLightColor } } Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/images/arrow-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/images/arrow-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/images/arrow-indicator@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/images/arrow-indicator@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/images/arrow-indicator@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/images/arrow-indicator@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/images/arrow-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/images/arrow-indicator.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ApplicationWindow.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ApplicationWindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ApplicationWindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ApplicationWindow.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.ApplicationWindow { - id: window - - // ### remove? - overlay.modal: NinePatchImage { - source: Imagine.url + "applicationwindow-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": true} - ] - } - } - - // ### remove? - overlay.modeless: NinePatchImage { - source: Imagine.url + "applicationwindow-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": false} - ] - } - } - - background: NinePatchImage { - width: window.width - height: window.height - - source: Imagine.url + "applicationwindow-background" - NinePatchImageSelector on source { - states: [ - {"active": window.active} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/BusyIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/BusyIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/BusyIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/BusyIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.BusyIndicator { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - contentItem: AnimatedImage { - opacity: control.running ? 1 : 0 - playing: control.running || opacity > 0 - visible: control.running || opacity > 0 - Behavior on opacity { OpacityAnimator { duration: 250 } } - - source: Imagine.url + "busyindicator-animation" - AnimatedImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"running": control.running}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - background: NinePatchImage { - source: Imagine.url + "busyindicator-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"running": control.running}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Button.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Button { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - spacing: 6 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - icon.width: 24 - icon.height: 24 - icon.color: control.enabled && control.flat && control.highlighted ? control.palette.highlight - : control.enabled && (control.down || control.checked || control.highlighted) && !control.flat - ? control.palette.brightText : control.flat ? control.palette.windowText : control.palette.buttonText - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon - text: control.text - font: control.font - color: control.enabled && control.flat && control.highlighted ? control.palette.highlight - : control.enabled && (control.down || control.checked || control.highlighted) && !control.flat - ? control.palette.brightText : control.flat ? control.palette.windowText : control.palette.buttonText - } - - background: NinePatchImage { - source: Imagine.url + "button-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"checkable": control.checkable}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"flat": control.flat}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/CheckBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.CheckBox { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - spacing: 6 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - indicator: Image { - x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 - y: control.topPadding + (control.availableHeight - height) / 2 - - source: Imagine.url + "checkbox-indicator" - ImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checkState === Qt.Checked}, - {"partially-checked": control.checkState === Qt.PartiallyChecked}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - contentItem: Text { - leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 - - text: control.text - font: control.font - color: control.palette.windowText - elide: Text.ElideRight - verticalAlignment: Text.AlignVCenter - } - - background: NinePatchImage { - source: Imagine.url + "checkbox-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checkState === Qt.Checked}, - {"partially-checked": control.checkState === Qt.PartiallyChecked}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/CheckDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/CheckDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/CheckDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/CheckDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.CheckDelegate { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - spacing: 12 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - icon.width: 24 - icon.height: 24 - icon.color: control.palette.text - - indicator: Image { - x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding - y: control.topPadding + (control.availableHeight - height) / 2 - - source: Imagine.url + "checkdelegate-indicator" - ImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checkState === Qt.Checked}, - {"partially-checked": control.checkState === Qt.PartiallyChecked}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - contentItem: IconLabel { - leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0 - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.palette.text - } - - background: NinePatchImage { - source: Imagine.url + "checkdelegate-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checkState === Qt.Checked}, - {"partially-checked": control.checkState === Qt.PartiallyChecked}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ComboBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ComboBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ComboBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ComboBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,173 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.ComboBox { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentItem.implicitWidth + background ? (background.leftPadding + background.rightPadding) : 0) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - Math.max(implicitContentHeight, - implicitIndicatorHeight) + background ? (background.topPadding + background.bottomPadding) : 0) - - leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) - rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - delegate: ItemDelegate { - width: parent.width - text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData - font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal - highlighted: control.highlightedIndex === index - hoverEnabled: control.hoverEnabled - } - - indicator: Image { - x: control.mirrored ? control.padding : control.width - width - control.padding - y: control.topPadding + (control.availableHeight - height) / 2 - - source: Imagine.url + "combobox-indicator" - ImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.pressed}, - {"editable": control.editable}, - {"open": control.down}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered}, - {"flat": control.flat} - ] - } - } - - contentItem: T.TextField { - topPadding: control.background ? control.background.topPadding : 0 - leftPadding: control.background ? control.background.leftPadding : 0 - rightPadding: control.background ? control.background.rightPadding : 0 - bottomPadding: control.background ? control.background.bottomPadding : 0 - - text: control.editable ? control.editText : control.displayText - - enabled: control.editable - autoScroll: control.editable - readOnly: control.down - inputMethodHints: control.inputMethodHints - validator: control.validator - - font: control.font - color: control.flat ? control.palette.windowText : control.editable ? control.palette.text : control.palette.buttonText - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText - verticalAlignment: Text.AlignVCenter - } - - background: NinePatchImage { - source: Imagine.url + "combobox-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.pressed}, - {"editable": control.editable}, - {"open": control.down}, - {"focused": control.visualFocus || (control.editable && control.activeFocus)}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered}, - {"flat": control.flat} - ] - } - } - - popup: T.Popup { - width: control.width - height: Math.min(contentItem.implicitHeight + topPadding + bottomPadding, control.Window.height - topMargin - bottomMargin) - - topMargin: background.topInset - bottomMargin: background.bottomInset - - topPadding: background.topPadding - leftPadding: background.leftPadding - rightPadding: background.rightPadding - bottomPadding: background.bottomPadding - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - palette.text: control.palette.text - palette.highlight: control.palette.highlight - palette.highlightedText: control.palette.highlightedText - palette.windowText: control.palette.windowText - palette.buttonText: control.palette.buttonText - - contentItem: ListView { - clip: true - implicitHeight: contentHeight - model: control.delegateModel - currentIndex: control.highlightedIndex - highlightMoveDuration: 0 - - T.ScrollIndicator.vertical: ScrollIndicator { } - } - - background: NinePatchImage { - source: Imagine.url + "combobox-popup" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.pressed}, - {"editable": control.editable}, - {"focused": control.visualFocus || (control.editable && control.activeFocus)}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered}, - {"flat": control.flat} - ] - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/DelayButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/DelayButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/DelayButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/DelayButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,138 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 -import QtGraphicalEffects 1.12 - -T.DelayButton { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - transition: Transition { - NumberAnimation { - duration: control.delay * (control.pressed ? 1.0 - control.progress : 0.3 * control.progress) - } - } - - contentItem: Text { - text: control.text - font: control.font - color: control.palette.buttonText - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - } - - background: NinePatchImage { - source: Imagine.url + "delaybutton-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - - readonly property NinePatchImage progress: NinePatchImage { - parent: control.background - width: control.progress * parent.width - height: parent.height - visible: false - - source: Imagine.url + "delaybutton-progress" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - readonly property NinePatchImage mask: NinePatchImage { - width: control.background.width - height: control.background.height - visible: false - - source: Imagine.url + "delaybutton-mask" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - readonly property OpacityMask effect: OpacityMask { - parent: control.background - width: source.width - height: source.height - source: control.background.progress - - maskSource: ShaderEffectSource { - sourceItem: control.background.mask - sourceRect: Qt.rect(0, 0, control.background.effect.width, control.background.effect.height) - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -// 9-patch export -// -// This plugin crops upscaled 9-patch PNG assets when exported from Sketch, -// to ensure that 9-patch borders remain 1px wide when upscaled. -// -function onExportSlices(context) { - var exports = context.actionContext.exports; - for (var i = 0; i < exports.count(); ++i) { - var name = exports[i].request.name(); - var scale = exports[i].request.scale(); - if (scale > 1 && name.endsWith(".9")) - cropAsset(exports[i].path, scale - 1); - } -} - -function cropAsset(path, inset) { - var url = NSURL.fileURLWithPath(path); - var img = CIImage.imageWithContentsOfURL(url); - var rect = NSInsetRect(img.extent(), inset, inset); - var cropped = img.imageByCroppingToRect(rect); - var rep = NSBitmapImageRep.alloc().initWithCIImage(cropped); - var data = rep.PNGRepresentationWithInterlaced(false); - data.writeToFile(path); -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -{ - "name" : "9-patch export", - "description" : "Crops upscaled 9-patch PNG assets when exported from Sketch.", - "version" : "0.1", - "identifier" : "org.qt-project.sketch.9-patch-export", - "author" : "The Qt Project", - "commands" : [ - { - "name" : "9-patch export", - "identifier" : "9-patch-export", - "script" : "9-patch-export.js", - "handlers" : { - "actions" : { - "ExportSlices": "onExportSlices", - }, - }, - }, - ], -} Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/design/imagine.sketch and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/design/imagine.sketch differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/DialogButtonBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/DialogButtonBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/DialogButtonBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/DialogButtonBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.DialogButtonBox { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - (control.count === 1 ? contentWidth * 2 : contentWidth) + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - spacing: 6 - - delegate: Button { - width: control.count === 1 ? control.availableWidth / 2 : undefined - flat: true - } - - contentItem: ListView { - model: control.contentModel - spacing: control.spacing - orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds - snapMode: ListView.SnapToItem - } - - background: NinePatchImage { - source: Imagine.url + "dialogbuttonbox-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Dialog.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Dialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Dialog { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitHeaderWidth, - implicitFooterWidth) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding - + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) - + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - background: NinePatchImage { - source: Imagine.url + "dialog-background" - NinePatchImageSelector on source { - states: [ - {"modal": control.modal}, - {"dim": control.dim} - ] - } - } - - header: Label { - text: control.title - visible: control.title - elide: Label.ElideRight - font.bold: true - padding: 12 - - background: NinePatchImage { - width: parent.width - height: parent.height - - source: Imagine.url + "dialog-title" - NinePatchImageSelector on source { - states: [ - {"modal": control.modal}, - {"dim": control.dim} - ] - } - } - } - - footer: DialogButtonBox { - visible: count > 0 - } - - T.Overlay.modal: NinePatchImage { - source: Imagine.url + "dialog-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": true} - ] - } - } - - T.Overlay.modeless: NinePatchImage { - source: Imagine.url + "dialog-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": false} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Dial.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Dial.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Dial { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - (handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - (handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - handle: Image { - x: background.x + background.width / 2 - handle.width / 2 - y: background.y + background.height / 2 - handle.height / 2 - - source: Imagine.url + "dial-handle" - ImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.pressed}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - - transform: [ - Translate { - y: -background.height * 0.4 + handle.height / 2 - }, - Rotation { - angle: control.angle - origin.x: handle.width / 2 - origin.y: handle.height / 2 - } - ] - } - - background: NinePatchImage { - x: control.width / 2 - width / 2 - y: control.height / 2 - height / 2 - width: Math.max(64, Math.min(control.width, control.height)) - height: width - - source: Imagine.url + "dial-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.pressed}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Drawer.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Drawer.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Drawer { - id: control - - parent: T.ApplicationWindow.overlay - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - enter: Transition { SmoothedAnimation { velocity: 5 } } - exit: Transition { SmoothedAnimation { velocity: 5 } } - - background: NinePatchImage { - source: Imagine.url + "drawer-background" - NinePatchImageSelector on source { - states: [ - {"modal": control.modal}, - {"dim": control.dim}, - {"top": control.edge === Qt.TopEdge}, - {"left": control.edge === Qt.LeftEdge}, - {"right": control.edge === Qt.RightEdge}, - {"bottom": control.edge === Qt.BottomEdge} - ] - } - } - - T.Overlay.modal: NinePatchImage { - source: Imagine.url + "drawer-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": true} - ] - } - } - - T.Overlay.modeless: NinePatchImage { - source: Imagine.url + "drawer-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": false} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Frame.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Frame.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Frame { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - background: NinePatchImage { - source: Imagine.url + "frame-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/GroupBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/GroupBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/GroupBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/GroupBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.GroupBox { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitLabelWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topPadding: (background ? background.topPadding : 0) + (implicitLabelWidth > 0 ? implicitLabelHeight + spacing : 0) - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - padding: 12 - - label: Label { - width: control.width - - topPadding: background.topPadding - leftPadding: background.leftPadding - rightPadding: background.rightPadding - bottomPadding: background.bottomPadding - - text: control.title - font: control.font - elide: Text.ElideRight - verticalAlignment: Text.AlignVCenter - - color: control.palette.windowText - - background: NinePatchImage { - width: parent.width - height: parent.height - - source: Imagine.url + "groupbox-title" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } - } - - background: NinePatchImage { - x: -leftInset - y: control.topPadding - control.bottomPadding - topInset - width: control.width + leftInset + rightInset - height: control.height + topInset + bottomInset - control.topPadding + control.padding - - source: Imagine.url + "groupbox-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } -} Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-background@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-background@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-background@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-background@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-background@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-background@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-background.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-overlay@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-overlay@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-overlay@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-overlay@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-overlay@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-overlay@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-overlay-modal@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-overlay-modal@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-overlay-modal@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-overlay-modal@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-overlay-modal@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-overlay-modal@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-overlay-modal.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-overlay-modal.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/applicationwindow-overlay.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/applicationwindow-overlay.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/busyindicator-animation@2x.webp and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/busyindicator-animation@2x.webp differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/busyindicator-animation@3x.webp and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/busyindicator-animation@3x.webp differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/busyindicator-animation@4x.webp and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/busyindicator-animation@4x.webp differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/busyindicator-animation.webp and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/busyindicator-animation.webp differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-checked-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-checked-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-checked@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-checked@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-checked@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-checked@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-checked-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-checked-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-checked-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-checked-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-checked-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-checked-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-checked-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-checked-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-flat-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-flat-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-checked@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-checked@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-checked@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-checked@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-highlighted-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-highlighted-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/button-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/button-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkbox-indicator-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkbox-indicator-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-highlighted@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-highlighted@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-highlighted@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-highlighted@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-highlighted@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-highlighted@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-highlighted.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-highlighted.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/checkdelegate-indicator-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/checkdelegate-indicator-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-editable-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-editable-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-open@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-open@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-open@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-open@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-open@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-open@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-open.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-open.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator-editable.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator-editable.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-indicator.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-popup@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-popup@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-popup@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-popup@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-popup@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-popup@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/combobox-popup.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/combobox-popup.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-checked-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-checked-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-disabled-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-disabled-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-mask@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-mask@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-mask@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-mask@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-mask@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-mask@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-mask.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-mask.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-progress@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-progress@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-progress@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-progress@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-progress@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-progress@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-progress.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-progress.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-progress-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-progress-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-progress-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-progress-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-progress-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-progress-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/delaybutton-progress-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/delaybutton-progress-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-background.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-focused-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-focused-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dial-handle-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dial-handle-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialogbuttonbox-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialogbuttonbox-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialogbuttonbox-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialogbuttonbox-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialogbuttonbox-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialogbuttonbox-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialogbuttonbox-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialogbuttonbox-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-overlay@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-overlay@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-overlay@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-overlay@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-overlay@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-overlay@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-overlay-modal@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-overlay-modal@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-overlay-modal@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-overlay-modal@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-overlay-modal@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-overlay-modal@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-overlay-modal.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-overlay-modal.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/dialog-overlay.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/dialog-overlay.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-bottom@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-bottom@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-bottom@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-bottom@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-bottom@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-bottom@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-bottom.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-bottom.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-left@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-left@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-left@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-left@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-left@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-left@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-left.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-left.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-right@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-right@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-right@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-right@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-right@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-right@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-right.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-right.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-top@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-top@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-top@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-top@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-top@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-top@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-background-top.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-background-top.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-overlay@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-overlay@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-overlay@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-overlay@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-overlay@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-overlay@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-overlay-modal@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-overlay-modal@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-overlay-modal@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-overlay-modal@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-overlay-modal@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-overlay-modal@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-overlay-modal.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-overlay-modal.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/drawer-overlay.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/drawer-overlay.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/frame-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/frame-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/frame-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/frame-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/frame-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/frame-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/frame-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/frame-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/groupbox-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/groupbox-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/groupbox-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/groupbox-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/groupbox-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/groupbox-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/groupbox-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/groupbox-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/groupbox-title@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/groupbox-title@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/groupbox-title@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/groupbox-title@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/groupbox-title@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/groupbox-title@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/groupbox-title.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/groupbox-title.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-highlighted@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-highlighted@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-highlighted@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-highlighted@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-highlighted@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-highlighted@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-highlighted.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-highlighted.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/itemdelegate-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/itemdelegate-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menu-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menu-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menu-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menu-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menu-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menu-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menu-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menu-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-arrow.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-arrow.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-background-highlighted@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-background-highlighted@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-background-highlighted@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-background-highlighted@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-background-highlighted@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-background-highlighted@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-background-highlighted.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-background-highlighted.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuitem-indicator-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuitem-indicator-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuseparator-separator@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuseparator-separator@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuseparator-separator@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuseparator-separator@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuseparator-separator@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuseparator-separator@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/menuseparator-separator.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/menuseparator-separator.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/page-background@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/page-background@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/page-background@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/page-background@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/page-background@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/page-background@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/page-background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/page-background.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-current@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-current@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-current@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-current@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-current@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-current@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-current.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-current.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pageindicator-delegate-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pageindicator-delegate-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pane-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pane-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pane-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pane-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pane-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pane-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/pane-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/pane-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-overlay@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-overlay@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-overlay@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-overlay@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-overlay@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-overlay@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-overlay-modal@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-overlay-modal@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-overlay-modal@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-overlay-modal@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-overlay-modal@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-overlay-modal@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-overlay-modal.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-overlay-modal.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/popup-overlay.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/popup-overlay.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-animation@2x.webp and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-animation@2x.webp differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-animation@3x.webp and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-animation@3x.webp differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-animation@4x.webp and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-animation@4x.webp differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-animation.webp and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-animation.webp differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-mask@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-mask@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-mask@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-mask@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-mask@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-mask@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-mask.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-mask.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-progress@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-progress@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-progress@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-progress@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-progress@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-progress@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/progressbar-progress.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/progressbar-progress.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiobutton-indicator-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiobutton-indicator-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-highlighted@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-highlighted@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-highlighted@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-highlighted@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-highlighted@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-highlighted@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-highlighted.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-highlighted.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/radiodelegate-indicator-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/radiodelegate-indicator-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-background-horizontal@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-background-horizontal@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-background-horizontal@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-background-horizontal@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-background-horizontal@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-background-horizontal@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-background-horizontal.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-background-horizontal.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-background-vertical@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-background-vertical@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-background-vertical@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-background-vertical@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-background-vertical@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-background-vertical@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-background-vertical.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-background-vertical.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-handle-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-handle-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-horizontal@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-horizontal@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-horizontal@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-horizontal@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-horizontal@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-horizontal@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-horizontal.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-horizontal.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-vertical@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-vertical@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-vertical@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-vertical@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-vertical@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-vertical@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-vertical.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-vertical.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-disabled-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-disabled-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/roundbutton-background-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/roundbutton-background-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollbar-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollbar-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollindicator-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollindicator-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollindicator-handle@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollindicator-handle@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollindicator-handle@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollindicator-handle@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/scrollindicator-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/scrollindicator-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-background-horizontal@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-background-horizontal@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-background-horizontal@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-background-horizontal@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-background-horizontal@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-background-horizontal@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-background-horizontal.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-background-horizontal.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-background-vertical@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-background-vertical@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-background-vertical@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-background-vertical@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-background-vertical@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-background-vertical@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-background-vertical.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-background-vertical.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-focused-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-focused-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-handle-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-handle-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-horizontal@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-horizontal@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-horizontal@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-horizontal@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-horizontal@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-horizontal@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-horizontal.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-horizontal.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-horizontal-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-horizontal-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-vertical@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-vertical@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-vertical@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-vertical@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-vertical@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-vertical@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-vertical.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-vertical.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-vertical-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-vertical-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-vertical-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-vertical-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-vertical-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-vertical-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/slider-progress-vertical-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/slider-progress-vertical-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-editable@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-editable@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-editable@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-editable@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-editable@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-editable@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-editable.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-editable.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-down-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-down-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/spinbox-indicator-up-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/spinbox-indicator-up-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-highlighted@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-highlighted@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-highlighted@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-highlighted@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-highlighted@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-highlighted@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-highlighted.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-highlighted.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/swipedelegate-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/swipedelegate-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-handle-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-handle-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switchdelegate-indicator-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switchdelegate-indicator-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-handle-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-handle-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-checked-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-checked-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-disabled@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-disabled@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-disabled@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-disabled@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-disabled@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-disabled@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-disabled.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-disabled.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-focused@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-focused@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-focused@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-focused@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-focused@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-focused@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-focused.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-focused.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-hovered@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-hovered@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-hovered@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-hovered@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-hovered@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-hovered@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-hovered.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-hovered.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-pressed@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-pressed@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-pressed@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-pressed@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-pressed@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-pressed@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/switch-indicator-pressed.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/switch-indicator-pressed.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbar-background@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbar-background@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbar-background@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbar-background@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbar-background@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbar-background@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbar-background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbar-background.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-checked@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-checked@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-checked@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-checked@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-disabled-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-disabled-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tabbutton-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tabbutton-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textarea-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textarea-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background-disabled@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background-disabled@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background-disabled@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background-disabled@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background-disabled@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background-disabled@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background-disabled.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background-disabled.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/textfield-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/textfield-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbar-background@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbar-background@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbar-background@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbar-background@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbar-background@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbar-background@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbar-background.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbar-background.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-checked-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-checked-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-disabled-checked.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-disabled-checked.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-focused@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-focused@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-focused@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-focused@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-focused@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-focused@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-focused.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-focused.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-hovered@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-hovered@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-hovered@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-hovered@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-hovered@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-hovered@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-hovered.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-hovered.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-pressed@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-pressed@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-pressed@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-pressed@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-pressed@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-pressed@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolbutton-background-pressed.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolbutton-background-pressed.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolseparator-separator-horizontal@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolseparator-separator-horizontal@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolseparator-separator-horizontal@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolseparator-separator-horizontal@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolseparator-separator-horizontal@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolseparator-separator-horizontal@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolseparator-separator-horizontal.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolseparator-separator-horizontal.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolseparator-separator-vertical@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolseparator-separator-vertical@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolseparator-separator-vertical@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolseparator-separator-vertical@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolseparator-separator-vertical@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolseparator-separator-vertical@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/toolseparator-separator-vertical.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/toolseparator-separator-vertical.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tooltip-background@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tooltip-background@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tooltip-background@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tooltip-background@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tooltip-background@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tooltip-background@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/images/tooltip-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/images/tooltip-background.9.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/imagine.pri qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/imagine.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/imagine.pri 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/imagine.pri 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -QML_FILES += \ - $$PWD/ApplicationWindow.qml \ - $$PWD/BusyIndicator.qml \ - $$PWD/Button.qml \ - $$PWD/CheckBox.qml \ - $$PWD/CheckDelegate.qml \ - $$PWD/ComboBox.qml \ - $$PWD/DelayButton.qml \ - $$PWD/Dial.qml \ - $$PWD/Dialog.qml \ - $$PWD/DialogButtonBox.qml \ - $$PWD/Drawer.qml \ - $$PWD/Frame.qml \ - $$PWD/GroupBox.qml \ - $$PWD/ItemDelegate.qml \ - $$PWD/Label.qml \ - $$PWD/Menu.qml \ - $$PWD/MenuItem.qml \ - $$PWD/MenuSeparator.qml \ - $$PWD/PageIndicator.qml \ - $$PWD/Page.qml \ - $$PWD/Pane.qml \ - $$PWD/Popup.qml \ - $$PWD/ProgressBar.qml \ - $$PWD/RadioButton.qml \ - $$PWD/RadioDelegate.qml \ - $$PWD/RangeSlider.qml \ - $$PWD/RoundButton.qml \ - $$PWD/ScrollBar.qml \ - $$PWD/ScrollIndicator.qml \ - $$PWD/Slider.qml \ - $$PWD/SpinBox.qml \ - $$PWD/StackView.qml \ - $$PWD/SwipeDelegate.qml \ - $$PWD/SwipeView.qml \ - $$PWD/Switch.qml \ - $$PWD/SwitchDelegate.qml \ - $$PWD/TextField.qml \ - $$PWD/TextArea.qml \ - $$PWD/TabBar.qml \ - $$PWD/TabButton.qml \ - $$PWD/ToolBar.qml \ - $$PWD/ToolButton.qml \ - $$PWD/ToolSeparator.qml \ - $$PWD/ToolTip.qml \ - $$PWD/Tumbler.qml - -HEADERS += \ - $$PWD/qquickimageselector_p.h \ - $$PWD/qquickimaginestyle_p.h \ - $$PWD/qquickimaginetheme_p.h \ - $$PWD/qquickninepatchimage_p.h - -SOURCES += \ - $$PWD/qquickimageselector.cpp \ - $$PWD/qquickimaginestyle.cpp \ - $$PWD/qquickimaginetheme.cpp \ - $$PWD/qquickninepatchimage.cpp diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/imagine.pro qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/imagine.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/imagine.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/imagine.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -TARGET = qtquickcontrols2imaginestyleplugin -TARGETPATH = QtQuick/Controls.2/Imagine -IMPORT_VERSION = 2.5 - -QT += qml quick -QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private - -DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII - -include(imagine.pri) - -OTHER_FILES += \ - qmldir \ - $$QML_FILES - -SOURCES += \ - $$PWD/qtquickcontrols2imaginestyleplugin.cpp - -qtquickcontrols2imaginestyle.prefix = qt-project.org/imports/QtQuick/Controls.2/Imagine -qtquickcontrols2imaginestyle.files += \ - $$files($$PWD/images/*.png) \ - $$files($$PWD/images/*.webp) -RESOURCES += qtquickcontrols2imaginestyle - -CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler -load(qml_plugin) - -requires(qtConfig(quickcontrols2-imagine)) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ItemDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ItemDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ItemDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ItemDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.ItemDelegate { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - spacing: 12 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - icon.width: 24 - icon.height: 24 - icon.color: control.palette.text - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.palette.text - } - - background: NinePatchImage { - source: Imagine.url + "itemdelegate-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Label.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Label.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Label { - id: control - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - color: control.palette.windowText - linkColor: control.palette.link - - background: NinePatchImage { - source: Imagine.url + "label-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/MenuItem.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/MenuItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/MenuItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/MenuItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,138 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.MenuItem { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - spacing: 6 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - icon.width: 24 - icon.height: 24 - icon.color: control.palette.windowText - - contentItem: IconLabel { - readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0 - readonly property real indicatorPadding: control.checkable && control.indicator ? control.indicator.width + control.spacing : 0 - leftPadding: !control.mirrored ? indicatorPadding : arrowPadding - rightPadding: control.mirrored ? indicatorPadding : arrowPadding - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.palette.windowText - } - - arrow: Image { - x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding - y: control.topPadding + (control.availableHeight - height) / 2 - - visible: control.subMenu - source: Imagine.url + "menuitem-arrow" - ImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - indicator: Image { - x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 - y: control.topPadding + (control.availableHeight - height) / 2 - - visible: control.checkable - source: Imagine.url + "menuitem-indicator" - ImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - background: NinePatchImage { - source: Imagine.url + "menuitem-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Menu.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Menu.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 -import QtQuick.Window 2.12 - -T.Menu { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topMargin: background ? background.topInset : 0 - leftMargin: background ? background.leftInset : 0 - rightMargin: background ? background.rightInset : 0 - bottomMargin: background ? background.bottomInset : 0 - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - delegate: MenuItem { } - - contentItem: ListView { - implicitHeight: contentHeight - model: control.contentModel - interactive: Window.window ? contentHeight > Window.window.height : false - clip: true - currentIndex: control.currentIndex - - T.ScrollIndicator.vertical: ScrollIndicator { } - } - - background: NinePatchImage { - source: Imagine.url + "menu-background" - NinePatchImageSelector on source { - states: [ - {"modal": control.modal}, - {"dim": control.dim} - ] - } - } - - T.Overlay.modal: NinePatchImage { - source: Imagine.url + "menu-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": true} - ] - } - } - - T.Overlay.modeless: NinePatchImage { - source: Imagine.url + "menu-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": false} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/MenuSeparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/MenuSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/MenuSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/MenuSeparator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.MenuSeparator { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - contentItem: NinePatchImage { - source: Imagine.url + "menuseparator-separator" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } - - background: NinePatchImage { - source: Imagine.url + "menuseparator-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/PageIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.PageIndicator { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - delegate: Image { - source: Imagine.url + "pageindicator-delegate" - ImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": pressed}, - {"current": index === control.currentIndex}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} // ### TODO: context property - ] - } - } - - contentItem: Row { - spacing: control.spacing - - Repeater { - model: control.count - delegate: control.delegate - } - } - - background: NinePatchImage { - source: Imagine.url + "pageindicator-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Page.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Page.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Page { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitHeaderWidth, - implicitFooterWidth) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding - + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) - + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - background: NinePatchImage { - source: Imagine.url + "page-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Pane.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Pane.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Pane { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - background: NinePatchImage { - source: Imagine.url + "pane-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/plugins.qmltypes qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/plugins.qmltypes --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/plugins.qmltypes 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/plugins.qmltypes 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -import QtQuick.tooling 1.2 - -// This file describes the plugin-supplied types contained in the library. -// It is used for QML tooling purposes only. -// -// This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Controls.Imagine 2.3' - -Module { - dependencies: [] - Component { name: "QQuickAttachedObject"; prototype: "QObject" } - Component { - name: "QQuickImagineStyle" - prototype: "QQuickAttachedObject" - exports: ["QtQuick.Controls.Imagine/Imagine 2.3"] - isCreatable: false - exportMetaObjectRevisions: [0] - Property { name: "path"; type: "string" } - Property { name: "url"; type: "QUrl"; isReadonly: true } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Popup.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Popup.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Popup { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : undefined - leftPadding: background ? background.leftPadding : undefined - rightPadding: background ? background.rightPadding : undefined - bottomPadding: background ? background.bottomPadding : undefined - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - background: NinePatchImage { - source: Imagine.url + "popup-background" - NinePatchImageSelector on source { - states: [ - {"modal": control.modal}, - {"dim": control.dim} - ] - } - } - - T.Overlay.modal: NinePatchImage { - source: Imagine.url + "popup-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": true} - ] - } - } - - T.Overlay.modeless: NinePatchImage { - source: Imagine.url + "popup-overlay" - NinePatchImageSelector on source { - states: [ - {"modal": false} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ProgressBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ProgressBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ProgressBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ProgressBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,142 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 -import QtGraphicalEffects 1.12 - -T.ProgressBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - contentItem: Item { - implicitWidth: control.indeterminate ? animation.implicitWidth || progress.implicitWidth : progress.implicitWidth - implicitHeight: control.indeterminate ? animation.implicitHeight || progress.implicitHeight : progress.implicitHeight - scale: control.mirrored ? -1 : 1 - - readonly property bool hasMask: mask.status !== Image.Null - - readonly property NinePatchImage progress: NinePatchImage { - parent: control.contentItem - width: control.position * parent.width - height: parent.height - visible: !control.indeterminate && !control.contentItem.hasMask - - source: Imagine.url + "progressbar-progress" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"indeterminate": control.indeterminate}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - readonly property AnimatedImage animation: AnimatedImage { - parent: control.contentItem - width: parent.width - height: parent.height - playing: control.indeterminate - visible: control.indeterminate && !control.contentItem.hasMask - - source: Imagine.url + "progressbar-animation" - AnimatedImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - readonly property NinePatchImage mask: NinePatchImage { - width: control.availableWidth - height: control.availableHeight - visible: false - - source: Imagine.url + "progressbar-mask" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"indeterminate": control.indeterminate}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - readonly property OpacityMask effect: OpacityMask { - parent: control.contentItem - width: source.width - height: source.height - source: control.indeterminate ? control.contentItem.animation : control.contentItem.progress - - maskSource: ShaderEffectSource { - sourceItem: control.contentItem.mask - sourceRect: Qt.rect(0, 0, control.contentItem.effect.width, control.contentItem.effect.height) - } - } - } - - background: NinePatchImage { - source: Imagine.url + "progressbar-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"indeterminate": control.indeterminate}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qmldir qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qmldir --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qmldir 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qmldir 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -module QtQuick.Controls.Imagine -plugin qtquickcontrols2imaginestyleplugin -classname QtQuickControls2ImagineStylePlugin -depends QtQuick.Controls 2.5 -depends QtGraphicalEffects 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimageselector.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimageselector.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimageselector.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimageselector.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,338 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickimageselector_p.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -static const int DEFAULT_CACHE = 500; - -static inline int cacheSize() -{ - static bool ok = false; - static const int size = qEnvironmentVariableIntValue("QT_QUICK_CONTROLS_IMAGINE_CACHE", &ok); - return ok ? size : DEFAULT_CACHE; -} - -Q_DECLARE_LOGGING_CATEGORY(lcQtQuickControlsImagine) - -// input: [focused, pressed] -// => [[focused, pressed], [pressed, focused], [focused], [pressed]] -static QList permutations(const QStringList &input, int count = -1) -{ - if (count == -1) - count = input.count(); - - QList output; - for (int i = 0; i < input.count(); ++i) { - QStringList sub = input.mid(i, count); - - if (count > 1) { - if (i + count > input.count()) - sub += input.mid(0, count - i + 1); - - std::sort(sub.begin(), sub.end()); - do { - if (!sub.isEmpty()) - output += sub; - } while (std::next_permutation(sub.begin(), sub.end())); - } else { - output += sub; - } - - if (count == input.count()) - break; - } - - if (count > 1) - output += permutations(input, --count); - - return output; -} - -static QString findFile(const QDir &dir, const QString &baseName, const QStringList &extensions) -{ - for (const QString &ext : extensions) { - QString filePath = dir.filePath(baseName + QLatin1Char('.') + ext); - if (QFile::exists(filePath)) - return QFileSelector().select(filePath); - } - // return an empty string to indicate that the lookup has been done - // even if no matching asset was found - return QLatin1String(""); -} - -QQuickImageSelector::QQuickImageSelector(QObject *parent) - : QObject(parent), - m_cache(cacheSize() > 0) -{ -} - -QUrl QQuickImageSelector::source() const -{ - return m_source; -} - -void QQuickImageSelector::setSource(const QUrl &source) -{ - if (m_property.isValid()) - QQmlPropertyPrivate::write(m_property, source, QQmlPropertyData::BypassInterceptor | QQmlPropertyData::DontRemoveBinding); - if (m_source == source) - return; - - m_source = source; - emit sourceChanged(); -} - -QString QQuickImageSelector::name() const -{ - return m_name; -} - -void QQuickImageSelector::setName(const QString &name) -{ - if (m_name == name) - return; - - m_name = name; - if (m_complete) - updateSource(); -} - -QString QQuickImageSelector::path() const -{ - return m_path; -} - -void QQuickImageSelector::setPath(const QString &path) -{ - if (m_path == path) - return; - - m_path = path; - if (m_complete) - updateSource(); -} - -QVariantList QQuickImageSelector::states() const -{ - return m_allStates; -} - -void QQuickImageSelector::setStates(const QVariantList &states) -{ - if (m_allStates == states) - return; - - m_allStates = states; - if (updateActiveStates() && m_complete) - updateSource(); -} - -QString QQuickImageSelector::separator() const -{ - return m_separator; -} - -void QQuickImageSelector::setSeparator(const QString &separator) -{ - if (m_separator == separator) - return; - - m_separator = separator; - if (m_complete) - updateSource(); -} - -bool QQuickImageSelector::cache() const -{ - return m_cache; -} - -void QQuickImageSelector::setCache(bool cache) -{ - m_cache = cache; -} - -void QQuickImageSelector::write(const QVariant &value) -{ - setUrl(value.toUrl()); -} - -void QQuickImageSelector::setTarget(const QQmlProperty &property) -{ - m_property = property; -} - -void QQuickImageSelector::classBegin() -{ -} - -void QQuickImageSelector::componentComplete() -{ - setUrl(m_property.read().toUrl()); - m_complete = true; - updateSource(); -} - -QStringList QQuickImageSelector::fileExtensions() const -{ - static const QStringList extensions = QStringList() << QStringLiteral("png"); - return extensions; -} - -QString QQuickImageSelector::cacheKey() const -{ - if (!m_cache) - return QString(); - - return m_path + m_name + m_activeStates.join(m_separator); -} - -void QQuickImageSelector::updateSource() -{ - static QCache cache(cacheSize()); - - const QString key = cacheKey(); - - QString bestFilePath; - - if (m_cache) { - QString *cachedPath = cache.object(key); - if (cachedPath) - bestFilePath = *cachedPath; - } - - // note: a cached file path may be empty - if (bestFilePath.isNull()) { - QDir dir(m_path); - int bestScore = -1; - - const QStringList extensions = fileExtensions(); - - const QList statePerms = permutations(m_activeStates); - for (const QStringList &perm : statePerms) { - const QString filePath = findFile(dir, m_name + m_separator + perm.join(m_separator), extensions); - if (!filePath.isEmpty()) { - int score = calculateScore(perm); - if (score > bestScore) { - bestScore = score; - bestFilePath = filePath; - } - } - } - - if (bestFilePath.isEmpty()) - bestFilePath = findFile(dir, m_name, extensions); - - if (m_cache) - cache.insert(key, new QString(bestFilePath)); - } - - qCDebug(lcQtQuickControlsImagine) << m_name << m_activeStates << "->" << bestFilePath; - - if (bestFilePath.startsWith(QLatin1Char(':'))) - setSource(QUrl(QLatin1String("qrc") + bestFilePath)); - else - setSource(QUrl::fromLocalFile(bestFilePath)); -} - -void QQuickImageSelector::setUrl(const QUrl &url) -{ - QFileInfo fileInfo(QQmlFile::urlToLocalFileOrQrc(url)); - setName(fileInfo.fileName()); - setPath(fileInfo.path()); -} - -bool QQuickImageSelector::updateActiveStates() -{ - QStringList active; - for (const QVariant &v : qAsConst(m_allStates)) { - const QVariantMap state = v.toMap(); - if (state.isEmpty()) - continue; - auto it = state.begin(); - if (it.value().toBool()) - active += it.key(); - } - - if (m_activeStates == active) - return false; - - m_activeStates = active; - return true; -} - -int QQuickImageSelector::calculateScore(const QStringList &states) const -{ - int score = 0; - for (int i = 0; i < states.count(); ++i) - score += (m_activeStates.count() - m_activeStates.indexOf(states.at(i))) << 1; - return score; -} - -QQuickNinePatchImageSelector::QQuickNinePatchImageSelector(QObject *parent) - : QQuickImageSelector(parent) -{ -} - -QStringList QQuickNinePatchImageSelector::fileExtensions() const -{ - static const QStringList extensions = QStringList() << QStringLiteral("9.png") << QStringLiteral("png"); - return extensions; -} - -QQuickAnimatedImageSelector::QQuickAnimatedImageSelector(QObject *parent) - : QQuickImageSelector(parent) -{ -} - -QStringList QQuickAnimatedImageSelector::fileExtensions() const -{ - static const QStringList extensions = QStringList() << QStringLiteral("webp") << QStringLiteral("gif"); - return extensions; -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimageselector_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimageselector_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimageselector_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimageselector_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,151 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKIMAGESELECTOR_P_H -#define QQUICKIMAGESELECTOR_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickImageSelector : public QObject, public QQmlParserStatus, public QQmlPropertyValueInterceptor -{ - Q_OBJECT - Q_PROPERTY(QUrl source READ source NOTIFY sourceChanged FINAL) - Q_PROPERTY(QString name READ name WRITE setName FINAL) - Q_PROPERTY(QString path READ path WRITE setPath FINAL) - Q_PROPERTY(QVariantList states READ states WRITE setStates FINAL) - Q_PROPERTY(QString separator READ separator WRITE setSeparator FINAL) - Q_PROPERTY(bool cache READ cache WRITE setCache FINAL) - Q_INTERFACES(QQmlParserStatus QQmlPropertyValueInterceptor) - -public: - explicit QQuickImageSelector(QObject *parent = nullptr); - - QUrl source() const; - void setSource(const QUrl &source); - - QString name() const; - void setName(const QString &name); - - QString path() const; - void setPath(const QString &path); - - QVariantList states() const; - void setStates(const QVariantList &states); - - QString separator() const; - void setSeparator(const QString &separator); - - bool cache() const; - void setCache(bool cache); - - void write(const QVariant &value) override; - void setTarget(const QQmlProperty &property) override; - -Q_SIGNALS: - void sourceChanged(); - -protected: - void classBegin() override; - void componentComplete() override; - - virtual QStringList fileExtensions() const; - - QString cacheKey() const; - void updateSource(); - void setUrl(const QUrl &url); - bool updateActiveStates(); - int calculateScore(const QStringList &states) const; - -private: - bool m_cache = false; - bool m_complete = false; - QUrl m_source; - QString m_path; - QString m_name; - QString m_separator = QLatin1String("-"); - QVariantList m_allStates; - QStringList m_activeStates; - QQmlProperty m_property; -}; - -class QQuickNinePatchImageSelector : public QQuickImageSelector -{ - Q_OBJECT - -public: - explicit QQuickNinePatchImageSelector(QObject *parent = nullptr); - -protected: - QStringList fileExtensions() const override; -}; - -class QQuickAnimatedImageSelector : public QQuickImageSelector -{ - Q_OBJECT - -public: - explicit QQuickAnimatedImageSelector(QObject *parent = nullptr); - -protected: - QStringList fileExtensions() const override; -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QQuickImageSelector) -QML_DECLARE_TYPE(QQuickAnimatedImageSelector) - -#endif // QQUICKIMAGESELECTOR_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimaginestyle.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimaginestyle.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimaginestyle.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimaginestyle.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,168 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickimaginestyle_p.h" - -#include -#include - -QT_BEGIN_NAMESPACE - -Q_GLOBAL_STATIC_WITH_ARGS(QString, GlobalPath, (QLatin1String("qrc:/qt-project.org/imports/QtQuick/Controls.2/Imagine/images/"))) - -static const QString ensureSlash(const QString &path) -{ - const QChar slash = QLatin1Char('/'); - return path.endsWith(slash) ? path : path + slash; -} - -QQuickImagineStyle::QQuickImagineStyle(QObject *parent) - : QQuickAttachedObject(parent), - m_path(*GlobalPath()) -{ - init(); -} - -QQuickImagineStyle *QQuickImagineStyle::qmlAttachedProperties(QObject *object) -{ - return new QQuickImagineStyle(object); -} - -QString QQuickImagineStyle::path() const -{ - return m_path; -} - -void QQuickImagineStyle::setPath(const QString &path) -{ - m_explicitPath = true; - if (m_path == path) - return; - - m_path = path; - propagatePath(); - - emit pathChanged(); -} - -void QQuickImagineStyle::inheritPath(const QString &path) -{ - if (m_explicitPath || m_path == path) - return; - - m_path = path; - propagatePath(); - emit pathChanged(); -} - -void QQuickImagineStyle::propagatePath() -{ - const auto styles = attachedChildren(); - for (QQuickAttachedObject *child : styles) { - QQuickImagineStyle *imagine = qobject_cast(child); - if (imagine) - imagine->inheritPath(m_path); - } -} - -void QQuickImagineStyle::resetPath() -{ - if (!m_explicitPath) - return; - - m_explicitPath = false; - QQuickImagineStyle *imagine = qobject_cast(attachedParent()); - inheritPath(imagine ? imagine->path() : *GlobalPath()); -} - -QUrl QQuickImagineStyle::url() const -{ - // Using ApplicationWindow as an example, its NinePatchImage url - // was previously assigned like this: - // - // soruce: Imagine.path + "applicationwindow-background" - // - // If Imagine.path is set to ":/images" by the user, then the final URL would be: - // - // QUrl("file:///home/user/qt/qtbase/qml/QtQuick/Controls.2/Imagine/:/images/applicationwindow-background") - // - // To ensure that the correct URL is constructed, we do it ourselves here, - // and then the control QML files use the "url" property instead. - const QString path = ensureSlash(m_path); - if (path.startsWith(QLatin1String("qrc"))) - return QUrl(path); - - if (path.startsWith(QLatin1String(":/"))) - return QUrl(QLatin1String("qrc") + path); - - return QUrl::fromLocalFile(path); -} - -void QQuickImagineStyle::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) -{ - Q_UNUSED(oldParent); - QQuickImagineStyle *imagine = qobject_cast(newParent); - if (imagine) - inheritPath(imagine->path()); -} - -static QByteArray resolveSetting(const QByteArray &env, const QSharedPointer &settings, const QString &name) -{ - QByteArray value = qgetenv(env); -#if QT_CONFIG(settings) - if (value.isNull() && !settings.isNull()) - value = settings->value(name).toByteArray(); -#endif - return value; -} - -void QQuickImagineStyle::init() -{ - static bool globalsInitialized = false; - if (!globalsInitialized) { - QSharedPointer settings = QQuickStylePrivate::settings(QStringLiteral("Imagine")); - - QString path = QString::fromUtf8(resolveSetting("QT_QUICK_CONTROLS_IMAGINE_PATH", settings, QStringLiteral("Path"))); - if (!path.isEmpty()) - *GlobalPath() = m_path = ensureSlash(path); - - globalsInitialized = true; - } - - QQuickAttachedObject::init(); // TODO: lazy init? -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimaginestyle_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimaginestyle_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimaginestyle_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimaginestyle_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKIMAGINESTYLE_P_H -#define QQUICKIMAGINESTYLE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickImagineStyle : public QQuickAttachedObject -{ - Q_OBJECT - Q_PROPERTY(QString path READ path WRITE setPath RESET resetPath NOTIFY pathChanged FINAL) - Q_PROPERTY(QUrl url READ url NOTIFY pathChanged FINAL) - -public: - explicit QQuickImagineStyle(QObject *parent = nullptr); - - static QQuickImagineStyle *qmlAttachedProperties(QObject *object); - - QString path() const; - void setPath(const QString &path); - void inheritPath(const QString &path); - void propagatePath(); - void resetPath(); - - QUrl url() const; - -Q_SIGNALS: - void pathChanged(); - -protected: - void attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) override; - -private: - void init(); - - bool m_explicitPath = false; - QString m_path; -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPEINFO(QQuickImagineStyle, QML_HAS_ATTACHED_PROPERTIES) - -#endif // QQUICKIMAGINESTYLE_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimaginetheme.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimaginetheme.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimaginetheme.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimaginetheme.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickimaginetheme_p.h" - -#include - -QT_BEGIN_NAMESPACE - -void QQuickImagineTheme::initialize(QQuickTheme *theme) -{ - QFont systemFont; - systemFont.setFamily(QLatin1String("Open Sans")); - theme->setFont(QQuickTheme::System, systemFont); - - const QColor accentColor = QColor::fromRgb(0x4fc1e9); - const QColor windowTextColor = QColor::fromRgb(0x434a54); - const QColor disabledWindowTextColor = QColor::fromRgb(0xccd1d9); - - QPalette systemPalette; - systemPalette.setColor(QPalette::ButtonText, Qt::white); - systemPalette.setColor(QPalette::BrightText, Qt::white); - systemPalette.setColor(QPalette::Highlight, accentColor); - systemPalette.setColor(QPalette::HighlightedText, Qt::white); - systemPalette.setColor(QPalette::Text, windowTextColor); - systemPalette.setColor(QPalette::ToolTipText, Qt::white); - systemPalette.setColor(QPalette::WindowText, windowTextColor); - systemPalette.setColor(QPalette::Disabled, QPalette::Text, disabledWindowTextColor); - systemPalette.setColor(QPalette::Disabled, QPalette::WindowText, disabledWindowTextColor); - theme->setPalette(QQuickTheme::System, systemPalette); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimaginetheme_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimaginetheme_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickimaginetheme_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickimaginetheme_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKIMAGINETHEME_P_H -#define QQUICKIMAGINETHEME_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -QT_BEGIN_NAMESPACE - -class QQuickTheme; - -class QQuickImagineTheme -{ -public: - static void initialize(QQuickTheme *theme); -}; - -QT_END_NAMESPACE - -#endif // QQUICKIMAGINETHEME_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickninepatchimage.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickninepatchimage.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickninepatchimage.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickninepatchimage.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,440 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickninepatchimage_p.h" - -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -struct QQuickNinePatchData -{ - QVector coordsForSize(qreal count) const; - - inline bool isNull() const { return data.isEmpty(); } - inline int count() const { return data.size(); } - inline qreal at(int index) const { return data.at(index); } - inline qreal size() const { return data.last(); } - - void fill(const QVector &coords, qreal count); - void clear(); - -private: - bool inverted = false; - QVector data; -}; - -QVector QQuickNinePatchData::coordsForSize(qreal size) const -{ - // n = number of stretchable sections - // We have to compensate when adding 0 and/or - // the source image width to the divs vector. - const int l = data.size(); - const int n = (inverted ? l - 1 : l) / 2; - const qreal stretch = (size - data.last()) / n; - - QVector coords; - coords.reserve(l); - coords.append(0); - - bool stretched = !inverted; - for (int i = 1; i < l; ++i) { - qreal advance = data[i] - data[i - 1]; - if (stretched) - advance += stretch; - coords.append(coords.last() + advance); - - stretched = !stretched; - } - - return coords; -} - -void QQuickNinePatchData::fill(const QVector &coords, qreal size) -{ - data.clear(); - inverted = coords.isEmpty() || coords.first() != 0; - - // Reserve an extra item in case we need to add the image width/height - if (inverted) { - data.reserve(coords.size() + 2); - data.append(0); - } else { - data.reserve(coords.size() + 1); - } - - data += coords; - data.append(size); -} - -void QQuickNinePatchData::clear() -{ - data.clear(); -} - -class QQuickNinePatchNode : public QSGGeometryNode -{ -public: - QQuickNinePatchNode(); - ~QQuickNinePatchNode(); - - void initialize(QSGTexture *texture, const QSizeF &targetSize, const QSize &sourceSize, - const QQuickNinePatchData &xDivs, const QQuickNinePatchData &yDivs, qreal dpr); - -private: - QSGGeometry m_geometry; - QSGTextureMaterial m_material; -}; - -QQuickNinePatchNode::QQuickNinePatchNode() - : m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4) -{ - m_geometry.setDrawingMode(QSGGeometry::DrawTriangles); - setGeometry(&m_geometry); - setMaterial(&m_material); -} - -QQuickNinePatchNode::~QQuickNinePatchNode() -{ - delete m_material.texture(); -} - -void QQuickNinePatchNode::initialize(QSGTexture *texture, const QSizeF &targetSize, const QSize &sourceSize, - const QQuickNinePatchData &xDivs, const QQuickNinePatchData &yDivs, qreal dpr) -{ - delete m_material.texture(); - m_material.setTexture(texture); - - const int xlen = xDivs.count(); - const int ylen = yDivs.count(); - - if (xlen > 0 && ylen > 0) { - const int quads = (xlen - 1) * (ylen - 1); - static const int verticesPerQuad = 6; - m_geometry.allocate(xlen * ylen, verticesPerQuad * quads); - - QSGGeometry::TexturedPoint2D *vertices = m_geometry.vertexDataAsTexturedPoint2D(); - QVector xCoords = xDivs.coordsForSize(targetSize.width()); - QVector yCoords = yDivs.coordsForSize(targetSize.height()); - - for (int y = 0; y < ylen; ++y) { - for (int x = 0; x < xlen; ++x, ++vertices) - vertices->set(xCoords[x] / dpr, yCoords[y] / dpr, - xDivs.at(x) / sourceSize.width(), - yDivs.at(y) / sourceSize.height()); - } - - quint16 *indices = m_geometry.indexDataAsUShort(); - int n = quads; - for (int q = 0; n--; ++q) { - if ((q + 1) % xlen == 0) // next row - ++q; - // Bottom-left half quad triangle - indices[0] = q; - indices[1] = q + xlen; - indices[2] = q + xlen + 1; - - // Top-right half quad triangle - indices[3] = q; - indices[4] = q + xlen + 1; - indices[5] = q + 1; - - indices += verticesPerQuad; - } - } - - markDirty(QSGNode::DirtyGeometry | QSGNode::DirtyMaterial); -} - -class QQuickNinePatchImagePrivate : public QQuickImagePrivate -{ - Q_DECLARE_PUBLIC(QQuickNinePatchImage) - -public: - void updatePatches(); - void updatePaddings(const QSizeF &size, const QVector &horizontal, const QVector &vertical); - void updateInsets(const QVector &horizontal, const QVector &vertical); - - bool resetNode = false; - qreal topPadding = 0; - qreal leftPadding = 0; - qreal rightPadding = 0; - qreal bottomPadding = 0; - qreal topInset = 0; - qreal leftInset = 0; - qreal rightInset = 0; - qreal bottomInset = 0; - - QImage ninePatch; - QQuickNinePatchData xDivs; - QQuickNinePatchData yDivs; -}; - -static QVector readCoords(const QRgb *data, int from, int count, int offset, QRgb color) -{ - int p1 = -1; - QVector coords; - for (int i = 0; i < count; ++i) { - int p2 = from + i * offset; - if (data[p2] == color) { - // colored pixel - if (p1 == -1) - p1 = i; - } else { - // empty pixel - if (p1 != -1) { - coords << p1 << i; - p1 = -1; - } - } - } - return coords; -} - -void QQuickNinePatchImagePrivate::updatePatches() -{ - if (ninePatch.isNull()) - return; - - int w = ninePatch.width(); - int h = ninePatch.height(); - const QRgb *data = reinterpret_cast(ninePatch.constBits()); - - const QRgb black = qRgb(0,0,0); - const QRgb red = qRgb(255,0,0); - - xDivs.fill(readCoords(data, 1, w - 1, 1, black), w - 2); // top left -> top right - yDivs.fill(readCoords(data, w, h - 1, w, black), h - 2); // top left -> bottom left - - QVector hInsets = readCoords(data, (h - 1) * w + 1, w - 1, 1, red); // bottom left -> bottom right - QVector vInsets = readCoords(data, 2 * w - 1, h - 1, w, red); // top right -> bottom right - updateInsets(hInsets, vInsets); - - const QSizeF sz(w - leftInset - rightInset, h - topInset - bottomInset); - QVector hPaddings = readCoords(data, (h - 1) * w + leftInset + 1, sz.width() - 2, 1, black); // bottom left -> bottom right - QVector vPaddings = readCoords(data, (2 + topInset) * w - 1, sz.height() - 2, w, black); // top right -> bottom right - updatePaddings(sz, hPaddings, vPaddings); -} - -void QQuickNinePatchImagePrivate::updatePaddings(const QSizeF &size, const QVector &horizontal, const QVector &vertical) -{ - Q_Q(QQuickNinePatchImage); - qreal oldTopPadding = topPadding; - qreal oldLeftPadding = leftPadding; - qreal oldRightPadding = rightPadding; - qreal oldBottomPadding = bottomPadding; - - if (horizontal.count() >= 2) { - leftPadding = horizontal.first(); - rightPadding = size.width() - horizontal.last() - 2; - } else { - leftPadding = 0; - rightPadding = 0; - } - - if (vertical.count() >= 2) { - topPadding = vertical.first(); - bottomPadding = size.height() - vertical.last() - 2; - } else { - topPadding = 0; - bottomPadding = 0; - } - - if (!qFuzzyCompare(oldTopPadding, topPadding)) - emit q->topPaddingChanged(); - if (!qFuzzyCompare(oldBottomPadding, bottomPadding)) - emit q->bottomPaddingChanged(); - if (!qFuzzyCompare(oldLeftPadding, leftPadding)) - emit q->leftPaddingChanged(); - if (!qFuzzyCompare(oldRightPadding, rightPadding)) - emit q->rightPaddingChanged(); -} - -void QQuickNinePatchImagePrivate::updateInsets(const QVector &horizontal, const QVector &vertical) -{ - Q_Q(QQuickNinePatchImage); - qreal oldTopInset = topInset; - qreal oldLeftInset = leftInset; - qreal oldRightInset = rightInset; - qreal oldBottomInset = bottomInset; - - if (horizontal.count() >= 2 && horizontal.first() == 0) - leftInset = horizontal.at(1); - else - leftInset = 0; - - if (horizontal.count() == 2 && horizontal.first() > 0) - rightInset = horizontal.last() - horizontal.first(); - else if (horizontal.count() == 4) - rightInset = horizontal.last() - horizontal.at(2); - else - rightInset = 0; - - if (vertical.count() >= 2 && vertical.first() == 0) - topInset = vertical.at(1); - else - topInset = 0; - - if (vertical.count() == 2 && vertical.first() > 0) - bottomInset = vertical.last() - vertical.first(); - else if (vertical.count() == 4) - bottomInset = vertical.last() - vertical.at(2); - else - bottomInset = 0; - - if (!qFuzzyCompare(oldTopInset, topInset)) - emit q->topInsetChanged(); - if (!qFuzzyCompare(oldBottomInset, bottomInset)) - emit q->bottomInsetChanged(); - if (!qFuzzyCompare(oldLeftInset, leftInset)) - emit q->leftInsetChanged(); - if (!qFuzzyCompare(oldRightInset, rightInset)) - emit q->rightInsetChanged(); -} - -QQuickNinePatchImage::QQuickNinePatchImage(QQuickItem *parent) - : QQuickImage(*(new QQuickNinePatchImagePrivate), parent) -{ -} - -qreal QQuickNinePatchImage::topPadding() const -{ - Q_D(const QQuickNinePatchImage); - return d->topPadding / d->devicePixelRatio; -} - -qreal QQuickNinePatchImage::leftPadding() const -{ - Q_D(const QQuickNinePatchImage); - return d->leftPadding / d->devicePixelRatio; -} - -qreal QQuickNinePatchImage::rightPadding() const -{ - Q_D(const QQuickNinePatchImage); - return d->rightPadding / d->devicePixelRatio; -} - -qreal QQuickNinePatchImage::bottomPadding() const -{ - Q_D(const QQuickNinePatchImage); - return d->bottomPadding / d->devicePixelRatio; -} - -qreal QQuickNinePatchImage::topInset() const -{ - Q_D(const QQuickNinePatchImage); - return d->topInset / d->devicePixelRatio; -} - -qreal QQuickNinePatchImage::leftInset() const -{ - Q_D(const QQuickNinePatchImage); - return d->leftInset / d->devicePixelRatio; -} - -qreal QQuickNinePatchImage::rightInset() const -{ - Q_D(const QQuickNinePatchImage); - return d->rightInset / d->devicePixelRatio; -} - -qreal QQuickNinePatchImage::bottomInset() const -{ - Q_D(const QQuickNinePatchImage); - return d->bottomInset / d->devicePixelRatio; -} - -void QQuickNinePatchImage::pixmapChange() -{ - Q_D(QQuickNinePatchImage); - if (QFileInfo(d->url.fileName()).completeSuffix().toLower() == QLatin1String("9.png")) { - d->resetNode = d->ninePatch.isNull(); - d->ninePatch = d->pix.image(); - if (d->ninePatch.depth() != 32) - d->ninePatch = d->ninePatch.convertToFormat(QImage::Format_ARGB32); - - int w = d->ninePatch.width(); - int h = d->ninePatch.height(); - d->pix.setImage(QImage(d->ninePatch.constBits() + 4 * (w + 1), w - 2, h - 2, d->ninePatch.bytesPerLine(), d->ninePatch.format())); - - d->updatePatches(); - } else { - d->resetNode = !d->ninePatch.isNull(); - d->ninePatch = QImage(); - } - QQuickImage::pixmapChange(); -} - -QSGNode *QQuickNinePatchImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) -{ - Q_D(QQuickNinePatchImage); - Q_UNUSED(data); - - if (d->resetNode) { - delete oldNode; - oldNode = nullptr; - d->resetNode = false; - } - - QSizeF sz = size(); - QImage image = d->pix.image(); - if (!sz.isValid() || image.isNull()) { - delete oldNode; - return nullptr; - } - - if (d->ninePatch.isNull()) - return QQuickImage::updatePaintNode(oldNode, data); - - QQuickNinePatchNode *patchNode = static_cast(oldNode); - if (!patchNode) - patchNode = new QQuickNinePatchNode; - -#ifdef QSG_RUNTIME_DESCRIPTION - qsgnode_set_description(patchNode, QString::fromLatin1("QQuickNinePatchImage: '%1'").arg(d->url.toString())); -#endif - - QSGTexture *texture = window()->createTextureFromImage(image); - patchNode->initialize(texture, sz * d->devicePixelRatio, image.size(), d->xDivs, d->yDivs, d->devicePixelRatio); - return patchNode; -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickninepatchimage_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickninepatchimage_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qquickninepatchimage_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qquickninepatchimage_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKNINEPATCHIMAGE_P_H -#define QQUICKNINEPATCHIMAGE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -QT_BEGIN_NAMESPACE - -class QQuickNinePatchImagePrivate; - -class QQuickNinePatchImage : public QQuickImage -{ - Q_OBJECT - Q_PROPERTY(qreal topPadding READ topPadding NOTIFY topPaddingChanged FINAL) - Q_PROPERTY(qreal leftPadding READ leftPadding NOTIFY leftPaddingChanged FINAL) - Q_PROPERTY(qreal rightPadding READ rightPadding NOTIFY rightPaddingChanged FINAL) - Q_PROPERTY(qreal bottomPadding READ bottomPadding NOTIFY bottomPaddingChanged FINAL) - Q_PROPERTY(qreal topInset READ topInset NOTIFY topInsetChanged FINAL) - Q_PROPERTY(qreal leftInset READ leftInset NOTIFY leftInsetChanged FINAL) - Q_PROPERTY(qreal rightInset READ rightInset NOTIFY rightInsetChanged FINAL) - Q_PROPERTY(qreal bottomInset READ bottomInset NOTIFY bottomInsetChanged FINAL) - -public: - explicit QQuickNinePatchImage(QQuickItem *parent = nullptr); - - qreal topPadding() const; - qreal leftPadding() const; - qreal rightPadding() const; - qreal bottomPadding() const; - - qreal topInset() const; - qreal leftInset() const; - qreal rightInset() const; - qreal bottomInset() const; - -Q_SIGNALS: - void topPaddingChanged(); - void leftPaddingChanged(); - void rightPaddingChanged(); - void bottomPaddingChanged(); - - void topInsetChanged(); - void leftInsetChanged(); - void rightInsetChanged(); - void bottomInsetChanged(); - -protected: - void pixmapChange() override; - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) override; - -private: - Q_DISABLE_COPY(QQuickNinePatchImage) - Q_DECLARE_PRIVATE(QQuickNinePatchImage) -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QQuickNinePatchImage) - -#endif // QQUICKNINEPATCHIMAGE_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include - -#include "qquickimageselector_p.h" -#include "qquickimaginestyle_p.h" -#include "qquickimaginetheme_p.h" -#include "qquickninepatchimage_p.h" - -QT_BEGIN_NAMESPACE - -Q_LOGGING_CATEGORY(lcQtQuickControlsImagine, "qt.quick.controls.imagine") - -class QtQuickControls2ImagineStylePlugin: public QQuickStylePlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) - -public: - QtQuickControls2ImagineStylePlugin(QObject *parent = nullptr); - - void registerTypes(const char *uri) override; - - QString name() const override; - void initializeTheme(QQuickTheme *theme) override; -}; - -QtQuickControls2ImagineStylePlugin::QtQuickControls2ImagineStylePlugin(QObject *parent) : QQuickStylePlugin(parent) -{ -} - -void QtQuickControls2ImagineStylePlugin::registerTypes(const char *uri) -{ - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... - qmlRegisterUncreatableType(uri, 2, 3, "Imagine", tr("Imagine is an attached property")); - - QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... - - qmlRegisterType(import, 2, 3, "AnimatedImageSelector"); - qmlRegisterType(import, 2, 3, "ImageSelector"); - qmlRegisterType(import, 2, 3, "NinePatchImage"); - qmlRegisterType(import, 2, 3, "NinePatchImageSelector"); -} - -QString QtQuickControls2ImagineStylePlugin::name() const -{ - return QStringLiteral("Imagine"); -} - -void QtQuickControls2ImagineStylePlugin::initializeTheme(QQuickTheme *theme) -{ - QQuickImagineTheme::initialize(theme); -} - -QT_END_NAMESPACE - -#include "qtquickcontrols2imaginestyleplugin.moc" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/RadioButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/RadioButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/RadioButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/RadioButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.RadioButton { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - spacing: 6 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - indicator: Image { - x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 - y: control.topPadding + (control.availableHeight - height) / 2 - - source: Imagine.url + "radiobutton-indicator" - ImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - contentItem: Text { - leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 - - text: control.text - font: control.font - color: control.palette.windowText - elide: Text.ElideRight - verticalAlignment: Text.AlignVCenter - } - - background: NinePatchImage { - source: Imagine.url + "radiobutton-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/RadioDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/RadioDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/RadioDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/RadioDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.RadioDelegate { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - spacing: 12 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - icon.width: 24 - icon.height: 24 - icon.color: control.palette.text - - indicator: Image { - x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding - y: control.topPadding + (control.availableHeight - height) / 2 - - source: Imagine.url + "radiodelegate-indicator" - ImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - contentItem: IconLabel { - leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0 - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.palette.text - } - - background: NinePatchImage { - source: Imagine.url + "radiodelegate-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/RangeSlider.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/RangeSlider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/RangeSlider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/RangeSlider.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,134 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.RangeSlider { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - first.implicitHandleWidth + leftPadding + rightPadding, - second.implicitHandleWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - first.implicitHandleHeight + topPadding + bottomPadding, - second.implicitHandleHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - first.handle: Image { - x: control.leftPadding + (control.horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) - - source: Imagine.url + "rangeslider-handle" - ImageSelector on source { - states: [ - {"first": true}, - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"pressed": control.first.pressed}, - {"focused": control.first.handle.activeFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.first.hovered} - ] - } - } - - second.handle: Image { - x: control.leftPadding + (control.horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) - - source: Imagine.url + "rangeslider-handle" - ImageSelector on source { - states: [ - {"second": true}, - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"pressed": control.second.pressed}, - {"focused": control.second.handle.activeFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.second.hovered} - ] - } - } - - background: NinePatchImage { - scale: control.horizontal && control.mirrored ? -1 : 1 - - source: Imagine.url + "rangeslider-background" - NinePatchImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - - NinePatchImage { - x: control.horizontal ? control.first.handle.width / 2 + control.first.position * (parent.width - control.first.handle.width) : (parent.width - width) / 2 - y: control.horizontal ? (parent.height - height) / 2 : control.first.handle.height / 2 + control.second.visualPosition * (parent.height - control.first.handle.height) - width: control.horizontal ? control.second.position * (parent.width - control.first.handle.width) - control.first.position * (parent.width - control.first.handle.width) : parent.width - height: control.vertical ? control.second.position * (parent.height - control.first.handle.height) - control.first.position * (parent.height - control.first.handle.height): parent.height - - source: Imagine.url + "rangeslider-progress" - NinePatchImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/RoundButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/RoundButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/RoundButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/RoundButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.RoundButton { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - icon.width: 24 - icon.height: 24 - icon.color: control.enabled && control.flat && control.highlighted ? control.palette.highlight - : control.enabled && (control.down || control.checked || control.highlighted) && !control.flat - ? control.palette.brightText : control.flat ? control.palette.windowText : control.palette.buttonText - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon - text: control.text - font: control.font - color: control.enabled && control.flat && control.highlighted ? control.palette.highlight - : control.enabled && (control.down || control.checked || control.highlighted) && !control.flat - ? control.palette.brightText : control.flat ? control.palette.windowText : control.palette.buttonText - } - - background: NinePatchImage { - // ### TODO: radius? - source: Imagine.url + "roundbutton-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"checkable": control.checkable}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"flat": control.flat}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ScrollBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ScrollBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ScrollBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ScrollBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.ScrollBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - visible: control.policy !== T.ScrollBar.AlwaysOff - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - contentItem: NinePatchImage { - width: control.availableWidth - height: control.availableHeight - - source: Imagine.url + "scrollbar-handle" - NinePatchImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"interactive": control.interactive}, - {"pressed": control.pressed}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - opacity: 0.0 - } - - background: NinePatchImage { - source: Imagine.url + "scrollbar-background" - NinePatchImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"interactive": control.interactive}, - {"pressed": control.pressed}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - opacity: 0.0 - } - - states: [ - State { - name: "active" - when: control.policy === T.ScrollBar.AlwaysOn || (control.active && control.size < 1.0) - } - ] - - transitions: [ - Transition { - to: "active" - NumberAnimation { targets: [contentItem, background]; property: "opacity"; to: 1.0 } - }, - Transition { - from: "active" - SequentialAnimation { - PropertyAction{ targets: [contentItem, background]; property: "opacity"; value: 1.0 } - PauseAnimation { duration: 3000 } - NumberAnimation { targets: [contentItem, background]; property: "opacity"; to: 0.0 } - } - } - ] -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ScrollIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ScrollIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ScrollIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ScrollIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.ScrollIndicator { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - contentItem: NinePatchImage { - width: control.availableWidth - height: control.availableHeight - - source: Imagine.url + "scrollindicator-handle" - NinePatchImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - opacity: 0.0 - } - - background: NinePatchImage { - source: Imagine.url + "scrollindicator-background" - NinePatchImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - opacity: 0.0 - } - - states: [ - State { - name: "active" - when: (control.active && control.size < 1.0) - } - ] - - transitions: [ - Transition { - to: "active" - NumberAnimation { targets: [contentItem, background]; property: "opacity"; to: 1.0 } - }, - Transition { - from: "active" - SequentialAnimation { - PauseAnimation { duration: 5000 } - NumberAnimation { targets: [contentItem, background]; property: "opacity"; to: 0.0 } - } - } - ] -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ScrollView.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ScrollView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ScrollView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ScrollView.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.ScrollView { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - T.ScrollBar.vertical: ScrollBar { - parent: control - x: control.mirrored ? 0 : control.width - width - y: control.topPadding - height: control.availableHeight - active: control.T.ScrollBar.horizontal.active - } - - T.ScrollBar.horizontal: ScrollBar { - parent: control - x: control.leftPadding - y: control.height - height - width: control.availableWidth - active: control.T.ScrollBar.vertical.active - } - - background: NinePatchImage { - source: Imagine.path + "scrollview-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Slider.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Slider.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Slider { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitHandleWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitHandleHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - handle: Image { - x: Math.round(control.leftPadding + (control.horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)) - y: Math.round(control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height))) - - source: Imagine.url + "slider-handle" - ImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"pressed": control.pressed}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - - background: NinePatchImage { - scale: control.horizontal && control.mirrored ? -1 : 1 - - source: Imagine.url + "slider-background" - NinePatchImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - - NinePatchImage { - x: control.horizontal ? 0 : (parent.width - width) / 2 - y: control.horizontal - ? (parent.height - height) / 2 - : control.handle.height / 2 + control.visualPosition * (parent.height - control.handle.height) - width: control.horizontal - ? control.handle.width / 2 + control.position * (parent.width - control.handle.width) - : parent.width - height: control.vertical - ? control.handle.height / 2 + control.position * (parent.height - control.handle.height) - : parent.height - - source: Imagine.url + "slider-progress" - NinePatchImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/SpinBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/SpinBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/SpinBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/SpinBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,152 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.SpinBox { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentItem.implicitWidth + 2 * padding + - up.implicitIndicatorWidth + - down.implicitIndicatorWidth) - implicitHeight: Math.max(implicitContentHeight + topPadding + bottomPadding, - implicitBackgroundHeight, - up.implicitIndicatorHeight, - down.implicitIndicatorHeight) - - topPadding: background ? background.topPadding : 0 - leftPadding: (background ? background.leftPadding : 0) + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) - rightPadding: (background ? background.rightPadding : 0) + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - validator: IntValidator { - locale: control.locale.name - bottom: Math.min(control.from, control.to) - top: Math.max(control.from, control.to) - } - - contentItem: TextInput { - z: 2 - text: control.displayText - opacity: control.enabled ? 1 : 0.3 - - font: control.font - color: control.palette.text - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText - horizontalAlignment: Qt.AlignHCenter - verticalAlignment: Qt.AlignVCenter - - readOnly: !control.editable - validator: control.validator - inputMethodHints: control.inputMethodHints - - NinePatchImage { - z: -1 - width: control.width - height: control.height - visible: control.editable - - source: Imagine.url + "spinbox-editor" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"focused": control.activeFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } - } - - up.indicator: NinePatchImage { - x: control.mirrored ? 0 : parent.width - width - height: parent.height - - source: Imagine.url + "spinbox-indicator" - NinePatchImageSelector on source { - states: [ - {"up": true}, - {"disabled": !control.up.indicator.enabled}, - {"editable": control.editable}, - {"pressed": control.up.pressed}, - {"focused": control.activeFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.up.hovered} - ] - } - } - - down.indicator: NinePatchImage { - x: control.mirrored ? parent.width - width : 0 - height: parent.height - - source: Imagine.url + "spinbox-indicator" - NinePatchImageSelector on source { - states: [ - {"down": true}, - {"disabled": !control.down.indicator.enabled}, - {"editable": control.editable}, - {"pressed": control.down.pressed}, - {"focused": control.activeFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.down.hovered} - ] - } - } - - background: NinePatchImage { - source: Imagine.url + "spinbox-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"editable": control.editable}, - {"focused": control.activeFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/StackView.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/StackView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/StackView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/StackView.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.StackView { - id: control - - implicitWidth: implicitBackgroundWidth - implicitHeight: implicitBackgroundHeight - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - popEnter: Transition { - XAnimator { from: (control.mirrored ? -1 : 1) * -control.width; to: 0; duration: 400; easing.type: Easing.OutCubic } - } - - popExit: Transition { - XAnimator { from: 0; to: (control.mirrored ? -1 : 1) * control.width; duration: 400; easing.type: Easing.OutCubic } - } - - pushEnter: Transition { - XAnimator { from: (control.mirrored ? -1 : 1) * control.width; to: 0; duration: 400; easing.type: Easing.OutCubic } - } - - pushExit: Transition { - XAnimator { from: 0; to: (control.mirrored ? -1 : 1) * -control.width; duration: 400; easing.type: Easing.OutCubic } - } - - replaceEnter: Transition { - XAnimator { from: (control.mirrored ? -1 : 1) * control.width; to: 0; duration: 400; easing.type: Easing.OutCubic } - } - - replaceExit: Transition { - XAnimator { from: 0; to: (control.mirrored ? -1 : 1) * -control.width; duration: 400; easing.type: Easing.OutCubic } - } - - background: NinePatchImage { - source: Imagine.url + "stackview-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/SwipeDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/SwipeDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/SwipeDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/SwipeDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.SwipeDelegate { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - spacing: 12 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - icon.width: 24 - icon.height: 24 - icon.color: control.palette.text - - swipe.transition: Transition { SmoothedAnimation { velocity: 3; easing.type: Easing.InOutCubic } } - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.palette.text - } - - background: NinePatchImage { - source: Imagine.url + "swipedelegate-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/SwipeView.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/SwipeView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/SwipeView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/SwipeView.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.SwipeView { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - contentItem: ListView { - model: control.contentModel - interactive: control.interactive - currentIndex: control.currentIndex - - spacing: control.spacing - orientation: control.orientation - snapMode: ListView.SnapOneItem - boundsBehavior: Flickable.StopAtBounds - - highlightRangeMode: ListView.StrictlyEnforceRange - preferredHighlightBegin: 0 - preferredHighlightEnd: 0 - highlightMoveDuration: 250 - } - - background: NinePatchImage { - source: Imagine.url + "swipeview-background" - NinePatchImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"interactive": control.interactive}, - {"focused": control.contentItem.activeFocus}, - {"mirrored": control.mirrored} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/SwitchDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/SwitchDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/SwitchDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/SwitchDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,147 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.SwitchDelegate { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - spacing: 12 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - icon.width: 24 - icon.height: 24 - icon.color: control.palette.text - - indicator: NinePatchImage { - x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 - y: control.topPadding + (control.availableHeight - height) / 2 - width: Math.max(implicitWidth, handle.leftPadding && handle.rightPadding ? handle.implicitWidth : 2 * handle.implicitWidth) - height: Math.max(implicitHeight, handle.implicitHeight) - - source: Imagine.url + "switchdelegate-indicator" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - - property NinePatchImage handle: NinePatchImage { - readonly property real minPos: parent.leftPadding - leftPadding - readonly property real maxPos: parent.width - width + rightPadding - parent.rightPadding - readonly property real dragPos: control.visualPosition * parent.width - (width / 2) - - parent: control.indicator - - x: Math.max(minPos, Math.min(maxPos, control.visualPosition * parent.width - (width / 2))) - y: (parent.height - height) / 2 - - source: Imagine.url + "switchdelegate-handle" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - - Behavior on x { - enabled: !control.down - SmoothedAnimation { velocity: 200 } - } - } - } - - contentItem: IconLabel { - leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0 - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.palette.text - } - - background: NinePatchImage { - source: Imagine.url + "switchdelegate-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Switch.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Switch.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,134 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Switch { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - spacing: 6 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - indicator: NinePatchImage { - x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 - y: control.topPadding + (control.availableHeight - height) / 2 - width: Math.max(implicitWidth, handle.leftPadding && handle.rightPadding ? handle.implicitWidth : 2 * handle.implicitWidth) - height: Math.max(implicitHeight, handle.implicitHeight) - - source: Imagine.url + "switch-indicator" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - - property NinePatchImage handle: NinePatchImage { - readonly property real minPos: parent.leftPadding - leftPadding - readonly property real maxPos: parent.width - width + rightPadding - parent.rightPadding - readonly property real dragPos: control.visualPosition * parent.width - (width / 2) - - parent: control.indicator - - x: Math.max(minPos, Math.min(maxPos, control.visualPosition * parent.width - (width / 2))) - y: (parent.height - height) / 2 - - source: Imagine.url + "switch-handle" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - - Behavior on x { - enabled: !control.down - SmoothedAnimation { velocity: 200 } - } - } - } - - contentItem: Text { - leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 - - text: control.text - font: control.font - color: control.palette.windowText - elide: Text.ElideRight - verticalAlignment: Text.AlignVCenter - } - - background: NinePatchImage { - source: Imagine.url + "switch-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/TabBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/TabBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/TabBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/TabBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.TabBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - contentItem: ListView { - model: control.contentModel - currentIndex: control.currentIndex - - spacing: control.spacing - orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds - flickableDirection: Flickable.AutoFlickIfNeeded - snapMode: ListView.SnapToItem - - highlightMoveDuration: 0 - highlightRangeMode: ListView.ApplyRange - preferredHighlightBegin: 48 - preferredHighlightEnd: width - 48 - } - - background: NinePatchImage { - source: Imagine.url + "tabbar-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"header": control.position === T.TabBar.Header }, - {"footer": control.position === T.TabBar.Footer }, - {"mirrored": control.mirrored} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/TabButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/TabButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/TabButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/TabButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.TabButton { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - spacing: 6 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - icon.width: 24 - icon.height: 24 - icon.color: control.palette.buttonText - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon - text: control.text - font: control.font - color: control.palette.buttonText - } - - background: NinePatchImage { - source: Imagine.url + "tabbutton-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/TextArea.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/TextArea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/TextArea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/TextArea.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.TextArea { - id: control - - implicitWidth: Math.max(contentWidth + leftPadding + rightPadding, - implicitBackgroundWidth + leftInset + rightInset, - placeholder.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, - implicitBackgroundHeight + topInset + bottomInset, - placeholder.implicitHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - color: control.palette.text - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText - verticalAlignment: Qt.AlignVCenter - placeholderTextColor: Color.transparent(control.color, 0.5) - - PlaceholderText { - id: placeholder - x: control.leftPadding - y: control.topPadding - width: control.width - (control.leftPadding + control.rightPadding) - height: control.height - (control.topPadding + control.bottomPadding) - - text: control.placeholderText - font: control.font - color: control.placeholderTextColor - verticalAlignment: control.verticalAlignment - visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) - elide: Text.ElideRight - renderType: control.renderType - } - - background: NinePatchImage { - source: Imagine.url + "textarea-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"focused": control.activeFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/TextField.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/TextField.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/TextField.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/TextField.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.TextField { - id: control - - implicitWidth: implicitBackgroundWidth + leftInset + rightInset - || Math.max(contentWidth, placeholder.implicitWidth) + leftPadding + rightPadding - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding, - placeholder.implicitHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - color: control.palette.text - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText - placeholderTextColor: Color.transparent(control.color, 0.5) - verticalAlignment: Qt.AlignVCenter - - PlaceholderText { - id: placeholder - x: control.leftPadding - y: control.topPadding - width: control.width - (control.leftPadding + control.rightPadding) - height: control.height - (control.topPadding + control.bottomPadding) - - text: control.placeholderText - font: control.font - color: control.placeholderTextColor - verticalAlignment: control.verticalAlignment - visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) - elide: Text.ElideRight - renderType: control.renderType - } - - background: NinePatchImage { - source: Imagine.url + "textfield-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"focused": control.activeFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ToolBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ToolBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.ToolBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - background: NinePatchImage { - source: Imagine.url + "toolbar-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"header": control.position === T.ToolBar.Header }, - {"footer": control.position === T.ToolBar.Footer }, - {"mirrored": control.mirrored} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ToolButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ToolButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ToolButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ToolButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.ToolButton { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - spacing: 6 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - icon.width: 24 - icon.height: 24 - icon.color: control.palette.buttonText - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon - text: control.text - font: control.font - color: control.palette.buttonText - } - - background: NinePatchImage { - source: Imagine.url + "toolbutton-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"checkable": control.checkable}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"flat": control.flat}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ToolSeparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ToolSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ToolSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ToolSeparator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.ToolSeparator { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - contentItem: NinePatchImage { - source: Imagine.url + "toolseparator-separator" - NinePatchImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } - - background: NinePatchImage { - source: Imagine.url + "toolseparator-background" - NinePatchImageSelector on source { - states: [ - {"vertical": control.vertical}, - {"horizontal": control.horizontal}, - {"disabled": !control.enabled}, - {"mirrored": control.mirrored} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ToolTip.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ToolTip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/ToolTip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/ToolTip.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.ToolTip { - id: control - - x: parent ? (parent.width - implicitWidth) / 2 : 0 - (background ? background.leftInset : 0) - y: -implicitHeight - (background ? background.topInset : 0) - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - topMargin: background ? background.topInset : 0 - leftMargin: background ? background.leftInset : 0 - rightMargin: background ? background.rightInset : 0 - bottomMargin: background ? background.bottomInset : 0 - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent - - contentItem: Text { - text: control.text - font: control.font - // TODO: wrapMode: Label.Wrap - color: control.palette.toolTipText - } - - background: NinePatchImage { - source: Imagine.url + "tooltip-background" - NinePatchImageSelector on source { - states: [ - // ### - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Tumbler.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/imagine/Tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/imagine/Tumbler.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -T.Tumbler { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) || 60 // ### remove 60 in Qt 6 - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) || 200 // ### remove 200 in Qt 6 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - delegate: Text { - text: modelData - font: control.font - color: control.palette.text - opacity: (1.0 - Math.abs(Tumbler.displacement) / (control.visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - } - - contentItem: TumblerView { - implicitWidth: 60 - implicitHeight: 200 - model: control.model - delegate: control.delegate - path: Path { - startX: contentItem.width / 2 - startY: -contentItem.delegateHeight / 2 - PathLine { - x: contentItem.width / 2 - y: (control.visibleItemCount + 1) * contentItem.delegateHeight - contentItem.delegateHeight / 2 - } - } - - property real delegateHeight: control.availableHeight / control.visibleItemCount - } - - background: NinePatchImage { - source: Imagine.url + "tumbler-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"focused": control.visualFocus}, - {"mirrored": control.mirrored}, - {"hovered": control.hovered} - ] - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ItemDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ItemDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ItemDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ItemDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,44 +34,41 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.ItemDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 12 - spacing: 8 + spacing: 12 - icon.width: 24 - icon.height: 24 - icon.color: control.palette.text - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft + contentItem: Text { + leftPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 + rightPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 - icon: control.icon text: control.text font: control.font - color: control.highlighted ? control.palette.highlightedText : control.palette.text + color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } background: Rectangle { implicitWidth: 100 implicitHeight: 40 visible: control.down || control.highlighted || control.visualFocus - color: Color.blend(control.down ? control.palette.midlight : control.palette.light, - control.palette.highlight, control.visualFocus ? 0.15 : 0.0) + color: control.visualFocus + ? (control.pressed ? Default.focusPressedColor : Default.delegateFocusColor) + : (control.down ? Default.delegatePressedColor : Default.delegateColor) } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Label.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,14 +34,14 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.Label { id: control - color: control.palette.windowText - linkColor: control.palette.link + color: Default.textDarkColor + linkColor: Default.textLinkColor } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ApplicationWindow.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ApplicationWindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ApplicationWindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ApplicationWindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Window 2.3 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 T.ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/BoxShadow.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/BoxShadow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/BoxShadow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/BoxShadow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 /* A implementation of CSS's box-shadow, used by ElevationEffect for a Material Design diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/BusyIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/BusyIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/BusyIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/BusyIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,24 +34,22 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.BusyIndicator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding + implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding padding: 6 contentItem: BusyIndicatorImpl { - implicitWidth: control.Material.touchTarget - implicitHeight: control.Material.touchTarget + implicitWidth: 48 + implicitHeight: 48 color: control.Material.accentColor running: control.running diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Button.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,54 +34,49 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.Button { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset - topInset: 6 - bottomInset: 6 + // external vertical padding is 6 (to increase touch area) padding: 12 - horizontalPadding: padding - 4 - spacing: 6 - - icon.width: 24 - icon.height: 24 - icon.color: !enabled ? Material.hintTextColor : - flat && highlighted ? Material.accentColor : - highlighted ? Material.primaryHighlightedTextColor : Material.foreground + leftPadding: padding - 4 + rightPadding: padding - 4 Material.elevation: flat ? control.down || control.hovered ? 2 : 0 : control.down ? 8 : 2 Material.background: flat ? "transparent" : undefined - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font color: !control.enabled ? control.Material.hintTextColor : control.flat && control.highlighted ? control.Material.accentColor : control.highlighted ? control.Material.primaryHighlightedTextColor : control.Material.foreground + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight } + // TODO: Add a proper ripple/ink effect for mouse/touch input and focus state background: Rectangle { implicitWidth: 64 - implicitHeight: control.Material.buttonHeight + implicitHeight: 48 + // external vertical padding is 6 (to increase touch area) + y: 6 + width: parent.width + height: parent.height - 12 radius: 2 color: !control.enabled ? control.Material.buttonDisabledColor : control.highlighted ? control.Material.highlightedButtonColor : control.Material.buttonColor @@ -112,7 +107,7 @@ pressed: control.pressed anchor: control active: control.down || control.visualFocus || control.hovered - color: control.flat && control.highlighted ? control.Material.highlightedRippleColor : control.Material.rippleColor + color: control.Material.rippleColor } } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/CheckBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,23 +34,25 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.CheckBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset spacing: 8 padding: 8 - verticalPadding: padding + 7 + topPadding: padding + 7 + bottomPadding: padding + 7 indicator: CheckIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/CheckDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/CheckDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/CheckDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/CheckDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,53 +34,45 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.CheckDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 16 - verticalPadding: 8 + topPadding: 14 + bottomPadding: 14 spacing: 16 - icon.width: 24 - icon.height: 24 - icon.color: enabled ? Material.foreground : Material.hintTextColor - indicator: CheckIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - contentItem: IconLabel { + contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon text: control.text font: control.font color: control.enabled ? control.Material.foreground : control.Material.hintTextColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } background: Rectangle { - implicitHeight: control.Material.delegateHeight + implicitHeight: 48 color: control.highlighted ? control.Material.listHighlightColor : "transparent" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/CheckIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/CheckIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/CheckIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/CheckIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,22 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 Rectangle { id: indicatorItem implicitWidth: 18 implicitHeight: 18 color: "transparent" - border.color: !control.enabled ? control.Material.hintTextColor - : checkState !== Qt.Unchecked ? control.Material.accentColor : control.Material.secondaryTextColor - border.width: checkState !== Qt.Unchecked ? width / 2 : 2 + border.color: control.checked && control.enabled ? control.Material.accentColor : control.Material.secondaryTextColor + border.width: control.checked ? width / 2 : 2 radius: 2 property Item control - property int checkState: control.checkState Behavior on border.width { NumberAnimation { @@ -75,7 +73,7 @@ source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Material/images/check.png" fillMode: Image.PreserveAspectFit - scale: checkState === Qt.Checked ? 1 : 0 + scale: control.checkState === Qt.Checked ? 1 : 0 Behavior on scale { NumberAnimation { duration: 100 } } } @@ -85,18 +83,18 @@ width: 12 height: 3 - scale: checkState === Qt.PartiallyChecked ? 1 : 0 + scale: control.checkState === Qt.PartiallyChecked ? 1 : 0 Behavior on scale { NumberAnimation { duration: 100 } } } states: [ State { name: "checked" - when: checkState === Qt.Checked + when: control.checkState === Qt.Checked }, State { name: "partiallychecked" - when: checkState === Qt.PartiallyChecked + when: control.checkState === Qt.PartiallyChecked } ] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ComboBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ComboBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ComboBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ComboBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,25 +34,22 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Window 2.3 +import QtQuick.Controls 2.2 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.ComboBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - topInset: 6 - bottomInset: 6 + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) @@ -70,11 +67,12 @@ hoverEnabled: control.hoverEnabled } - indicator: ColorImage { + indicator: Image { x: control.mirrored ? control.padding : control.width - width - control.padding y: control.topPadding + (control.availableHeight - height) / 2 - color: control.enabled ? control.Material.foreground : control.Material.hintTextColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Material/images/drop-indicator.png" + source: "image://material/drop-indicator/" + (control.enabled ? control.Material.foreground : control.Material.hintTextColor) + sourceSize.width: width + sourceSize.height: height } contentItem: T.TextField { @@ -101,8 +99,11 @@ background: Rectangle { implicitWidth: 120 - implicitHeight: control.Material.buttonHeight + implicitHeight: 48 + // external vertical padding is 6 (to increase touch area) + y: 6 + height: parent.height - 12 radius: control.flat ? 0 : 2 color: !control.editable ? control.Material.dialogColor : "transparent" @@ -161,6 +162,7 @@ implicitHeight: contentHeight model: control.delegateModel currentIndex: control.highlightedIndex + highlightRangeMode: ListView.ApplyRange highlightMoveDuration: 0 T.ScrollIndicator.vertical: ScrollIndicator { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/CursorDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/CursorDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/CursorDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/CursorDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,8 +34,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Controls.Material 2.2 Rectangle { id: cursor @@ -55,7 +55,7 @@ Timer { id: timer - running: cursor.parent.activeFocus && !cursor.parent.readOnly && interval != 0 + running: cursor.parent.activeFocus && !cursor.parent.readOnly repeat: true interval: Qt.styleHints.cursorFlashTime / 2 onTriggered: cursor.opacity = !cursor.opacity ? 1 : 0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/DelayButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/DelayButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/DelayButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/DelayButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,25 +34,24 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.DelayButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset - topInset: 6 - bottomInset: 6 + // external vertical padding is 6 (to increase touch area) padding: 12 - horizontalPadding: padding - 4 + leftPadding: padding - 4 + rightPadding: padding - 4 Material.elevation: control.down ? 8 : 2 @@ -74,8 +73,12 @@ // TODO: Add a proper ripple/ink effect for mouse/touch input and focus state background: Rectangle { implicitWidth: 64 - implicitHeight: control.Material.buttonHeight + implicitHeight: 48 + // external vertical padding is 6 (to increase touch area) + y: 6 + width: parent.width + height: parent.height - 12 radius: 2 color: !control.enabled ? control.Material.buttonDisabledColor : control.Material.buttonColor diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/DialogButtonBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/DialogButtonBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/DialogButtonBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/DialogButtonBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,32 +34,34 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.DialogButtonBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) spacing: 8 padding: 8 - verticalPadding: 2 + topPadding: 2 + bottomPadding: 2 alignment: Qt.AlignRight - buttonLayout: T.DialogButtonBox.AndroidLayout Material.foreground: Material.accent delegate: Button { flat: true } contentItem: ListView { + implicitWidth: contentWidth + implicitHeight: 48 + model: control.contentModel spacing: control.spacing orientation: ListView.Horizontal @@ -68,7 +70,7 @@ } background: PaddedRectangle { - implicitHeight: control.Material.dialogButtonBoxHeight + implicitHeight: 52 radius: 2 color: control.Material.dialogColor // Rounded corners should be only at the top or at the bottom diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Dialog.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,24 +34,26 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.Dialog { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitHeaderWidth, - implicitFooterWidth) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding - + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) - + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + header && header.visible ? header.implicitWidth : 0, + footer && footer.visible ? footer.implicitWidth : 0, + contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + (header && header.visible ? header.implicitHeight + spacing : 0) + + (footer && footer.visible ? footer.implicitHeight + spacing : 0) + + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 24 topPadding: 20 @@ -100,14 +102,4 @@ footer: DialogButtonBox { visible: count > 0 } - - T.Overlay.modal: Rectangle { - color: control.Material.backgroundDimColor - Behavior on opacity { NumberAnimation { duration: 150 } } - } - - T.Overlay.modeless: Rectangle { - color: control.Material.backgroundDimColor - Behavior on opacity { NumberAnimation { duration: 150 } } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Dial.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Dial.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,23 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.Dial { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) || 100 // ### remove 100 in Qt 6 - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) || 100 // ### remove 100 in Qt 6 + implicitWidth: 100 + implicitHeight: 100 background: Rectangle { - implicitWidth: 100 - implicitHeight: 100 - x: control.width / 2 - width / 2 y: control.height / 2 - height / 2 width: Math.max(64, Math.min(control.width, control.height)) @@ -74,8 +69,8 @@ origin.y: handle.height / 2 } ] - implicitWidth: 10 - implicitHeight: 10 + implicitWidth: 14 + implicitHeight: 14 value: control.value handleHasFocus: control.visualFocus diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Drawer.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,21 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.Drawer { id: control - parent: T.Overlay.overlay + parent: T.ApplicationWindow.overlay - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) topPadding: !dim && edge === Qt.BottomEdge && Material.elevation === 0 leftPadding: !dim && edge === Qt.RightEdge && Material.elevation === 0 @@ -78,14 +79,4 @@ fullHeight: true } } - - T.Overlay.modal: Rectangle { - color: control.Material.backgroundDimColor - Behavior on opacity { NumberAnimation { duration: 150 } } - } - - T.Overlay.modeless: Rectangle { - color: control.Material.backgroundDimColor - Behavior on opacity { NumberAnimation { duration: 150 } } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ElevationEffect.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ElevationEffect.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ElevationEffect.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ElevationEffect.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 /* An effect for standard Material Design elevation shadows. Useful for using as \c layer.effect. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Frame.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,21 +34,21 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.Frame { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 12 - verticalPadding: Material.frameVerticalPadding background: Rectangle { radius: 2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/GroupBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/GroupBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/GroupBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/GroupBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,24 +34,25 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.GroupBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitLabelWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) spacing: 6 padding: 12 - topPadding: Material.frameVerticalPadding + (implicitLabelWidth > 0 ? implicitLabelHeight + spacing : 0) - bottomPadding: Material.frameVerticalPadding + topPadding: padding + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) label: Text { x: control.leftPadding @@ -65,9 +66,9 @@ } background: Rectangle { - y: control.topPadding - control.bottomPadding + y: control.topPadding - control.padding width: parent.width - height: parent.height - control.topPadding + control.bottomPadding + height: parent.height - control.topPadding + control.padding radius: 2 color: control.Material.elevation > 0 ? control.Material.backgroundColor : "transparent" Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/images/arrow-indicator@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/images/arrow-indicator@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/images/arrow-indicator@3x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/images/arrow-indicator@3x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/images/arrow-indicator@4x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/images/arrow-indicator@4x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/images/arrow-indicator.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/images/arrow-indicator.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/images/arrow-indicator.svg qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/images/arrow-indicator.svg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/images/arrow-indicator.svg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/images/arrow-indicator.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ItemDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ItemDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ItemDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ItemDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,44 +34,37 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.ItemDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 16 - verticalPadding: 8 spacing: 16 - icon.width: 24 - icon.height: 24 - icon.color: enabled ? Material.foreground : Material.hintTextColor - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft + contentItem: Text { + leftPadding: control.checkable && !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 + rightPadding: control.checkable && control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 - icon: control.icon text: control.text font: control.font color: control.enabled ? control.Material.foreground : control.Material.hintTextColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } background: Rectangle { - implicitHeight: control.Material.delegateHeight + implicitHeight: 48 color: control.highlighted ? control.Material.listHighlightColor : "transparent" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Label.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 T.Label { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/material.pri qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/material.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/material.pri 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/material.pri 2018-03-21 07:59:29.000000000 +0000 @@ -33,8 +33,6 @@ $$PWD/ItemDelegate.qml \ $$PWD/Label.qml \ $$PWD/Menu.qml \ - $$PWD/MenuBar.qml \ - $$PWD/MenuBarItem.qml \ $$PWD/MenuItem.qml \ $$PWD/MenuSeparator.qml \ $$PWD/Page.qml \ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/material.pro qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/material.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/material.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/material.pro 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ TARGET = qtquickcontrols2materialstyleplugin TARGETPATH = QtQuick/Controls.2/Material -IMPORT_VERSION = 2.5 +IMPORT_VERSION = 2.2 QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private @@ -19,7 +19,8 @@ RESOURCES += \ $$PWD/qtquickcontrols2materialstyleplugin.qrc -CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler +!static: CONFIG += qmlcache +CONFIG += no_cxx_module load(qml_plugin) requires(qtConfig(quickcontrols2-material)) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/MenuBarItem.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/MenuBarItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/MenuBarItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/MenuBarItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 - -T.MenuBarItem { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 16 - verticalPadding: 12 - spacing: 16 - - icon.width: 24 - icon.height: 24 - icon.color: enabled ? Material.foreground : Material.hintTextColor - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.enabled ? control.Material.foreground : control.Material.hintTextColor - } - - background: Rectangle { - implicitWidth: 40 - implicitHeight: 40 - color: control.highlighted ? control.Material.listHighlightColor : "transparent" - - Ripple { - width: parent.width - height: parent.height - - clip: visible - pressed: control.pressed - anchor: control - active: control.down || control.highlighted - color: control.Material.rippleColor - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/MenuBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/MenuBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/MenuBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/MenuBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 - -T.MenuBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - delegate: MenuBarItem { } - - contentItem: Row { - spacing: control.spacing - Repeater { - model: control.contentModel - } - } - - background: Rectangle { - implicitHeight: 40 - color: control.Material.dialogColor - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/MenuItem.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/MenuItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/MenuItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/MenuItem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,68 +34,47 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.MenuItem { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 16 - verticalPadding: Material.menuItemVerticalPadding + topPadding: 12 + bottomPadding: 12 spacing: 16 - icon.width: 24 - icon.height: 24 - icon.color: enabled ? Material.foreground : Material.hintTextColor - indicator: CheckIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 visible: control.checkable control: control - checkState: control.checked ? Qt.Checked : Qt.Unchecked - } - - arrow: ColorImage { - x: control.mirrored ? control.padding : control.width - width - control.padding - y: control.topPadding + (control.availableHeight - height) / 2 - - visible: control.subMenu - mirror: control.mirrored - color: control.enabled ? control.Material.foreground : control.Material.hintTextColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Material/images/arrow-indicator.png" } - contentItem: IconLabel { - readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0 - readonly property real indicatorPadding: control.checkable && control.indicator ? control.indicator.width + control.spacing : 0 - leftPadding: !control.mirrored ? indicatorPadding : arrowPadding - rightPadding: control.mirrored ? indicatorPadding : arrowPadding - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: Qt.AlignLeft + contentItem: Text { + leftPadding: control.checkable && !control.mirrored ? control.indicator.width + control.spacing : 0 + rightPadding: control.checkable && control.mirrored ? control.indicator.width + control.spacing : 0 - icon: control.icon text: control.text font: control.font color: control.enabled ? control.Material.foreground : control.Material.hintTextColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } background: Rectangle { implicitWidth: 200 - implicitHeight: control.Material.menuItemHeight + implicitHeight: 48 color: control.highlighted ? control.Material.listHighlightColor : "transparent" Ripple { @@ -105,7 +84,7 @@ clip: visible pressed: control.pressed anchor: control - active: control.down || control.highlighted + active: control.down || control.visualFocus || control.hovered color: control.Material.rippleColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Menu.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,29 +34,27 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 -import QtQuick.Window 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.Menu { id: control Material.elevation: 8 - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding margins: 0 - verticalPadding: 8 + topPadding: 8 + bottomPadding: 8 - transformOrigin: !cascade ? Item.Top : (mirrored ? Item.TopRight : Item.TopLeft) - - delegate: MenuItem { } + transformOrigin: Item.Top enter: Transition { // grow_fade_in @@ -74,16 +72,18 @@ implicitHeight: contentHeight model: control.contentModel - interactive: Window.window ? contentHeight > Window.window.height : false + // TODO: improve this? + interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false clip: true - currentIndex: control.currentIndex + keyNavigationWraps: false + currentIndex: -1 ScrollIndicator.vertical: ScrollIndicator {} } background: Rectangle { implicitWidth: 200 - implicitHeight: control.Material.menuItemHeight + implicitHeight: 48 radius: 3 color: control.Material.dialogColor @@ -93,14 +93,4 @@ elevation: control.Material.elevation } } - - T.Overlay.modal: Rectangle { - color: control.Material.backgroundDimColor - Behavior on opacity { NumberAnimation { duration: 150 } } - } - - T.Overlay.modeless: Rectangle { - color: control.Material.backgroundDimColor - Behavior on opacity { NumberAnimation { duration: 150 } } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/MenuSeparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/MenuSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/MenuSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/MenuSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,19 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 T.MenuSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) - verticalPadding: 8 + topPadding: 8 + bottomPadding: 8 contentItem: Rectangle { implicitWidth: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/PageIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,17 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 T.PageIndicator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) padding: 6 spacing: 6 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Page.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Page.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,21 +34,24 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 T.Page { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitHeaderWidth, - implicitFooterWidth) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(contentWidth, + header && header.visible ? header.implicitWidth : 0, + footer && footer.visible ? footer.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding - + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) - + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) + + (header && header.visible ? header.implicitHeight + spacing : 0) + + (footer && footer.visible ? footer.implicitHeight + spacing : 0)) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) background: Rectangle { color: control.Material.backgroundColor diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Pane.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,19 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.Pane { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 12 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/plugins.qmltypes qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/plugins.qmltypes --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/plugins.qmltypes 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/plugins.qmltypes 2018-03-21 07:59:29.000000000 +0000 @@ -4,14 +4,13 @@ // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Controls.Material 2.3' +// 'qmlplugindump -nonrelocatable QtQuick.Controls.Material 2.0' Module { dependencies: [] - Component { name: "QQuickAttachedObject"; prototype: "QObject" } Component { name: "QQuickMaterialStyle" - prototype: "QQuickAttachedObject" + prototype: "QQuickStyle" exports: ["QtQuick.Controls.Material/Material 2.0"] isCreatable: false exportMetaObjectRevisions: [0] @@ -19,8 +18,7 @@ name: "Theme" values: { "Light": 0, - "Dark": 1, - "System": 2 + "Dark": 1 } } Enum { @@ -71,7 +69,6 @@ Property { name: "accent"; type: "QVariant" } Property { name: "foreground"; type: "QVariant" } Property { name: "background"; type: "QVariant" } - Property { name: "elevation"; type: "int" } Signal { name: "paletteChanged" } Method { name: "color" @@ -91,4 +88,5 @@ Parameter { name: "shade"; type: "Shade" } } } + Component { name: "QQuickStyle"; prototype: "QObject" } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Popup.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,23 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.Popup { id: control Material.elevation: 24 - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 12 @@ -72,14 +75,4 @@ elevation: control.Material.elevation } } - - T.Overlay.modal: Rectangle { - color: control.Material.backgroundDimColor - Behavior on opacity { NumberAnimation { duration: 150 } } - } - - T.Overlay.modeless: Rectangle { - color: control.Material.backgroundDimColor - Behavior on opacity { NumberAnimation { duration: 150 } } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ProgressBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ProgressBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ProgressBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ProgressBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.ProgressBar { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) contentItem: ProgressBarImpl { implicitHeight: 4 @@ -59,7 +59,9 @@ background: Rectangle { implicitWidth: 200 implicitHeight: 4 - y: (control.height - height) / 2 + x: control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + width: control.availableWidth height: 4 color: Qt.rgba(control.Material.accentColor.r, control.Material.accentColor.g, control.Material.accentColor.b, 0.25) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qmldir qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qmldir --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qmldir 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qmldir 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ module QtQuick.Controls.Material plugin qtquickcontrols2materialstyleplugin classname QtQuickControls2MaterialStylePlugin -depends QtQuick.Controls 2.5 +depends QtQuick.Controls 2.2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialbusyindicator.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialbusyindicator.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialbusyindicator.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialbusyindicator.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -36,7 +36,6 @@ #include "qquickmaterialbusyindicator_p.h" -#include #include #include #include @@ -77,16 +76,21 @@ void updateCurrentTime(int time) override; private: - int m_lastStartAngle = 0; - int m_lastEndAngle = 0; - qreal m_width = 0; - qreal m_height = 0; - qreal m_devicePixelRatio = 1; + int m_lastStartAngle; + int m_lastEndAngle; + qreal m_width; + qreal m_height; + qreal m_devicePixelRatio; QColor m_color; }; QQuickMaterialBusyIndicatorNode::QQuickMaterialBusyIndicatorNode(QQuickMaterialBusyIndicator *item) - : QQuickAnimatedNode(item) + : QQuickAnimatedNode(item), + m_lastStartAngle(0), + m_lastEndAngle(0), + m_width(0), + m_height(0), + m_devicePixelRatio(1) { setLoopCount(Infinite); setCurrentTime(item->elapsed()); @@ -120,7 +124,7 @@ QPen pen; QSGImageNode *textureNode = static_cast(firstChild()); pen.setColor(m_color); - pen.setWidth(qCeil(size / 12) * m_devicePixelRatio); + pen.setWidth(4 * m_devicePixelRatio); painter.setPen(pen); const qreal percentageComplete = time / qreal(RotationAnimationDuration); @@ -174,7 +178,7 @@ } QQuickMaterialBusyIndicator::QQuickMaterialBusyIndicator(QQuickItem *parent) : - QQuickItem(parent) + QQuickItem(parent), m_elapsed(0), m_color(Qt::black) { setFlag(ItemHasContents); } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialbusyindicator_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialbusyindicator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialbusyindicator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialbusyindicator_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -75,8 +75,8 @@ QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: - int m_elapsed = 0; - QColor m_color = Qt::black; + int m_elapsed; + QColor m_color; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialprogressbar.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialprogressbar.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialprogressbar.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialprogressbar.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -62,12 +62,14 @@ private: void moveNode(QSGTransformNode *node, const QRectF &geometry, qreal progress); - bool m_indeterminate = false; - QEasingCurve m_easing = QEasingCurve::OutCubic; + bool m_indeterminate; + QEasingCurve m_easing; }; QQuickMaterialProgressBarNode::QQuickMaterialProgressBarNode(QQuickMaterialProgressBar *item) - : QQuickAnimatedNode(item) + : QQuickAnimatedNode(item), + m_indeterminate(false), + m_easing(QEasingCurve::OutCubic) { setLoopCount(Infinite); setDuration(TotalDuration); @@ -174,7 +176,7 @@ } QQuickMaterialProgressBar::QQuickMaterialProgressBar(QQuickItem *parent) - : QQuickItem(parent) + : QQuickItem(parent), m_color(Qt::black), m_progress(0.0), m_indeterminate(false) { setFlag(ItemHasContents); } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialprogressbar_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialprogressbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialprogressbar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialprogressbar_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -77,9 +77,9 @@ QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: - QColor m_color = Qt::black; - qreal m_progress = 0.0; - bool m_indeterminate = false; + QColor m_color; + qreal m_progress; + bool m_indeterminate; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialripple.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialripple.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialripple.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialripple.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -64,16 +64,20 @@ void sync(QQuickItem *item) override; private: - qreal m_from = 0; - qreal m_to = 0; - qreal m_value = 0; - WavePhase m_phase = WaveEnter; + qreal m_from; + qreal m_to; + qreal m_value; + WavePhase m_phase; QPointF m_anchor; QRectF m_bounds; }; QQuickMaterialRippleWaveNode::QQuickMaterialRippleWaveNode(QQuickMaterialRipple *ripple) - : QQuickAnimatedNode(ripple) + : QQuickAnimatedNode(ripple), + m_from(0), + m_to(0), + m_value(0), + m_phase(WaveEnter) { start(qRound(1000.0 * qSqrt(ripple->diameter() / 2.0 / WAVE_TOUCH_DOWN_ACCELERATION))); @@ -108,8 +112,8 @@ const qreal dy = (1.0 - p) * (m_anchor.y() - m_bounds.height() / 2); QMatrix4x4 m; - m.translate(qRound((m_bounds.width() - m_value) / 2 + dx), - qRound((m_bounds.height() - m_value) / 2 + dy)); + m.translate((m_bounds.width() - m_value) / 2 + dx, + (m_bounds.height() - m_value) / 2 + dy); setMatrix(m); QSGOpacityNode *opacityNode = static_cast(firstChild()); @@ -152,11 +156,12 @@ void sync(QQuickItem *item) override; private: - bool m_active = false; + bool m_active; }; QQuickMaterialRippleBackgroundNode::QQuickMaterialRippleBackgroundNode(QQuickMaterialRipple *ripple) - : QQuickAnimatedNode(ripple) + : QQuickAnimatedNode(ripple), + m_active(false) { setDuration(OPACITY_ENTER_DURATION_FAST); @@ -216,7 +221,14 @@ } QQuickMaterialRipple::QQuickMaterialRipple(QQuickItem *parent) - : QQuickItem(parent) + : QQuickItem(parent), + m_active(false), + m_pressed(false), + m_waves(0), + m_enterDelay(0), + m_trigger(Press), + m_clipRadius(0.0), + m_anchor(nullptr) { setFlag(ItemHasContents); } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialripple_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialripple_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialripple_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialripple_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -101,14 +101,14 @@ void exitWave(); private: - bool m_active = false; - bool m_pressed = false; - int m_waves = 0; - int m_enterDelay = 0; - Trigger m_trigger = Press; - qreal m_clipRadius = 0.0; + bool m_active; + bool m_pressed; + int m_waves; + int m_enterDelay; + Trigger m_trigger; + qreal m_clipRadius; QColor m_color; - QQuickItem *m_anchor = nullptr; + QQuickItem *m_anchor; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialstyle.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialstyle.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialstyle.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialstyle.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -39,7 +39,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE @@ -387,10 +387,6 @@ static bool globalAccentCustom = false; static bool globalForegroundCustom = true; static bool globalBackgroundCustom = true; -// This is global because: -// 1) The theme needs access to it to determine font sizes. -// 2) There can only be one variant used for the whole application. -static QQuickMaterialStyle::Variant globalVariant = QQuickMaterialStyle::Normal; static const QRgb backgroundColorLight = 0xFFFAFAFA; static const QRgb backgroundColorDark = 0xFF303030; @@ -423,14 +419,21 @@ static const QRgb spinBoxDisabledIconColorLight = 0xFFCCCCCC; static const QRgb spinBoxDisabledIconColorDark = 0xFF666666; +extern bool qt_is_dark_system_theme(); + static QQuickMaterialStyle::Theme effectiveTheme(QQuickMaterialStyle::Theme theme) { if (theme == QQuickMaterialStyle::System) - theme = QQuickStylePrivate::isDarkSystemTheme() ? QQuickMaterialStyle::Dark : QQuickMaterialStyle::Light; + theme = qt_is_dark_system_theme() ? QQuickMaterialStyle::Dark : QQuickMaterialStyle::Light; return theme; } -QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickAttachedObject(parent), +QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickStyleAttached(parent), + m_explicitTheme(false), + m_explicitPrimary(false), + m_explicitAccent(false), + m_explicitForeground(false), + m_explicitBackground(false), m_customPrimary(globalPrimaryCustom), m_customAccent(globalAccentCustom), m_customForeground(globalForegroundCustom), @@ -441,9 +444,10 @@ m_primary(globalPrimary), m_accent(globalAccent), m_foreground(globalForeground), - m_background(globalBackground) + m_background(globalBackground), + m_elevation(0) { - QQuickAttachedObject::init(); + init(); } QQuickMaterialStyle *QQuickMaterialStyle::qmlAttachedProperties(QObject *object) @@ -459,7 +463,7 @@ void QQuickMaterialStyle::setTheme(Theme theme) { if (theme == System) - theme = QQuickStylePrivate::isDarkSystemTheme() ? Dark : Light; + theme = qt_is_dark_system_theme() ? Dark : Light; m_explicitTheme = true; if (m_theme == theme) @@ -496,8 +500,8 @@ void QQuickMaterialStyle::propagateTheme() { - const auto styles = attachedChildren(); - for (QQuickAttachedObject *child : styles) { + const auto styles = childStyles(); + for (QQuickStyleAttached *child : styles) { QQuickMaterialStyle *material = qobject_cast(child); if (material) material->inheritTheme(m_theme); @@ -510,7 +514,7 @@ return; m_explicitTheme = false; - QQuickMaterialStyle *material = qobject_cast(attachedParent()); + QQuickMaterialStyle *material = qobject_cast(parentStyle()); inheritTheme(material ? material->theme() : globalTheme); } @@ -551,8 +555,8 @@ void QQuickMaterialStyle::propagatePrimary() { - const auto styles = attachedChildren(); - for (QQuickAttachedObject *child : styles) { + const auto styles = childStyles(); + for (QQuickStyleAttached *child : styles) { QQuickMaterialStyle *material = qobject_cast(child); if (material) material->inheritPrimary(m_primary, m_customPrimary); @@ -566,7 +570,7 @@ m_customPrimary = false; m_explicitPrimary = false; - QQuickMaterialStyle *material = qobject_cast(attachedParent()); + QQuickMaterialStyle *material = qobject_cast(parentStyle()); if (material) inheritPrimary(material->m_primary, material->m_customPrimary); else @@ -610,8 +614,8 @@ void QQuickMaterialStyle::propagateAccent() { - const auto styles = attachedChildren(); - for (QQuickAttachedObject *child : styles) { + const auto styles = childStyles(); + for (QQuickStyleAttached *child : styles) { QQuickMaterialStyle *material = qobject_cast(child); if (material) material->inheritAccent(m_accent, m_customAccent); @@ -625,7 +629,7 @@ m_customAccent = false; m_explicitAccent = false; - QQuickMaterialStyle *material = qobject_cast(attachedParent()); + QQuickMaterialStyle *material = qobject_cast(parentStyle()); if (material) inheritAccent(material->m_accent, material->m_customAccent); else @@ -675,8 +679,8 @@ void QQuickMaterialStyle::propagateForeground() { - const auto styles = attachedChildren(); - for (QQuickAttachedObject *child : styles) { + const auto styles = childStyles(); + for (QQuickStyleAttached *child : styles) { QQuickMaterialStyle *material = qobject_cast(child); if (material) material->inheritForeground(m_foreground, m_customForeground, m_hasForeground); @@ -691,7 +695,7 @@ m_hasForeground = false; m_customForeground = false; m_explicitForeground = false; - QQuickMaterialStyle *material = qobject_cast(attachedParent()); + QQuickMaterialStyle *material = qobject_cast(parentStyle()); inheritForeground(material ? material->m_foreground : globalForeground, true, material ? material->m_hasForeground : false); } @@ -734,8 +738,8 @@ void QQuickMaterialStyle::propagateBackground() { - const auto styles = attachedChildren(); - for (QQuickAttachedObject *child : styles) { + const auto styles = childStyles(); + for (QQuickStyleAttached *child : styles) { QQuickMaterialStyle *material = qobject_cast(child); if (material) material->inheritBackground(m_background, m_customBackground, m_hasBackground); @@ -750,7 +754,7 @@ m_hasBackground = false; m_customBackground = false; m_explicitBackground = false; - QQuickMaterialStyle *material = qobject_cast(attachedParent()); + QQuickMaterialStyle *material = qobject_cast(parentStyle()); inheritBackground(material ? material->m_background : globalBackground, true, material ? material->m_hasBackground : false); } @@ -1133,61 +1137,17 @@ } } -int QQuickMaterialStyle::touchTarget() const -{ - // https://material.io/guidelines/components/buttons.html#buttons-style - return globalVariant == Dense ? 44 : 48; -} - -int QQuickMaterialStyle::buttonHeight() const +void QQuickMaterialStyle::parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent) { - // https://material.io/guidelines/components/buttons.html#buttons-style - return globalVariant == Dense ? 32 : 36; -} - -int QQuickMaterialStyle::delegateHeight() const -{ - // https://material.io/guidelines/components/lists.html#lists-specs - return globalVariant == Dense ? 40 : 48; -} - -int QQuickMaterialStyle::dialogButtonBoxHeight() const -{ - return globalVariant == Dense ? 48 : 52; -} - -int QQuickMaterialStyle::frameVerticalPadding() const -{ - return globalVariant == Dense ? 8 : 12; -} - -int QQuickMaterialStyle::menuItemHeight() const -{ - // https://material.io/guidelines/components/menus.html#menus-simple-menus - return globalVariant == Dense ? 32 : 48; -} - -int QQuickMaterialStyle::menuItemVerticalPadding() const -{ - return globalVariant == Dense ? 8 : 12; -} - -int QQuickMaterialStyle::switchDelegateVerticalPadding() const -{ - // SwitchDelegate's indicator is much larger than the others due to the shadow, - // so we must reduce its padding to ensure its implicitHeight is 40 when dense. - return globalVariant == Dense ? 4 : 8; -} - -int QQuickMaterialStyle::tooltipHeight() const -{ - // https://material.io/guidelines/components/tooltips.html - return globalVariant == Dense ? 22 : 32; -} - -QQuickMaterialStyle::Variant QQuickMaterialStyle::variant() -{ - return globalVariant; + Q_UNUSED(oldParent); + QQuickMaterialStyle *material = qobject_cast(newParent); + if (material) { + inheritPrimary(material->m_primary, material->m_customPrimary); + inheritAccent(material->m_accent, material->m_customAccent); + inheritForeground(material->m_foreground, material->m_customForeground, material->m_hasForeground); + inheritBackground(material->m_background, material->m_customBackground, material->m_hasBackground); + inheritTheme(material->theme()); + } } template @@ -1207,101 +1167,88 @@ return value; } -void QQuickMaterialStyle::initGlobals() +void QQuickMaterialStyle::init() { - QSharedPointer settings = QQuickStylePrivate::settings(QStringLiteral("Material")); - - bool ok = false; - QByteArray themeValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_THEME", settings, QStringLiteral("Theme")); - Theme themeEnum = toEnumValue(themeValue, &ok); - if (ok) - globalTheme = effectiveTheme(themeEnum); - else if (!themeValue.isEmpty()) - qWarning().nospace().noquote() << "Material: unknown theme value: " << themeValue; - - QByteArray variantValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_VARIANT", settings, QStringLiteral("Variant")); - Variant variantEnum = toEnumValue(variantValue, &ok); - if (ok) - globalVariant = variantEnum; - else if (!variantValue.isEmpty()) - qWarning().nospace().noquote() << "Material: unknown variant value: " << variantValue; - - QByteArray primaryValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_PRIMARY", settings, QStringLiteral("Primary")); - Color primaryEnum = toEnumValue(primaryValue, &ok); - if (ok) { - globalPrimaryCustom = false; - globalPrimary = primaryEnum; - } else { - QColor color(primaryValue.constData()); - if (color.isValid()) { - globalPrimaryCustom = true; - globalPrimary = color.rgba(); - } else if (!primaryValue.isEmpty()) { - qWarning().nospace().noquote() << "Material: unknown primary value: " << primaryValue; + static bool globalsInitialized = false; + if (!globalsInitialized) { + QSharedPointer settings = QQuickStyleAttached::settings(QStringLiteral("Material")); + + bool ok = false; + QByteArray themeValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_THEME", settings, QStringLiteral("Theme")); + Theme themeEnum = toEnumValue(themeValue, &ok); + if (ok) + globalTheme = m_theme = effectiveTheme(themeEnum); + else if (!themeValue.isEmpty()) + qWarning().nospace().noquote() << "Material: unknown theme value: " << themeValue; + + QByteArray primaryValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_PRIMARY", settings, QStringLiteral("Primary")); + Color primaryEnum = toEnumValue(primaryValue, &ok); + if (ok) { + globalPrimaryCustom = m_customPrimary = false; + globalPrimary = m_primary = primaryEnum; + } else { + QColor color(primaryValue.constData()); + if (color.isValid()) { + globalPrimaryCustom = m_customPrimary = true; + globalPrimary = m_primary = color.rgba(); + } else if (!primaryValue.isEmpty()) { + qWarning().nospace().noquote() << "Material: unknown primary value: " << primaryValue; + } } - } - QByteArray accentValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_ACCENT", settings, QStringLiteral("Accent")); - Color accentEnum = toEnumValue(accentValue, &ok); - if (ok) { - globalAccentCustom = false; - globalAccent = accentEnum; - } else if (!accentValue.isEmpty()) { - QColor color(accentValue.constData()); - if (color.isValid()) { - globalAccentCustom = true; - globalAccent = color.rgba(); - } else { - qWarning().nospace().noquote() << "Material: unknown accent value: " << accentValue; + QByteArray accentValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_ACCENT", settings, QStringLiteral("Accent")); + Color accentEnum = toEnumValue(accentValue, &ok); + if (ok) { + globalAccentCustom = m_customAccent = false; + globalAccent = m_accent = accentEnum; + } else if (!accentValue.isEmpty()) { + QColor color(accentValue.constData()); + if (color.isValid()) { + globalAccentCustom = m_customAccent = true; + globalAccent = m_accent = color.rgba(); + } else { + qWarning().nospace().noquote() << "Material: unknown accent value: " << accentValue; + } } - } - QByteArray foregroundValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_FOREGROUND", settings, QStringLiteral("Foreground")); - Color foregroundEnum = toEnumValue(foregroundValue, &ok); - if (ok) { - globalForegroundCustom = false; - globalForeground = foregroundEnum; - hasGlobalForeground = true; - } else if (!foregroundValue.isEmpty()) { - QColor color(foregroundValue.constData()); - if (color.isValid()) { - globalForegroundCustom = true; - globalForeground = color.rgba(); - hasGlobalForeground = true; - } else { - qWarning().nospace().noquote() << "Material: unknown foreground value: " << foregroundValue; + QByteArray foregroundValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_FOREGROUND", settings, QStringLiteral("Foreground")); + Color foregroundEnum = toEnumValue(foregroundValue, &ok); + if (ok) { + globalForegroundCustom = m_customForeground = false; + globalForeground = m_foreground = foregroundEnum; + hasGlobalForeground = m_hasForeground = true; + } else if (!foregroundValue.isEmpty()) { + QColor color(foregroundValue.constData()); + if (color.isValid()) { + globalForegroundCustom = m_customForeground = true; + globalForeground = m_foreground = color.rgba(); + hasGlobalForeground = m_hasForeground = true; + } else { + qWarning().nospace().noquote() << "Material: unknown foreground value: " << foregroundValue; + } } - } - QByteArray backgroundValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_BACKGROUND", settings, QStringLiteral("Background")); - Color backgroundEnum = toEnumValue(backgroundValue, &ok); - if (ok) { - globalBackgroundCustom = false; - globalBackground = backgroundEnum; - hasGlobalBackground = true; - } else if (!backgroundValue.isEmpty()) { - QColor color(backgroundValue.constData()); - if (color.isValid()) { - globalBackgroundCustom = true; - globalBackground = color.rgba(); - hasGlobalBackground = true; - } else { - qWarning().nospace().noquote() << "Material: unknown background value: " << backgroundValue; + QByteArray backgroundValue = resolveSetting("QT_QUICK_CONTROLS_MATERIAL_BACKGROUND", settings, QStringLiteral("Background")); + Color backgroundEnum = toEnumValue(backgroundValue, &ok); + if (ok) { + globalBackgroundCustom = m_customBackground = false; + globalBackground = m_background = backgroundEnum; + hasGlobalBackground = m_hasBackground = true; + } else if (!backgroundValue.isEmpty()) { + QColor color(backgroundValue.constData()); + if (color.isValid()) { + globalBackgroundCustom = m_customBackground = true; + globalBackground = m_background = color.rgba(); + hasGlobalBackground = m_hasBackground = true; + } else { + qWarning().nospace().noquote() << "Material: unknown background value: " << backgroundValue; + } } - } -} -void QQuickMaterialStyle::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) -{ - Q_UNUSED(oldParent); - QQuickMaterialStyle *material = qobject_cast(newParent); - if (material) { - inheritPrimary(material->m_primary, material->m_customPrimary); - inheritAccent(material->m_accent, material->m_customAccent); - inheritForeground(material->m_foreground, material->m_customForeground, material->m_hasForeground); - inheritBackground(material->m_background, material->m_customBackground, material->m_hasBackground); - inheritTheme(material->theme()); + globalsInitialized = true; } + + QQuickStyleAttached::init(); // TODO: lazy init? } bool QQuickMaterialStyle::variantToRgba(const QVariant &var, const char *name, QRgb *rgba, bool *custom) const diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialstyle_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialstyle_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialstyle_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialstyle_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -49,11 +49,11 @@ // #include -#include +#include QT_BEGIN_NAMESPACE -class QQuickMaterialStyle : public QQuickAttachedObject +class QQuickMaterialStyle : public QQuickStyleAttached { Q_OBJECT Q_PROPERTY(Theme theme READ theme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL) @@ -98,16 +98,6 @@ Q_PROPERTY(QColor toolTextColor READ toolTextColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor spinBoxDisabledIconColor READ spinBoxDisabledIconColor NOTIFY paletteChanged FINAL) - Q_PROPERTY(int touchTarget READ touchTarget CONSTANT FINAL) - Q_PROPERTY(int buttonHeight READ buttonHeight CONSTANT FINAL) - Q_PROPERTY(int delegateHeight READ delegateHeight CONSTANT FINAL) - Q_PROPERTY(int dialogButtonBoxHeight READ dialogButtonBoxHeight CONSTANT FINAL) - Q_PROPERTY(int frameVerticalPadding READ frameVerticalPadding CONSTANT FINAL) - Q_PROPERTY(int menuItemHeight READ menuItemHeight CONSTANT FINAL) - Q_PROPERTY(int menuItemVerticalPadding READ menuItemVerticalPadding CONSTANT FINAL) - Q_PROPERTY(int switchDelegateVerticalPadding READ switchDelegateVerticalPadding CONSTANT FINAL) - Q_PROPERTY(int tooltipHeight READ tooltipHeight CONSTANT FINAL) - public: enum Theme { Light, @@ -115,11 +105,6 @@ System }; - enum Variant { - Normal, - Dense - }; - enum Color { Red, Pink, @@ -160,7 +145,6 @@ }; Q_ENUM(Theme) - Q_ENUM(Variant) Q_ENUM(Color) Q_ENUM(Shade) @@ -241,20 +225,6 @@ Q_INVOKABLE QColor color(Color color, Shade shade = Shade500) const; Q_INVOKABLE QColor shade(const QColor &color, Shade shade) const; - int touchTarget() const; - int buttonHeight() const; - int delegateHeight() const; - int dialogButtonBoxHeight() const; - int frameVerticalPadding() const; - int menuItemHeight() const; - int menuItemVerticalPadding() const; - int switchDelegateVerticalPadding() const; - int tooltipHeight() const; - - static void initGlobals(); - - static Variant variant(); - Q_SIGNALS: void themeChanged(); void primaryChanged(); @@ -266,7 +236,7 @@ void paletteChanged(); protected: - void attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) override; + void parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent) override; private: void init(); @@ -279,31 +249,31 @@ // These reflect whether a color value was explicitly set on the specific // item that this attached style object represents. - bool m_explicitTheme = false; - bool m_explicitPrimary = false; - bool m_explicitAccent = false; - bool m_explicitForeground = false; - bool m_explicitBackground = false; + bool m_explicitTheme; + bool m_explicitPrimary; + bool m_explicitAccent; + bool m_explicitForeground; + bool m_explicitBackground; // These reflect whether the color value that was either inherited or // explicitly set is in the form that QColor expects, rather than one of // our pre-defined color enum values. - bool m_customPrimary = false; - bool m_customAccent = false; - bool m_customForeground = false; - bool m_customBackground = false; + bool m_customPrimary; + bool m_customAccent; + bool m_customForeground; + bool m_customBackground; // These will be true when this item has an explicit or inherited foreground/background // color, or these colors were declared globally via settings (e.g. conf or env vars). // Some color properties of the style will return different values depending on whether // or not these are set. - bool m_hasForeground = false; - bool m_hasBackground = false; + bool m_hasForeground; + bool m_hasBackground; // The actual values for this item, whether explicit, inherited or globally set. - Theme m_theme = Light; - uint m_primary = 0; - uint m_accent = 0; - uint m_foreground = 0; - uint m_background = 0; - int m_elevation = 0; + Theme m_theme; + uint m_primary; + uint m_accent; + uint m_foreground; + uint m_background; + int m_elevation; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialtheme.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialtheme.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialtheme.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialtheme.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -35,25 +35,16 @@ ****************************************************************************/ #include "qquickmaterialtheme_p.h" -#include "qquickmaterialstyle_p.h" #include #include #include -#include QT_BEGIN_NAMESPACE -void QQuickMaterialTheme::initialize(QQuickTheme *theme) +QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme) + : QQuickProxyTheme(theme) { - QFont systemFont; - QFont buttonFont; - QFont toolTipFont; - QFont itemViewFont; - QFont listViewFont; - QFont menuItemFont; - QFont editorFont; - QFont font; font.setFamily(QLatin1String("Roboto")); QString family = QFontInfo(font).family(); @@ -73,40 +64,63 @@ editorFont.setFamily(family); } - const bool dense = QQuickMaterialStyle::variant() == QQuickMaterialStyle::Dense; - systemFont.setPixelSize(dense ? 13 : 14); - theme->setFont(QQuickTheme::System, systemFont); + systemFont.setPixelSize(14); - // https://material.io/guidelines/components/buttons.html#buttons-style - buttonFont.setPixelSize(dense ? 13 : 14); + buttonFont.setPixelSize(14); buttonFont.setCapitalization(QFont::AllUppercase); buttonFont.setWeight(QFont::Medium); - theme->setFont(QQuickTheme::Button, buttonFont); - theme->setFont(QQuickTheme::TabBar, buttonFont); - theme->setFont(QQuickTheme::ToolBar, buttonFont); - // https://material.io/guidelines/components/tooltips.html - toolTipFont.setPixelSize(dense ? 10 : 14); + toolTipFont.setPixelSize(14); toolTipFont.setWeight(QFont::Medium); - theme->setFont(QQuickTheme::ToolTip, toolTipFont); - itemViewFont.setPixelSize(dense ? 13 : 14); + itemViewFont.setPixelSize(14); itemViewFont.setWeight(QFont::Medium); - theme->setFont(QQuickTheme::ItemView, itemViewFont); - // https://material.io/guidelines/components/lists.html#lists-specs - listViewFont.setPixelSize(dense ? 13 : 16); - theme->setFont(QQuickTheme::ListView, listViewFont); - - menuItemFont.setPixelSize(dense ? 13 : 16); - theme->setFont(QQuickTheme::Menu, menuItemFont); - theme->setFont(QQuickTheme::MenuBar, menuItemFont); - theme->setFont(QQuickTheme::ComboBox, menuItemFont); - - editorFont.setPixelSize(dense ? 13 : 16); - theme->setFont(QQuickTheme::TextArea, editorFont); - theme->setFont(QQuickTheme::TextField, editorFont); - theme->setFont(QQuickTheme::SpinBox, editorFont); + listViewFont.setPixelSize(16); + + menuItemFont.setPixelSize(16); + + editorFont.setPixelSize(16); +} + +const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const +{ + switch (type) { + case QPlatformTheme::TabButtonFont: + case QPlatformTheme::PushButtonFont: + case QPlatformTheme::ToolButtonFont: + return &buttonFont; + case QPlatformTheme::TipLabelFont: + return &toolTipFont; + case QPlatformTheme::ItemViewFont: + return &itemViewFont; + case QPlatformTheme::ListViewFont: + return &listViewFont; + case QPlatformTheme::MenuItemFont: + case QPlatformTheme::ComboMenuItemFont: + return &menuItemFont; + case QPlatformTheme::EditorFont: + return &editorFont; + default: + return &systemFont; + } +} + +QVariant QQuickMaterialTheme::themeHint(ThemeHint hint) const +{ + switch (hint) { + case QPlatformTheme::DialogButtonBoxLayout: + // https://material.io/guidelines/components/dialogs.html#dialogs-specs + // As per spec, affirmative actions are placed to the right, dismissive + // actions are placed directly to the left of affirmative actions. + // In the Android sources, there are additional type of actions - + // neutral, which are placed to the left. + // Rules for macOS seems to be the most suitable here and are also used + // in the Android QPA plugin. + return QVariant(QPlatformDialogHelper::MacLayout); + default: + return QQuickProxyTheme::themeHint(hint); + } } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialtheme_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialtheme_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qquickmaterialtheme_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qquickmaterialtheme_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,16 +48,29 @@ // We mean it. // -#include +#include +#include +#include QT_BEGIN_NAMESPACE -class QQuickTheme; - -class QQuickMaterialTheme +class QQuickMaterialTheme : public QQuickProxyTheme { public: - static void initialize(QQuickTheme *theme); + explicit QQuickMaterialTheme(QPlatformTheme *theme = nullptr); + + const QFont *font(Font type = SystemFont) const override; + + QVariant themeHint(ThemeHint hint) const override; + +private: + QFont systemFont; + QFont buttonFont; + QFont toolTipFont; + QFont itemViewFont; + QFont listViewFont; + QFont menuItemFont; + QFont editorFont; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qt_attribution.json qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qt_attribution.json --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qt_attribution.json 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qt_attribution.json 2018-03-21 07:59:29.000000000 +0000 @@ -1,7 +1,7 @@ { "Id": "shadow_angular_material", "Name": "Shadow values from Angular Material", - "QDocModule": "qtquickcontrols", + "QDocModule": "qtquickcontrols2", "QtUsage": "Used in the Material Style of Qt Quick Controls 2.", "Files": "ElevationEffect.qml", "Description": "Shadow values for the elevation effect.", diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -44,6 +44,15 @@ #include #include +#include + +static inline void initResources() +{ + Q_INIT_RESOURCE(qtquickcontrols2materialstyleplugin); +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtQuick_Controls_2_Material); +#endif +} QT_BEGIN_NAMESPACE @@ -56,45 +65,54 @@ QtQuickControls2MaterialStylePlugin(QObject *parent = nullptr); void registerTypes(const char *uri) override; + void initializeEngine(QQmlEngine *engine, const char *uri) override; QString name() const override; - void initializeTheme(QQuickTheme *theme) override; + QQuickProxyTheme *createTheme() const override; }; QtQuickControls2MaterialStylePlugin::QtQuickControls2MaterialStylePlugin(QObject *parent) : QQuickStylePlugin(parent) { - QQuickMaterialStyle::initGlobals(); + initResources(); } void QtQuickControls2MaterialStylePlugin::registerTypes(const char *uri) { - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... + qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... qmlRegisterUncreatableType(uri, 2, 0, "Material", tr("Material is an attached property")); +} + +void QtQuickControls2MaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) +{ + QQuickStylePlugin::initializeEngine(engine, uri); + + engine->addImageProvider(name(), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/QtQuick/Controls.2/Material/images"))); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... + qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + qmlRegisterType(import, 2, 0, "PaddedRectangle"); qmlRegisterType(import, 2, 0, "BusyIndicatorImpl"); qmlRegisterType(import, 2, 0, "ProgressBarImpl"); qmlRegisterType(import, 2, 0, "Ripple"); - qmlRegisterType(resolvedUrl(QStringLiteral("BoxShadow.qml")), import, 2, 0, "BoxShadow"); - qmlRegisterType(resolvedUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("CursorDelegate.qml")), import, 2, 0, "CursorDelegate"); - qmlRegisterType(resolvedUrl(QStringLiteral("ElevationEffect.qml")), import, 2, 0, "ElevationEffect"); - qmlRegisterType(resolvedUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("RectangularGlow.qml")), import, 2, 0, "RectangularGlow"); - qmlRegisterType(resolvedUrl(QStringLiteral("SliderHandle.qml")), import, 2, 0, "SliderHandle"); - qmlRegisterType(resolvedUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("BoxShadow.qml")), import, 2, 0, "BoxShadow"); + qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("CursorDelegate.qml")), import, 2, 0, "CursorDelegate"); + qmlRegisterType(typeUrl(QStringLiteral("ElevationEffect.qml")), import, 2, 0, "ElevationEffect"); + qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("RectangularGlow.qml")), import, 2, 0, "RectangularGlow"); + qmlRegisterType(typeUrl(QStringLiteral("SliderHandle.qml")), import, 2, 0, "SliderHandle"); + qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); } QString QtQuickControls2MaterialStylePlugin::name() const { - return QStringLiteral("Material"); + return QStringLiteral("material"); } -void QtQuickControls2MaterialStylePlugin::initializeTheme(QQuickTheme *theme) +QQuickProxyTheme *QtQuickControls2MaterialStylePlugin::createTheme() const { - QQuickMaterialTheme::initialize(theme); + return new QQuickMaterialTheme; } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qtquickcontrols2materialstyleplugin.qrc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qtquickcontrols2materialstyleplugin.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/qtquickcontrols2materialstyleplugin.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/qtquickcontrols2materialstyleplugin.qrc 2018-03-21 07:59:29.000000000 +0000 @@ -1,9 +1,5 @@ - images/arrow-indicator.png - images/arrow-indicator@2x.png - images/arrow-indicator@3x.png - images/arrow-indicator@4x.png images/check.png images/check@2x.png images/check@3x.png diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RadioButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RadioButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RadioButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RadioButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,23 +34,25 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.RadioButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset spacing: 8 padding: 8 - verticalPadding: padding + 6 + topPadding: padding + 6 + bottomPadding: padding + 6 indicator: RadioIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RadioDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RadioDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RadioDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RadioDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,53 +34,45 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.RadioDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 16 - verticalPadding: 8 + topPadding: 8 + bottomPadding: 8 spacing: 16 - icon.width: 24 - icon.height: 24 - icon.color: enabled ? Material.foreground : Material.hintTextColor - indicator: RadioIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - contentItem: IconLabel { + contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon text: control.text font: control.font color: control.enabled ? control.Material.foreground : control.Material.hintTextColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } background: Rectangle { - implicitHeight: control.Material.delegateHeight + implicitHeight: 48 color: control.highlighted ? control.Material.listHighlightColor : "transparent" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RadioIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RadioIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RadioIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RadioIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,16 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 Rectangle { implicitWidth: 20 implicitHeight: 20 radius: width / 2 border.width: 2 - border.color: !control.enabled ? control.Material.hintTextColor - : control.checked || control.down ? control.Material.accentColor : control.Material.secondaryTextColor + border.color: control.checked || control.down ? control.Material.accentColor : control.Material.secondaryTextColor color: "transparent" property Item control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RangeSlider.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RangeSlider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RangeSlider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RangeSlider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,26 +34,26 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.RangeSlider { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - first.implicitHandleWidth + leftPadding + rightPadding, - second.implicitHandleWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - first.implicitHandleHeight + topPadding + bottomPadding, - second.implicitHandleHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(first.handle ? first.handle.implicitWidth : 0, + second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(first.handle ? first.handle.implicitHeight : 0, + second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 first.handle: SliderHandle { - x: control.leftPadding + (control.horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) + x: control.leftPadding + (horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) value: first.value handleHasFocus: activeFocus handlePressed: first.pressed @@ -61,8 +61,8 @@ } second.handle: SliderHandle { - x: control.leftPadding + (control.horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) + x: control.leftPadding + (horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) value: second.value handleHasFocus: activeFocus handlePressed: second.pressed @@ -70,20 +70,22 @@ } background: Rectangle { - x: control.leftPadding + (control.horizontal ? 0 : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0) - implicitWidth: control.horizontal ? 200 : 48 - implicitHeight: control.horizontal ? 48 : 200 - width: control.horizontal ? control.availableWidth : 1 - height: control.horizontal ? 1 : control.availableHeight + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + implicitWidth: horizontal ? 200 : 48 + implicitHeight: horizontal ? 48 : 200 + width: horizontal ? control.availableWidth : 1 + height: horizontal ? 1 : control.availableHeight color: control.Material.foreground - scale:control.horizontal && control.mirrored ? -1 : 1 + scale: horizontal && control.mirrored ? -1 : 1 + + readonly property bool horizontal: control.orientation === Qt.Horizontal Rectangle { - x: control.horizontal ? control.first.position * parent.width : -1 - y: control.horizontal ? -1 : control.second.visualPosition * parent.height + 3 - width: control.horizontal ? control.second.position * parent.width - control.first.position * parent.width - 3 : 3 - height: control.horizontal ? 3 : control.second.position * parent.height - control.first.position * parent.height - 3 + x: parent.horizontal ? control.first.position * parent.width : -1 + y: parent.horizontal ? -1 : control.second.visualPosition * parent.height + 3 + width: parent.horizontal ? control.second.position * parent.width - control.first.position * parent.width - 3 : 3 + height: parent.horizontal ? 3 : control.second.position * parent.height - control.first.position * parent.height - 3 color: control.Material.accentColor } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RectangularGlow.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RectangularGlow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RectangularGlow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RectangularGlow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.0 /* A cross-graphics API implementation of QtGraphicalEffects' RectangularGlow. diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RoundButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RoundButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/RoundButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/RoundButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,56 +34,48 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.RoundButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - topInset: 6 - leftInset: 6 - rightInset: 6 - bottomInset: 6 - padding: 12 - spacing: 6 + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset - icon.width: 24 - icon.height: 24 - icon.color: !enabled ? Material.hintTextColor : - flat && highlighted ? Material.accentColor : - highlighted ? Material.primaryHighlightedTextColor : Material.foreground + // external vertical padding is 6 (to increase touch area) + padding: 12 Material.elevation: flat ? control.down || control.hovered ? 2 : 0 : control.down ? 12 : 6 Material.background: flat ? "transparent" : undefined - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font color: !control.enabled ? control.Material.hintTextColor : control.flat && control.highlighted ? control.Material.accentColor : control.highlighted ? control.Material.primaryHighlightedTextColor : control.Material.foreground + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight } // TODO: Add a proper ripple/ink effect for mouse/touch input and focus state background: Rectangle { - implicitWidth: control.Material.buttonHeight - implicitHeight: control.Material.buttonHeight + implicitWidth: 48 + implicitHeight: 48 + // external vertical padding is 6 (to increase touch area) + x: 6 + y: 6 + width: parent.width - 12 + height: parent.height - 12 radius: control.radius color: !control.enabled ? control.Material.buttonDisabledColor : control.checked || control.highlighted ? control.Material.highlightedButtonColor : control.Material.buttonColor diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ScrollBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ScrollBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ScrollBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ScrollBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,17 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 T.ScrollBar { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) padding: control.interactive ? 1 : 2 visible: control.policy !== T.ScrollBar.AlwaysOff diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ScrollIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ScrollIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ScrollIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ScrollIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,17 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 T.ScrollIndicator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) padding: 2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SliderHandle.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SliderHandle.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SliderHandle.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SliderHandle.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 Item { id: root @@ -48,6 +48,7 @@ property bool handlePressed: false property bool handleHovered: false readonly property int initialSize: 13 + readonly property bool horizontal: control.orientation === Qt.Horizontal readonly property var control: parent Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Slider.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,24 +34,24 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.Slider { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitHandleWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitHandleHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + (handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 handle: SliderHandle { - x: control.leftPadding + (control.horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) + x: control.leftPadding + (horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) value: control.value handleHasFocus: control.visualFocus handlePressed: control.pressed @@ -59,20 +59,22 @@ } background: Rectangle { - x: control.leftPadding + (control.horizontal ? 0 : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0) - implicitWidth: control.horizontal ? 200 : 48 - implicitHeight: control.horizontal ? 48 : 200 - width: control.horizontal ? control.availableWidth : 1 - height: control.horizontal ? 1 : control.availableHeight + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + implicitWidth: horizontal ? 200 : 48 + implicitHeight: horizontal ? 48 : 200 + width: horizontal ? control.availableWidth : 1 + height: horizontal ? 1 : control.availableHeight color: control.Material.foreground - scale: control.horizontal && control.mirrored ? -1 : 1 + scale: horizontal && control.mirrored ? -1 : 1 + + readonly property bool horizontal: control.orientation === Qt.Horizontal Rectangle { - x: control.horizontal ? 0 : (parent.width - width) / 2 - y: control.horizontal ? (parent.height - height) / 2 : control.visualPosition * parent.height - width: control.horizontal ? control.position * parent.width : 3 - height: control.horizontal ? 3 : control.position * parent.height + x: parent.horizontal ? 0 : (parent.width - width) / 2 + y: parent.horizontal ? (parent.height - height) / 2 : control.visualPosition * parent.height + width: parent.horizontal ? control.position * parent.width : 3 + height: parent.horizontal ? 3 : control.position * parent.height color: control.Material.accentColor } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SpinBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SpinBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SpinBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SpinBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,22 +34,23 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.SpinBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + - up.implicitIndicatorWidth + - down.implicitIndicatorWidth) - implicitHeight: Math.max(implicitContentHeight + topPadding + bottomPadding, - implicitBackgroundHeight, - up.implicitIndicatorHeight, - down.implicitIndicatorHeight) + (up.indicator ? up.indicator.implicitWidth : 0) + + (down.indicator ? down.indicator.implicitWidth : 0)) + implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + up.indicator ? up.indicator.implicitHeight : 0, + down.indicator ? down.indicator.implicitHeight : 0) + baselineOffset: contentItem.y + contentItem.baselineOffset spacing: 6 topPadding: 8 @@ -64,7 +65,7 @@ } contentItem: TextInput { - text: control.displayText + text: control.textFromValue(control.value, control.locale) font: control.font color: enabled ? control.Material.foreground : control.Material.hintTextColor @@ -82,8 +83,8 @@ up.indicator: Item { x: control.mirrored ? 0 : parent.width - width - implicitWidth: control.Material.touchTarget - implicitHeight: control.Material.touchTarget + implicitWidth: 48 + implicitHeight: 48 height: parent.height width: height @@ -116,8 +117,8 @@ down.indicator: Item { x: control.mirrored ? parent.width - width : 0 - implicitWidth: control.Material.touchTarget - implicitHeight: control.Material.touchTarget + implicitWidth: 48 + implicitHeight: 48 height: parent.height width: height @@ -143,7 +144,7 @@ background: Item { implicitWidth: 192 - implicitHeight: control.Material.touchTarget + implicitHeight: 48 Rectangle { x: parent.width / 2 - width / 2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/StackView.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/StackView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/StackView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/StackView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.StackView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SwipeDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SwipeDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SwipeDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SwipeDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,46 +34,41 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.SwipeDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 16 - verticalPadding: 8 + topPadding: 8 + bottomPadding: 8 spacing: 16 - icon.width: 24 - icon.height: 24 - icon.color: enabled ? Material.foreground : Material.hintTextColor - swipe.transition: Transition { SmoothedAnimation { velocity: 3; easing.type: Easing.InOutCubic } } - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft + contentItem: Text { + leftPadding: !control.mirrored ? (control.indicator ? control.indicator.width + control.spacing : 0) : 0 + rightPadding: control.mirrored ? (control.indicator ? control.indicator.width + control.spacing : 0) : 0 - icon: control.icon text: control.text font: control.font color: control.enabled ? control.Material.foreground : control.Material.hintTextColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } background: Rectangle { - implicitHeight: control.Material.delegateHeight + implicitHeight: 48 color: control.Material.backgroundColor diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SwipeView.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SwipeView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SwipeView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SwipeView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,16 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwipeView { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) contentItem: ListView { model: control.contentModel diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SwitchDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SwitchDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SwitchDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SwitchDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,53 +34,45 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.SwitchDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 16 - verticalPadding: Material.switchDelegateVerticalPadding + topPadding: 8 + bottomPadding: 8 spacing: 16 - icon.width: 24 - icon.height: 24 - icon.color: enabled ? Material.foreground : Material.hintTextColor - indicator: SwitchIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - contentItem: IconLabel { + contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon text: control.text font: control.font color: control.enabled ? control.Material.foreground : control.Material.hintTextColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } background: Rectangle { - implicitHeight: control.Material.delegateHeight + implicitHeight: 48 color: control.highlighted ? control.Material.listHighlightColor : "transparent" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SwitchIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SwitchIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/SwitchIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/SwitchIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 Item { id: indicator diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Switch.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,19 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 +import QtQuick.Templates 2.2 as T T.Switch { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 8 spacing: 8 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/TabBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/TabBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/TabBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/TabBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,21 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.TabBar { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) spacing: 1 + contentHeight: 48 contentItem: ListView { model: control.contentModel diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/TabButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/TabButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/TabButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/TabButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,41 +34,33 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.TabButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 12 - spacing: 6 - icon.width: 24 - icon.height: 24 - icon.color: !enabled ? Material.hintTextColor : down || checked ? Material.accentColor : Material.foreground - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font + elide: Text.ElideRight color: !control.enabled ? control.Material.hintTextColor : control.down || control.checked ? control.Material.accentColor : control.Material.foreground + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter } background: Ripple { - implicitHeight: control.Material.touchTarget + implicitHeight: 48 clip: true pressed: control.pressed diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/TextArea.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/TextArea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/TextArea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/TextArea.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,21 +34,21 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.TextArea { id: control implicitWidth: Math.max(contentWidth + leftPadding + rightPadding, - implicitBackgroundWidth + leftInset + rightInset, + background ? background.implicitWidth : 0, placeholder.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, - implicitBackgroundHeight + topInset + bottomInset, + implicitHeight: Math.max(contentHeight + 1 + topPadding + bottomPadding, + background ? background.implicitHeight : 0, placeholder.implicitHeight + 1 + topPadding + bottomPadding) topPadding: 8 @@ -57,7 +57,7 @@ color: enabled ? Material.foreground : Material.hintTextColor selectionColor: Material.accentColor selectedTextColor: Material.primaryHighlightedTextColor - placeholderTextColor: Material.hintTextColor + cursorDelegate: CursorDelegate { } PlaceholderText { @@ -68,10 +68,9 @@ height: control.height - (control.topPadding + control.bottomPadding) text: control.placeholderText font: control.font - color: control.placeholderTextColor + color: control.Material.hintTextColor verticalAlignment: control.verticalAlignment elide: Text.ElideRight - renderType: control.renderType visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/TextField.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/TextField.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/TextField.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/TextField.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,21 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.TextField { id: control - implicitWidth: implicitBackgroundWidth + leftInset + rightInset - || Math.max(contentWidth, placeholder.implicitWidth) + leftPadding + rightPadding - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding, + implicitWidth: Math.max(background ? background.implicitWidth : 0, + placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding : 0) + || contentWidth + leftPadding + rightPadding + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, placeholder.implicitHeight + topPadding + bottomPadding) topPadding: 8 @@ -56,7 +57,6 @@ color: enabled ? Material.foreground : Material.hintTextColor selectionColor: Material.accentColor selectedTextColor: Material.primaryHighlightedTextColor - placeholderTextColor: Material.hintTextColor verticalAlignment: TextInput.AlignVCenter cursorDelegate: CursorDelegate { } @@ -69,18 +69,17 @@ height: control.height - (control.topPadding + control.bottomPadding) text: control.placeholderText font: control.font - color: control.placeholderTextColor + color: control.Material.hintTextColor verticalAlignment: control.verticalAlignment elide: Text.ElideRight - renderType: control.renderType visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + } background: Rectangle { - y: control.height - height - control.bottomPadding + 8 + y: control.height - height - control.bottomPadding / 2 implicitWidth: 120 - height: control.activeFocus || control.hovered ? 2 : 1 - color: control.activeFocus ? control.Material.accentColor - : (control.hovered ? control.Material.primaryTextColor : control.Material.hintTextColor) + height: control.activeFocus ? 2 : 1 + color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ToolBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ToolBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,21 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.ToolBar { id: control Material.elevation: 4 - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) Material.foreground: Material.toolTextColor diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ToolButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ToolButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ToolButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ToolButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,43 +34,35 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Material.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Material.impl 2.2 T.ToolButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 - spacing: 6 - icon.width: 24 - icon.height: 24 - icon.color: !enabled ? Material.hintTextColor : checked || highlighted ? Material.accent : Material.foreground - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font color: !control.enabled ? control.Material.hintTextColor : control.checked || control.highlighted ? control.Material.accent : control.Material.foreground + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter } background: Ripple { - implicitWidth: control.Material.touchTarget - implicitHeight: control.Material.touchTarget + implicitWidth: 48 + implicitHeight: 48 readonly property bool square: control.contentItem.width <= control.contentItem.height diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ToolSeparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ToolSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ToolSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ToolSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 T.ToolSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) - horizontalPadding: vertical ? 12 : 5 - verticalPadding: vertical ? 5 : 12 + leftPadding: vertical ? 12 : 5 + rightPadding: vertical ? 12 : 5 + topPadding: vertical ? 5 : 12 + bottomPadding: vertical ? 5 : 12 contentItem: Rectangle { implicitWidth: vertical ? 1 : 38 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ToolTip.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ToolTip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/ToolTip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/ToolTip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 T.ToolTip { id: control @@ -44,14 +44,15 @@ x: parent ? (parent.width - implicitWidth) / 2 : 0 y: -implicitHeight - 24 - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) margins: 12 padding: 8 - horizontalPadding: padding + 8 + leftPadding: padding + 8 + rightPadding: padding + 8 closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent @@ -75,7 +76,7 @@ } background: Rectangle { - implicitHeight: control.Material.tooltipHeight + implicitHeight: 32 color: control.Material.tooltipColor opacity: 0.9 radius: 2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Tumbler.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/material/Tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/material/Tumbler.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,19 +34,16 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Material 2.2 T.Tumbler { id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) || 60 // ### remove 60 in Qt 6 - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) || 200 // ### remove 200 in Qt 6 + implicitWidth: 60 + implicitHeight: 200 delegate: Text { text: modelData @@ -58,8 +55,6 @@ } contentItem: TumblerView { - implicitWidth: 60 - implicitHeight: 200 model: control.model delegate: control.delegate path: Path { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/MenuBarItem.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/MenuBarItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/MenuBarItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/MenuBarItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -T.MenuBarItem { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - spacing: 6 - padding: 6 - leftPadding: 12 - rightPadding: 16 - - icon.width: 24 - icon.height: 24 - icon.color: control.palette.buttonText - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: control.palette.buttonText - } - - background: Rectangle { - implicitWidth: 40 - implicitHeight: 40 - color: control.down || control.highlighted ? control.palette.mid : "transparent" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/MenuBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/MenuBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/MenuBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/MenuBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -T.MenuBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - delegate: MenuBarItem { } - - contentItem: Row { - spacing: control.spacing - Repeater { - model: control.contentModel - } - } - - background: Rectangle { - implicitHeight: 40 - color: control.palette.button - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/MenuItem.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/MenuItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/MenuItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/MenuItem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,63 +34,40 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.MenuItem { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 - spacing: 6 - icon.width: 24 - icon.height: 24 - icon.color: control.palette.windowText - - contentItem: IconLabel { - readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0 - readonly property real indicatorPadding: control.checkable && control.indicator ? control.indicator.width + control.spacing : 0 - leftPadding: !control.mirrored ? indicatorPadding : arrowPadding - rightPadding: control.mirrored ? indicatorPadding : arrowPadding - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: Qt.AlignLeft + contentItem: Text { + leftPadding: control.checkable && !control.mirrored ? control.indicator.width + control.spacing : 0 + rightPadding: control.checkable && control.mirrored ? control.indicator.width + control.spacing : 0 - icon: control.icon text: control.text font: control.font - color: control.palette.windowText + color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } - indicator: ColorImage { + indicator: Image { x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding y: control.topPadding + (control.availableHeight - height) / 2 visible: control.checked source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" : "" - color: control.palette.windowText - defaultColor: "#353637" - } - - arrow: ColorImage { - x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding - y: control.topPadding + (control.availableHeight - height) / 2 - - visible: control.subMenu - mirror: control.mirrored - source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/arrow-indicator.png" : "" - color: control.palette.windowText - defaultColor: "#353637" } background: Rectangle { @@ -98,8 +75,8 @@ implicitHeight: 40 x: 1 y: 1 - width: control.width - 2 - height: control.height - 2 - color: control.down ? control.palette.midlight : control.highlighted ? control.palette.light : "transparent" + width: parent.width - 2 + height: parent.height - 2 + color: control.visualFocus || control.down ? Default.delegateColor : "transparent" } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Menu.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,31 +34,29 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Window 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.Menu { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding margins: 0 - overlap: 1 - - delegate: MenuItem { } contentItem: ListView { implicitHeight: contentHeight model: control.contentModel - interactive: Window.window ? contentHeight > Window.window.height : false + // TODO: improve this? + interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false clip: true - currentIndex: control.currentIndex + keyNavigationWraps: false + currentIndex: -1 ScrollIndicator.vertical: ScrollIndicator {} } @@ -66,15 +64,7 @@ background: Rectangle { implicitWidth: 200 implicitHeight: 40 - color: control.palette.window - border.color: control.palette.dark - } - - T.Overlay.modal: Rectangle { - color: Color.transparent(control.palette.shadow, 0.5) - } - - T.Overlay.modeless: Rectangle { - color: Color.transparent(control.palette.shadow, 0.12) + color: Default.backgroundColor + border.color: Default.frameDarkColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/MenuSeparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/MenuSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/MenuSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/MenuSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,25 +34,24 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.MenuSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) padding: 2 - verticalPadding: padding + 4 + topPadding: padding + 4 + bottomPadding: padding + 4 contentItem: Rectangle { implicitWidth: 188 implicitHeight: 1 - color: control.palette.mid + color: Default.separatorColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/PageIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.PageIndicator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) padding: 6 spacing: 6 @@ -55,7 +55,7 @@ implicitHeight: 8 radius: width / 2 - color: control.palette.dark + color: Default.pageIndicatorColor opacity: index === currentIndex ? 0.95 : pressed ? 0.7 : 0.45 Behavior on opacity { OpacityAnimator { duration: 100 } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Page.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Page.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,24 +34,27 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.Page { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitHeaderWidth, - implicitFooterWidth) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(contentWidth, + header && header.visible ? header.implicitWidth : 0, + footer && footer.visible ? footer.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding - + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) - + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) + + (header && header.visible ? header.implicitHeight + spacing : 0) + + (footer && footer.visible ? footer.implicitHeight + spacing : 0)) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) background: Rectangle { - color: control.palette.window + color: Default.backgroundColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Pane.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,22 +34,23 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.Pane { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 12 background: Rectangle { - color: control.palette.window + color: Default.backgroundColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/plugins.qmltypes qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/plugins.qmltypes --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/plugins.qmltypes 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/plugins.qmltypes 2018-03-21 07:59:29.000000000 +0000 @@ -4,80 +4,20 @@ // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.5 -merge ../templates/plugins.qmltypes -dependencies dependencies.json' +// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.2 -merge ../templates/plugins.qmltypes -dependencies dependencies.json' Module { dependencies: [ - "QtQuick 2.11", - "QtQuick.Templates 2.5", + "QtQuick 2.9", + "QtQuick.Templates 2.2", "QtQuick.Window 2.2" ] Component { - name: "QQuickCheckLabel" - defaultProperty: "data" - prototype: "QQuickText" - exports: ["QtQuick.Controls.impl/CheckLabel 2.3"] - exportMetaObjectRevisions: [0] - } - Component { - name: "QQuickClippedText" - defaultProperty: "data" - prototype: "QQuickText" - exports: ["QtQuick.Controls.impl/ClippedText 2.2"] - exportMetaObjectRevisions: [0] - Property { name: "clipX"; type: "double" } - Property { name: "clipY"; type: "double" } - Property { name: "clipWidth"; type: "double" } - Property { name: "clipHeight"; type: "double" } - } - Component { - name: "QQuickColor" - prototype: "QObject" - exports: ["QtQuick.Controls.impl/Color 2.3"] - isCreatable: false - isSingleton: true - exportMetaObjectRevisions: [0] - Method { - name: "transparent" - type: "QColor" - Parameter { name: "color"; type: "QColor" } - Parameter { name: "opacity"; type: "double" } - } - Method { - name: "blend" - type: "QColor" - Parameter { name: "a"; type: "QColor" } - Parameter { name: "b"; type: "QColor" } - Parameter { name: "factor"; type: "double" } - } - } - Component { - name: "QQuickColorImage" - defaultProperty: "data" - prototype: "QQuickImage" - exports: ["QtQuick.Controls.impl/ColorImage 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "color"; type: "QColor" } - Property { name: "defaultColor"; type: "QColor" } - } - Component { name: "QQuickDefaultBusyIndicator" defaultProperty: "data" prototype: "QQuickItem" exports: ["QtQuick.Controls.impl/BusyIndicatorImpl 2.0"] exportMetaObjectRevisions: [0] - Property { name: "pen"; type: "QColor" } - Property { name: "fill"; type: "QColor" } - Property { name: "running"; type: "bool" } - } - Component { - name: "QQuickDefaultDial" - defaultProperty: "data" - prototype: "QQuickPaintedItem" - exports: ["QtQuick.Controls.impl/DialImpl 2.0"] - exportMetaObjectRevisions: [0] - Property { name: "progress"; type: "double" } - Property { name: "color"; type: "QColor" } } Component { name: "QQuickDefaultProgressBar" @@ -87,7 +27,6 @@ exportMetaObjectRevisions: [0] Property { name: "indeterminate"; type: "bool" } Property { name: "progress"; type: "double" } - Property { name: "color"; type: "QColor" } } Component { name: "QQuickDefaultStyle" @@ -106,7 +45,6 @@ Property { name: "textSelectionColor"; type: "QColor"; isReadonly: true } Property { name: "textDisabledColor"; type: "QColor"; isReadonly: true } Property { name: "textDisabledLightColor"; type: "QColor"; isReadonly: true } - Property { name: "textPlaceholderColor"; type: "QColor"; isReadonly: true } Property { name: "focusColor"; type: "QColor"; isReadonly: true } Property { name: "focusLightColor"; type: "QColor"; isReadonly: true } Property { name: "focusPressedColor"; type: "QColor"; isReadonly: true } @@ -138,69 +76,13 @@ Property { name: "disabledLightColor"; type: "QColor"; isReadonly: true } } Component { - name: "QQuickIconImage" - defaultProperty: "data" - prototype: "QQuickImage" - exports: ["QtQuick.Controls.impl/IconImage 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "name"; type: "string" } - Property { name: "color"; type: "QColor" } - } - Component { - name: "QQuickIconLabel" + name: "QQuickDialRing" defaultProperty: "data" - prototype: "QQuickItem" - exports: ["QtQuick.Controls.impl/IconLabel 2.3"] + prototype: "QQuickPaintedItem" + exports: ["QtQuick.Controls.impl/DialRing 2.0"] exportMetaObjectRevisions: [0] - Enum { - name: "Display" - values: { - "IconOnly": 0, - "TextOnly": 1, - "TextBesideIcon": 2, - "TextUnderIcon": 3 - } - } - Property { name: "icon"; type: "QQuickIcon" } - Property { name: "text"; type: "string" } - Property { name: "font"; type: "QFont" } + Property { name: "progress"; type: "double" } Property { name: "color"; type: "QColor" } - Property { name: "display"; type: "Display" } - Property { name: "spacing"; type: "double" } - Property { name: "mirrored"; type: "bool" } - Property { name: "alignment"; type: "Qt::Alignment" } - Property { name: "topPadding"; type: "double" } - Property { name: "leftPadding"; type: "double" } - Property { name: "rightPadding"; type: "double" } - Property { name: "bottomPadding"; type: "double" } - } - Component { - name: "QQuickItemGroup" - defaultProperty: "data" - prototype: "QQuickImplicitSizeItem" - exports: ["QtQuick.Controls.impl/ItemGroup 2.2"] - exportMetaObjectRevisions: [0] - } - Component { - name: "QQuickMnemonicLabel" - defaultProperty: "data" - prototype: "QQuickText" - exports: ["QtQuick.Controls.impl/MnemonicLabel 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "text"; type: "string" } - Property { name: "mnemonicVisible"; type: "bool" } - } - Component { - name: "QQuickPaddedRectangle" - defaultProperty: "data" - prototype: "QQuickRectangle" - exports: ["QtQuick.Controls.impl/PaddedRectangle 2.0"] - exportMetaObjectRevisions: [0] - Property { name: "padding"; type: "double" } - Property { name: "topPadding"; type: "double" } - Property { name: "leftPadding"; type: "double" } - Property { name: "rightPadding"; type: "double" } - Property { name: "bottomPadding"; type: "double" } } Component { name: "QQuickPlaceholderText" @@ -228,21 +110,6 @@ defaultProperty: "data" } Component { - prototype: "QQuickAction" - name: "QtQuick.Controls/Action 2.3" - exports: ["QtQuick.Controls/Action 2.3"] - exportMetaObjectRevisions: [3] - isComposite: true - } - Component { - prototype: "QQuickActionGroup" - name: "QtQuick.Controls/ActionGroup 2.3" - exports: ["QtQuick.Controls/ActionGroup 2.3"] - exportMetaObjectRevisions: [3] - isComposite: true - defaultProperty: "actions" - } - Component { prototype: "QQuickApplicationWindow" name: "QtQuick.Controls/ApplicationWindow 2.0" exports: ["QtQuick.Controls/ApplicationWindow 2.0"] @@ -290,6 +157,15 @@ defaultProperty: "data" } Component { + prototype: "QQuickRectangle" + name: "QtQuick.Controls.impl/CheckIndicator 2.0" + exports: ["QtQuick.Controls.impl/CheckIndicator 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "control"; type: "QQuickItem"; isPointer: true } + } + Component { prototype: "QQuickComboBox" name: "QtQuick.Controls/ComboBox 2.0" exports: ["QtQuick.Controls/ComboBox 2.0"] @@ -394,22 +270,6 @@ defaultProperty: "contentData" } Component { - prototype: "QQuickMenuBar" - name: "QtQuick.Controls/MenuBar 2.3" - exports: ["QtQuick.Controls/MenuBar 2.3"] - exportMetaObjectRevisions: [3] - isComposite: true - defaultProperty: "contentData" - } - Component { - prototype: "QQuickMenuBarItem" - name: "QtQuick.Controls/MenuBarItem 2.3" - exports: ["QtQuick.Controls/MenuBarItem 2.3"] - exportMetaObjectRevisions: [3] - isComposite: true - defaultProperty: "data" - } - Component { prototype: "QQuickMenuItem" name: "QtQuick.Controls/MenuItem 2.0" exports: ["QtQuick.Controls/MenuItem 2.0"] @@ -482,6 +342,15 @@ defaultProperty: "data" } Component { + prototype: "QQuickRectangle" + name: "QtQuick.Controls.impl/RadioIndicator 2.0" + exports: ["QtQuick.Controls.impl/RadioIndicator 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "control"; type: "QQuickItem"; isPointer: true } + } + Component { prototype: "QQuickRangeSlider" name: "QtQuick.Controls/RangeSlider 2.0" exports: ["QtQuick.Controls/RangeSlider 2.0"] @@ -578,6 +447,15 @@ defaultProperty: "data" } Component { + prototype: "QQuickItem" + name: "QtQuick.Controls.impl/SwitchIndicator 2.0" + exports: ["QtQuick.Controls.impl/SwitchIndicator 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "control"; type: "QQuickItem"; isPointer: true } + } + Component { prototype: "QQuickTabBar" name: "QtQuick.Controls/TabBar 2.0" exports: ["QtQuick.Controls/TabBar 2.0"] @@ -656,150 +534,31 @@ prototype: "QQuickControl" exports: [ "QtQuick.Templates/AbstractButton 2.0", - "QtQuick.Templates/AbstractButton 2.2", - "QtQuick.Templates/AbstractButton 2.3", - "QtQuick.Templates/AbstractButton 2.4", - "QtQuick.Templates/AbstractButton 2.5" + "QtQuick.Templates/AbstractButton 2.2" ] - exportMetaObjectRevisions: [0, 2, 3, 4, 5] - Enum { - name: "Display" - values: { - "IconOnly": 0, - "TextOnly": 1, - "TextBesideIcon": 2, - "TextUnderIcon": 3 - } - } + exportMetaObjectRevisions: [0, 2] Property { name: "text"; type: "string" } Property { name: "down"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } Property { name: "checked"; type: "bool" } Property { name: "checkable"; type: "bool" } Property { name: "autoExclusive"; type: "bool" } - Property { name: "autoRepeat"; type: "bool" } Property { name: "indicator"; type: "QQuickItem"; isPointer: true } - Property { name: "icon"; revision: 3; type: "QQuickIcon" } - Property { name: "display"; revision: 3; type: "Display" } - Property { name: "action"; revision: 3; type: "QQuickAction"; isPointer: true } - Property { name: "autoRepeatDelay"; revision: 4; type: "int" } - Property { name: "autoRepeatInterval"; revision: 4; type: "int" } - Property { name: "pressX"; revision: 4; type: "double"; isReadonly: true } - Property { name: "pressY"; revision: 4; type: "double"; isReadonly: true } - Property { name: "implicitIndicatorWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitIndicatorHeight"; revision: 5; type: "double"; isReadonly: true } Signal { name: "pressed" } Signal { name: "released" } Signal { name: "canceled" } Signal { name: "clicked" } + Signal { name: "toggled"; revision: 2 } Signal { name: "pressAndHold" } Signal { name: "doubleClicked" } - Signal { name: "toggled"; revision: 2 } - Signal { name: "iconChanged"; revision: 3 } - Signal { name: "displayChanged"; revision: 3 } - Signal { name: "actionChanged"; revision: 3 } - Signal { name: "autoRepeatDelayChanged"; revision: 4 } - Signal { name: "autoRepeatIntervalChanged"; revision: 4 } - Signal { name: "pressXChanged"; revision: 4 } - Signal { name: "pressYChanged"; revision: 4 } - Signal { name: "implicitIndicatorWidthChanged"; revision: 5 } - Signal { name: "implicitIndicatorHeightChanged"; revision: 5 } Method { name: "toggle" } } Component { - name: "QQuickAction" - prototype: "QObject" - exports: ["QtQuick.Templates/Action 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "text"; type: "string" } - Property { name: "icon"; type: "QQuickIcon" } - Property { name: "enabled"; type: "bool" } - Property { name: "checked"; type: "bool" } - Property { name: "checkable"; type: "bool" } - Property { name: "shortcut"; type: "QVariant" } - Signal { - name: "textChanged" - Parameter { name: "text"; type: "string" } - } - Signal { - name: "iconChanged" - Parameter { name: "icon"; type: "QQuickIcon" } - } - Signal { - name: "enabledChanged" - Parameter { name: "enabled"; type: "bool" } - } - Signal { - name: "checkedChanged" - Parameter { name: "checked"; type: "bool" } - } - Signal { - name: "checkableChanged" - Parameter { name: "checkable"; type: "bool" } - } - Signal { - name: "shortcutChanged" - Parameter { name: "shortcut"; type: "QKeySequence" } - } - Signal { - name: "toggled" - Parameter { name: "source"; type: "QObject"; isPointer: true } - } - Signal { name: "toggled" } - Signal { - name: "triggered" - Parameter { name: "source"; type: "QObject"; isPointer: true } - } - Signal { name: "triggered" } - Method { - name: "toggle" - Parameter { name: "source"; type: "QObject"; isPointer: true } - } - Method { name: "toggle" } - Method { - name: "trigger" - Parameter { name: "source"; type: "QObject"; isPointer: true } - } - Method { name: "trigger" } - } - Component { - name: "QQuickActionGroup" - defaultProperty: "actions" - prototype: "QObject" - exports: ["QtQuick.Templates/ActionGroup 2.3"] - exportMetaObjectRevisions: [0] - attachedType: "QQuickActionGroupAttached" - Property { name: "checkedAction"; type: "QQuickAction"; isPointer: true } - Property { name: "actions"; type: "QQuickAction"; isList: true; isReadonly: true } - Property { name: "exclusive"; type: "bool" } - Property { name: "enabled"; type: "bool" } - Signal { - name: "triggered" - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - Method { - name: "addAction" - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - Method { - name: "removeAction" - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - } - Component { - name: "QQuickActionGroupAttached" - prototype: "QObject" - Property { name: "group"; type: "QQuickActionGroup"; isPointer: true } - } - Component { name: "QQuickApplicationWindow" defaultProperty: "contentData" prototype: "QQuickWindowQmlImpl" - exports: [ - "QtQuick.Templates/ApplicationWindow 2.0", - "QtQuick.Templates/ApplicationWindow 2.3" - ] - exportMetaObjectRevisions: [0, 3] + exports: ["QtQuick.Templates/ApplicationWindow 2.0"] + exportMetaObjectRevisions: [0] attachedType: "QQuickApplicationWindowAttached" Property { name: "background"; type: "QQuickItem"; isPointer: true } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } @@ -810,10 +569,6 @@ Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } Property { name: "font"; type: "QFont" } Property { name: "locale"; type: "QLocale" } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "menuBar"; revision: 3; type: "QQuickItem"; isPointer: true } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "menuBarChanged"; revision: 3 } } Component { name: "QQuickApplicationWindowAttached" @@ -824,7 +579,6 @@ Property { name: "header"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } - Property { name: "menuBar"; type: "QQuickItem"; isReadonly: true; isPointer: true } } Component { name: "QQuickBusyIndicator" @@ -840,6 +594,7 @@ prototype: "QQuickAbstractButton" exports: ["QtQuick.Templates/Button 2.0"] exportMetaObjectRevisions: [0] + Property { name: "autoRepeat"; type: "bool" } Property { name: "highlighted"; type: "bool" } Property { name: "flat"; type: "bool" } } @@ -848,23 +603,17 @@ prototype: "QObject" exports: [ "QtQuick.Templates/ButtonGroup 2.0", - "QtQuick.Templates/ButtonGroup 2.1", - "QtQuick.Templates/ButtonGroup 2.3", - "QtQuick.Templates/ButtonGroup 2.4" + "QtQuick.Templates/ButtonGroup 2.1" ] - exportMetaObjectRevisions: [0, 1, 3, 4] + exportMetaObjectRevisions: [0, 1] attachedType: "QQuickButtonGroupAttached" Property { name: "checkedButton"; type: "QQuickAbstractButton"; isPointer: true } Property { name: "buttons"; type: "QQuickAbstractButton"; isList: true; isReadonly: true } - Property { name: "exclusive"; revision: 3; type: "bool" } - Property { name: "checkState"; revision: 4; type: "Qt::CheckState" } Signal { name: "clicked" revision: 1 Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } } - Signal { name: "exclusiveChanged"; revision: 3 } - Signal { name: "checkStateChanged"; revision: 4 } Method { name: "addButton" Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } @@ -883,29 +632,19 @@ name: "QQuickCheckBox" defaultProperty: "data" prototype: "QQuickAbstractButton" - exports: [ - "QtQuick.Templates/CheckBox 2.0", - "QtQuick.Templates/CheckBox 2.4" - ] - exportMetaObjectRevisions: [0, 4] + exports: ["QtQuick.Templates/CheckBox 2.0"] + exportMetaObjectRevisions: [0] Property { name: "tristate"; type: "bool" } Property { name: "checkState"; type: "Qt::CheckState" } - Property { name: "nextCheckState"; revision: 4; type: "QJSValue" } - Signal { name: "nextCheckStateChanged"; revision: 4 } } Component { name: "QQuickCheckDelegate" defaultProperty: "data" prototype: "QQuickItemDelegate" - exports: [ - "QtQuick.Templates/CheckDelegate 2.0", - "QtQuick.Templates/CheckDelegate 2.4" - ] - exportMetaObjectRevisions: [0, 4] + exports: ["QtQuick.Templates/CheckDelegate 2.0"] + exportMetaObjectRevisions: [0] Property { name: "tristate"; type: "bool" } Property { name: "checkState"; type: "Qt::CheckState" } - Property { name: "nextCheckState"; revision: 4; type: "QJSValue" } - Signal { name: "nextCheckStateChanged"; revision: 4 } } Component { name: "QQuickComboBox" @@ -914,32 +653,37 @@ exports: [ "QtQuick.Templates/ComboBox 2.0", "QtQuick.Templates/ComboBox 2.1", - "QtQuick.Templates/ComboBox 2.2", - "QtQuick.Templates/ComboBox 2.5" + "QtQuick.Templates/ComboBox 2.2" ] - exportMetaObjectRevisions: [0, 1, 2, 5] + exportMetaObjectRevisions: [0, 1, 2] Property { name: "count"; type: "int"; isReadonly: true } Property { name: "model"; type: "QVariant" } Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true } + Property { name: "editable"; revision: 2; type: "bool" } + Property { name: "flat"; revision: 1; type: "bool" } + Property { name: "down"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "highlightedIndex"; type: "int"; isReadonly: true } Property { name: "currentIndex"; type: "int" } Property { name: "currentText"; type: "string"; isReadonly: true } Property { name: "displayText"; type: "string" } + Property { name: "editText"; revision: 2; type: "string" } Property { name: "textRole"; type: "string" } Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "indicator"; type: "QQuickItem"; isPointer: true } Property { name: "popup"; type: "QQuickPopup"; isPointer: true } - Property { name: "flat"; revision: 1; type: "bool" } - Property { name: "down"; revision: 2; type: "bool" } - Property { name: "editable"; revision: 2; type: "bool" } - Property { name: "editText"; revision: 2; type: "string" } Property { name: "validator"; revision: 2; type: "QValidator"; isPointer: true } Property { name: "inputMethodHints"; revision: 2; type: "Qt::InputMethodHints" } Property { name: "inputMethodComposing"; revision: 2; type: "bool"; isReadonly: true } Property { name: "acceptableInput"; revision: 2; type: "bool"; isReadonly: true } - Property { name: "implicitIndicatorWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitIndicatorHeight"; revision: 5; type: "double"; isReadonly: true } + Signal { name: "editableChanged"; revision: 2 } + Signal { name: "flatChanged"; revision: 1 } + Signal { name: "downChanged"; revision: 2 } + Signal { name: "editTextChanged"; revision: 2 } + Signal { name: "validatorChanged"; revision: 2 } + Signal { name: "inputMethodHintsChanged"; revision: 2 } + Signal { name: "inputMethodComposingChanged"; revision: 2 } + Signal { name: "acceptableInputChanged"; revision: 2 } Signal { name: "activated" Parameter { name: "index"; type: "int" } @@ -948,17 +692,7 @@ name: "highlighted" Parameter { name: "index"; type: "int" } } - Signal { name: "flatChanged"; revision: 1 } Signal { name: "accepted"; revision: 2 } - Signal { name: "downChanged"; revision: 2 } - Signal { name: "editableChanged"; revision: 2 } - Signal { name: "editTextChanged"; revision: 2 } - Signal { name: "validatorChanged"; revision: 2 } - Signal { name: "inputMethodHintsChanged"; revision: 2 } - Signal { name: "inputMethodComposingChanged"; revision: 2 } - Signal { name: "acceptableInputChanged"; revision: 2 } - Signal { name: "implicitIndicatorWidthChanged"; revision: 5 } - Signal { name: "implicitIndicatorHeightChanged"; revision: 5 } Method { name: "incrementCurrentIndex" } Method { name: "decrementCurrentIndex" } Method { name: "selectAll"; revision: 2 } @@ -985,21 +719,15 @@ prototype: "QQuickControl" exports: [ "QtQuick.Templates/Container 2.0", - "QtQuick.Templates/Container 2.1", - "QtQuick.Templates/Container 2.3", - "QtQuick.Templates/Container 2.5" + "QtQuick.Templates/Container 2.1" ] - exportMetaObjectRevisions: [0, 1, 3, 5] + exportMetaObjectRevisions: [0, 1] Property { name: "count"; type: "int"; isReadonly: true } Property { name: "contentModel"; type: "QVariant"; isReadonly: true } Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } Property { name: "currentIndex"; type: "int" } Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "contentWidth"; revision: 5; type: "double" } - Property { name: "contentHeight"; revision: 5; type: "double" } - Signal { name: "contentWidthChanged"; revision: 5 } - Signal { name: "contentHeightChanged"; revision: 5 } Method { name: "setCurrentIndex" Parameter { name: "index"; type: "int" } @@ -1027,26 +755,15 @@ } Method { name: "removeItem" - Parameter { name: "item"; type: "QVariant" } - } - Method { - name: "takeItem" - revision: 3 - type: "QQuickItem*" Parameter { name: "index"; type: "int" } } } - Component { name: "QQuickContentItem"; defaultProperty: "data"; prototype: "QQuickItem" } Component { name: "QQuickControl" defaultProperty: "data" prototype: "QQuickItem" - exports: [ - "QtQuick.Templates/Control 2.0", - "QtQuick.Templates/Control 2.3", - "QtQuick.Templates/Control 2.5" - ] - exportMetaObjectRevisions: [0, 3, 5] + exports: ["QtQuick.Templates/Control 2.0"] + exportMetaObjectRevisions: [0] Property { name: "font"; type: "QFont" } Property { name: "availableWidth"; type: "double"; isReadonly: true } Property { name: "availableHeight"; type: "double"; isReadonly: true } @@ -1066,29 +783,6 @@ Property { name: "wheelEnabled"; type: "bool" } Property { name: "background"; type: "QQuickItem"; isPointer: true } Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "baselineOffset"; type: "double" } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "horizontalPadding"; revision: 5; type: "double" } - Property { name: "verticalPadding"; revision: 5; type: "double" } - Property { name: "implicitContentWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitContentHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "topInset"; revision: 5; type: "double" } - Property { name: "leftInset"; revision: 5; type: "double" } - Property { name: "rightInset"; revision: 5; type: "double" } - Property { name: "bottomInset"; revision: 5; type: "double" } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "horizontalPaddingChanged"; revision: 5 } - Signal { name: "verticalPaddingChanged"; revision: 5 } - Signal { name: "implicitContentWidthChanged"; revision: 5 } - Signal { name: "implicitContentHeightChanged"; revision: 5 } - Signal { name: "implicitBackgroundWidthChanged"; revision: 5 } - Signal { name: "implicitBackgroundHeightChanged"; revision: 5 } - Signal { name: "topInsetChanged"; revision: 5 } - Signal { name: "leftInsetChanged"; revision: 5 } - Signal { name: "rightInsetChanged"; revision: 5 } - Signal { name: "bottomInsetChanged"; revision: 5 } } Component { name: "QQuickDelayButton" @@ -1105,12 +799,8 @@ name: "QQuickDial" defaultProperty: "data" prototype: "QQuickControl" - exports: [ - "QtQuick.Templates/Dial 2.0", - "QtQuick.Templates/Dial 2.2", - "QtQuick.Templates/Dial 2.5" - ] - exportMetaObjectRevisions: [0, 2, 5] + exports: ["QtQuick.Templates/Dial 2.0", "QtQuick.Templates/Dial 2.2"] + exportMetaObjectRevisions: [0, 2] Enum { name: "SnapMode" values: { @@ -1119,14 +809,6 @@ "SnapOnRelease": 2 } } - Enum { - name: "InputMode" - values: { - "Circular": 0, - "Horizontal": 1, - "Vertical": 2 - } - } Property { name: "from"; type: "double" } Property { name: "to"; type: "double" } Property { name: "value"; type: "double" } @@ -1136,12 +818,10 @@ Property { name: "snapMode"; type: "SnapMode" } Property { name: "wrap"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } - Property { name: "handle"; type: "QQuickItem"; isPointer: true } Property { name: "live"; revision: 2; type: "bool" } - Property { name: "inputMode"; revision: 5; type: "InputMode" } - Signal { name: "moved"; revision: 2 } + Property { name: "handle"; type: "QQuickItem"; isPointer: true } Signal { name: "liveChanged"; revision: 2 } - Signal { name: "inputModeChanged"; revision: 5 } + Signal { name: "moved"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } } @@ -1149,58 +829,23 @@ name: "QQuickDialog" defaultProperty: "contentData" prototype: "QQuickPopup" - exports: [ - "QtQuick.Templates/Dialog 2.1", - "QtQuick.Templates/Dialog 2.3", - "QtQuick.Templates/Dialog 2.5" - ] - exportMetaObjectRevisions: [0, 3, 5] - Enum { - name: "StandardCode" - values: { - "Rejected": 0, - "Accepted": 1 - } - } + exports: ["QtQuick.Templates/Dialog 2.1"] + exportMetaObjectRevisions: [0] Property { name: "title"; type: "string" } Property { name: "header"; type: "QQuickItem"; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isPointer: true } Property { name: "standardButtons"; type: "QPlatformDialogHelper::StandardButtons" } - Property { name: "result"; revision: 3; type: "int" } - Property { name: "implicitHeaderWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitHeaderHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitFooterWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitFooterHeight"; revision: 5; type: "double"; isReadonly: true } Signal { name: "accepted" } Signal { name: "rejected" } - Signal { name: "applied"; revision: 3 } - Signal { name: "reset"; revision: 3 } - Signal { name: "discarded"; revision: 3 } - Signal { name: "helpRequested"; revision: 3 } - Signal { name: "resultChanged"; revision: 3 } Method { name: "accept" } Method { name: "reject" } - Method { - name: "done" - Parameter { name: "result"; type: "int" } - } - Method { - name: "standardButton" - revision: 3 - type: "QQuickAbstractButton*" - Parameter { name: "button"; type: "QPlatformDialogHelper::StandardButton" } - } } Component { name: "QQuickDialogButtonBox" defaultProperty: "contentData" prototype: "QQuickContainer" - exports: [ - "QtQuick.Templates/DialogButtonBox 2.1", - "QtQuick.Templates/DialogButtonBox 2.3", - "QtQuick.Templates/DialogButtonBox 2.5" - ] - exportMetaObjectRevisions: [0, 3, 5] + exports: ["QtQuick.Templates/DialogButtonBox 2.1"] + exportMetaObjectRevisions: [0] attachedType: "QQuickDialogButtonBoxAttached" Enum { name: "Position" @@ -1213,7 +858,6 @@ Property { name: "alignment"; type: "Qt::Alignment" } Property { name: "standardButtons"; type: "QPlatformDialogHelper::StandardButtons" } Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } - Property { name: "buttonLayout"; revision: 5; type: "QPlatformDialogHelper::ButtonLayout" } Signal { name: "accepted" } Signal { name: "rejected" } Signal { name: "helpRequested" } @@ -1221,10 +865,6 @@ name: "clicked" Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } } - Signal { name: "applied"; revision: 3 } - Signal { name: "reset"; revision: 3 } - Signal { name: "discarded"; revision: 3 } - Signal { name: "buttonLayoutChanged"; revision: 5 } Method { name: "standardButton" type: "QQuickAbstractButton*" @@ -1263,25 +903,10 @@ name: "QQuickGroupBox" defaultProperty: "contentData" prototype: "QQuickFrame" - exports: [ - "QtQuick.Templates/GroupBox 2.0", - "QtQuick.Templates/GroupBox 2.5" - ] - exportMetaObjectRevisions: [0, 5] + exports: ["QtQuick.Templates/GroupBox 2.0"] + exportMetaObjectRevisions: [0] Property { name: "title"; type: "string" } Property { name: "label"; type: "QQuickItem"; isPointer: true } - Property { name: "implicitLabelWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitLabelHeight"; revision: 5; type: "double"; isReadonly: true } - Signal { name: "implicitLabelWidthChanged"; revision: 5 } - Signal { name: "implicitLabelHeightChanged"; revision: 5 } - } - Component { - name: "QQuickIcon" - Property { name: "name"; type: "string" } - Property { name: "source"; type: "QUrl" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "color"; type: "QColor" } } Component { name: "QQuickItemDelegate" @@ -1295,56 +920,20 @@ name: "QQuickLabel" defaultProperty: "data" prototype: "QQuickText" - exports: [ - "QtQuick.Templates/Label 2.0", - "QtQuick.Templates/Label 2.3", - "QtQuick.Templates/Label 2.5" - ] - exportMetaObjectRevisions: [0, 3, 5] + exports: ["QtQuick.Templates/Label 2.0"] + exportMetaObjectRevisions: [0] Property { name: "font"; type: "QFont" } Property { name: "background"; type: "QQuickItem"; isPointer: true } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "topInset"; revision: 5; type: "double" } - Property { name: "leftInset"; revision: 5; type: "double" } - Property { name: "rightInset"; revision: 5; type: "double" } - Property { name: "bottomInset"; revision: 5; type: "double" } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "implicitBackgroundWidthChanged"; revision: 5 } - Signal { name: "implicitBackgroundHeightChanged"; revision: 5 } - Signal { name: "topInsetChanged"; revision: 5 } - Signal { name: "leftInsetChanged"; revision: 5 } - Signal { name: "rightInsetChanged"; revision: 5 } - Signal { name: "bottomInsetChanged"; revision: 5 } } Component { name: "QQuickMenu" defaultProperty: "contentData" prototype: "QQuickPopup" - exports: ["QtQuick.Templates/Menu 2.0", "QtQuick.Templates/Menu 2.3"] - exportMetaObjectRevisions: [0, 3] + exports: ["QtQuick.Templates/Menu 2.0"] + exportMetaObjectRevisions: [0] Property { name: "contentModel"; type: "QVariant"; isReadonly: true } Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } Property { name: "title"; type: "string" } - Property { name: "count"; revision: 3; type: "int"; isReadonly: true } - Property { name: "cascade"; revision: 3; type: "bool" } - Property { name: "overlap"; revision: 3; type: "double" } - Property { name: "delegate"; revision: 3; type: "QQmlComponent"; isPointer: true } - Property { name: "currentIndex"; revision: 3; type: "int" } - Signal { - name: "titleChanged" - Parameter { name: "title"; type: "string" } - } - Signal { name: "countChanged"; revision: 3 } - Signal { - name: "cascadeChanged" - revision: 3 - Parameter { name: "cascade"; type: "bool" } - } - Signal { name: "overlapChanged"; revision: 3 } - Signal { name: "delegateChanged"; revision: 3 } - Signal { name: "currentIndexChanged"; revision: 3 } Method { name: "itemAt" type: "QQuickItem*" @@ -1366,140 +955,17 @@ } Method { name: "removeItem" - Parameter { name: "item"; type: "QVariant" } - } - Method { - name: "takeItem" - revision: 3 - type: "QQuickItem*" - Parameter { name: "index"; type: "int" } - } - Method { - name: "menuAt" - revision: 3 - type: "QQuickMenu*" - Parameter { name: "index"; type: "int" } - } - Method { - name: "addMenu" - revision: 3 - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "insertMenu" - revision: 3 - Parameter { name: "index"; type: "int" } - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "removeMenu" - revision: 3 - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "takeMenu" - revision: 3 - type: "QQuickMenu*" - Parameter { name: "index"; type: "int" } - } - Method { - name: "actionAt" - revision: 3 - type: "QQuickAction*" - Parameter { name: "index"; type: "int" } - } - Method { - name: "addAction" - revision: 3 - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - Method { - name: "insertAction" - revision: 3 - Parameter { name: "index"; type: "int" } - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - Method { - name: "removeAction" - revision: 3 - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - Method { - name: "takeAction" - revision: 3 - type: "QQuickAction*" Parameter { name: "index"; type: "int" } } - Method { - name: "popup" - revision: 3 - Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } - } - Method { name: "dismiss"; revision: 3 } - } - Component { - name: "QQuickMenuBar" - defaultProperty: "contentData" - prototype: "QQuickContainer" - exports: ["QtQuick.Templates/MenuBar 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } - Property { name: "contentWidth"; type: "double" } - Property { name: "contentHeight"; type: "double" } - Property { name: "menus"; type: "QQuickMenu"; isList: true; isReadonly: true } - Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } - Method { - name: "menuAt" - type: "QQuickMenu*" - Parameter { name: "index"; type: "int" } - } - Method { - name: "addMenu" - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "insertMenu" - Parameter { name: "index"; type: "int" } - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "removeMenu" - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "takeMenu" - type: "QQuickMenu*" - Parameter { name: "index"; type: "int" } - } - } - Component { - name: "QQuickMenuBarItem" - defaultProperty: "data" - prototype: "QQuickAbstractButton" - exports: ["QtQuick.Templates/MenuBarItem 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "menuBar"; type: "QQuickMenuBar"; isReadonly: true; isPointer: true } - Property { name: "menu"; type: "QQuickMenu"; isPointer: true } - Property { name: "highlighted"; type: "bool" } - Signal { name: "triggered" } } Component { name: "QQuickMenuItem" defaultProperty: "data" prototype: "QQuickAbstractButton" - exports: [ - "QtQuick.Templates/MenuItem 2.0", - "QtQuick.Templates/MenuItem 2.3" - ] - exportMetaObjectRevisions: [0, 3] + exports: ["QtQuick.Templates/MenuItem 2.0"] + exportMetaObjectRevisions: [0] Property { name: "highlighted"; type: "bool" } - Property { name: "arrow"; revision: 3; type: "QQuickItem"; isPointer: true } - Property { name: "menu"; revision: 3; type: "QQuickMenu"; isReadonly: true; isPointer: true } - Property { name: "subMenu"; revision: 3; type: "QQuickMenu"; isReadonly: true; isPointer: true } Signal { name: "triggered" } - Signal { name: "arrowChanged"; revision: 3 } - Signal { name: "menuChanged"; revision: 3 } - Signal { name: "subMenuChanged"; revision: 3 } } Component { name: "QQuickMenuSeparator" @@ -1512,19 +978,6 @@ name: "QQuickOverlay" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtQuick.Templates/Overlay 2.3"] - isCreatable: false - exportMetaObjectRevisions: [0] - attachedType: "QQuickOverlayAttached" - Property { name: "modal"; type: "QQmlComponent"; isPointer: true } - Property { name: "modeless"; type: "QQmlComponent"; isPointer: true } - Signal { name: "pressed" } - Signal { name: "released" } - } - Component { - name: "QQuickOverlayAttached" - prototype: "QObject" - Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } Property { name: "modal"; type: "QQmlComponent"; isPointer: true } Property { name: "modeless"; type: "QQmlComponent"; isPointer: true } Signal { name: "pressed" } @@ -1533,22 +986,18 @@ Component { name: "QQuickPage" defaultProperty: "contentData" - prototype: "QQuickPane" - exports: [ - "QtQuick.Templates/Page 2.0", - "QtQuick.Templates/Page 2.1", - "QtQuick.Templates/Page 2.5" - ] - exportMetaObjectRevisions: [0, 1, 5] + prototype: "QQuickControl" + exports: ["QtQuick.Templates/Page 2.0", "QtQuick.Templates/Page 2.1"] + exportMetaObjectRevisions: [0, 1] Property { name: "title"; type: "string" } Property { name: "header"; type: "QQuickItem"; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isPointer: true } Property { name: "contentWidth"; revision: 1; type: "double" } Property { name: "contentHeight"; revision: 1; type: "double" } - Property { name: "implicitHeaderWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitHeaderHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitFooterWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitFooterHeight"; revision: 5; type: "double"; isReadonly: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + Signal { name: "contentWidthChanged"; revision: 1 } + Signal { name: "contentHeightChanged"; revision: 1 } } Component { name: "QQuickPageIndicator" @@ -1578,11 +1027,9 @@ prototype: "QObject" exports: [ "QtQuick.Templates/Popup 2.0", - "QtQuick.Templates/Popup 2.1", - "QtQuick.Templates/Popup 2.3", - "QtQuick.Templates/Popup 2.5" + "QtQuick.Templates/Popup 2.1" ] - exportMetaObjectRevisions: [0, 1, 3, 5] + exportMetaObjectRevisions: [0, 1] Enum { name: "ClosePolicy" values: { @@ -1619,6 +1066,7 @@ Property { name: "contentHeight"; type: "double" } Property { name: "availableWidth"; type: "double"; isReadonly: true } Property { name: "availableHeight"; type: "double"; isReadonly: true } + Property { name: "spacing"; revision: 1; type: "double" } Property { name: "margins"; type: "double" } Property { name: "topMargin"; type: "double" } Property { name: "leftMargin"; type: "double" } @@ -1648,51 +1096,15 @@ Property { name: "transformOrigin"; type: "TransformOrigin" } Property { name: "enter"; type: "QQuickTransition"; isPointer: true } Property { name: "exit"; type: "QQuickTransition"; isPointer: true } - Property { name: "spacing"; revision: 1; type: "double" } - Property { name: "opened"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "mirrored"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "enabled"; revision: 3; type: "bool" } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "horizontalPadding"; type: "double" } - Property { name: "verticalPadding"; type: "double" } - Property { - name: "anchors" - revision: 5 - type: "QQuickPopupAnchors" - isReadonly: true - isPointer: true - } - Property { name: "implicitContentWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitContentHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "topInset"; revision: 5; type: "double" } - Property { name: "leftInset"; revision: 5; type: "double" } - Property { name: "rightInset"; revision: 5; type: "double" } - Property { name: "bottomInset"; revision: 5; type: "double" } - Signal { name: "opened" } - Signal { name: "closed" } - Signal { name: "aboutToShow" } - Signal { name: "aboutToHide" } + Signal { name: "spacingChanged"; revision: 1 } Signal { name: "windowChanged" Parameter { name: "window"; type: "QQuickWindow"; isPointer: true } } - Signal { name: "spacingChanged"; revision: 1 } - Signal { name: "openedChanged"; revision: 3 } - Signal { name: "mirroredChanged"; revision: 3 } - Signal { name: "enabledChanged"; revision: 3 } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "horizontalPaddingChanged"; revision: 5 } - Signal { name: "verticalPaddingChanged"; revision: 5 } - Signal { name: "implicitContentWidthChanged"; revision: 5 } - Signal { name: "implicitContentHeightChanged"; revision: 5 } - Signal { name: "implicitBackgroundWidthChanged"; revision: 5 } - Signal { name: "implicitBackgroundHeightChanged"; revision: 5 } - Signal { name: "topInsetChanged"; revision: 5 } - Signal { name: "leftInsetChanged"; revision: 5 } - Signal { name: "rightInsetChanged"; revision: 5 } - Signal { name: "bottomInsetChanged"; revision: 5 } + Signal { name: "aboutToShow" } + Signal { name: "aboutToHide" } + Signal { name: "opened" } + Signal { name: "closed" } Method { name: "open" } Method { name: "close" } Method { @@ -1702,12 +1114,6 @@ Method { name: "forceActiveFocus" } } Component { - name: "QQuickPopupAnchors" - prototype: "QObject" - Property { name: "centerIn"; type: "QQuickItem"; isPointer: true } - } - Component { name: "QQuickPopupItem"; defaultProperty: "contentData"; prototype: "QQuickPage" } - Component { name: "QQuickProgressBar" defaultProperty: "data" prototype: "QQuickControl" @@ -1741,11 +1147,9 @@ exports: [ "QtQuick.Templates/RangeSlider 2.0", "QtQuick.Templates/RangeSlider 2.1", - "QtQuick.Templates/RangeSlider 2.2", - "QtQuick.Templates/RangeSlider 2.3", - "QtQuick.Templates/RangeSlider 2.5" + "QtQuick.Templates/RangeSlider 2.2" ] - exportMetaObjectRevisions: [0, 1, 2, 3, 5] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "SnapMode" values: { @@ -1762,22 +1166,12 @@ Property { name: "snapMode"; type: "SnapMode" } Property { name: "orientation"; type: "Qt::Orientation" } Property { name: "live"; revision: 2; type: "bool" } - Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "touchDragThreshold"; revision: 5; type: "double" } Signal { name: "liveChanged"; revision: 2 } - Signal { name: "touchDragThresholdChanged"; revision: 5 } Method { name: "setValues" Parameter { name: "firstValue"; type: "double" } Parameter { name: "secondValue"; type: "double" } } - Method { - name: "valueAt" - revision: 5 - type: "double" - Parameter { name: "position"; type: "double" } - } } Component { name: "QQuickRangeSliderNode" @@ -1788,10 +1182,7 @@ Property { name: "handle"; type: "QQuickItem"; isPointer: true } Property { name: "pressed"; type: "bool" } Property { name: "hovered"; revision: 1; type: "bool" } - Property { name: "implicitHandleWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitHandleHeight"; revision: 5; type: "double"; isReadonly: true } Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "moved" } Method { name: "increase" } Method { name: "decrease" } } @@ -1800,7 +1191,7 @@ defaultProperty: "data" prototype: "QQuickButton" exports: ["QtQuick.Templates/RoundButton 2.1"] - exportMetaObjectRevisions: [0] + exportMetaObjectRevisions: [1] Property { name: "radius"; type: "double" } } Component { @@ -1809,11 +1200,9 @@ prototype: "QQuickControl" exports: [ "QtQuick.Templates/ScrollBar 2.0", - "QtQuick.Templates/ScrollBar 2.2", - "QtQuick.Templates/ScrollBar 2.3", - "QtQuick.Templates/ScrollBar 2.4" + "QtQuick.Templates/ScrollBar 2.2" ] - exportMetaObjectRevisions: [0, 2, 3, 4] + exportMetaObjectRevisions: [0, 2] attachedType: "QQuickScrollBarAttached" Enum { name: "SnapMode" @@ -1840,17 +1229,9 @@ Property { name: "snapMode"; revision: 2; type: "SnapMode" } Property { name: "interactive"; revision: 2; type: "bool" } Property { name: "policy"; revision: 2; type: "Policy" } - Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "minimumSize"; revision: 4; type: "double" } - Property { name: "visualSize"; revision: 4; type: "double"; isReadonly: true } - Property { name: "visualPosition"; revision: 4; type: "double"; isReadonly: true } Signal { name: "snapModeChanged"; revision: 2 } Signal { name: "interactiveChanged"; revision: 2 } Signal { name: "policyChanged"; revision: 2 } - Signal { name: "minimumSizeChanged"; revision: 4 } - Signal { name: "visualSizeChanged"; revision: 4 } - Signal { name: "visualPositionChanged"; revision: 4 } Method { name: "increase" } Method { name: "decrease" } Method { @@ -1872,25 +1253,13 @@ name: "QQuickScrollIndicator" defaultProperty: "data" prototype: "QQuickControl" - exports: [ - "QtQuick.Templates/ScrollIndicator 2.0", - "QtQuick.Templates/ScrollIndicator 2.3", - "QtQuick.Templates/ScrollIndicator 2.4" - ] - exportMetaObjectRevisions: [0, 3, 4] + exports: ["QtQuick.Templates/ScrollIndicator 2.0"] + exportMetaObjectRevisions: [0] attachedType: "QQuickScrollIndicatorAttached" Property { name: "size"; type: "double" } Property { name: "position"; type: "double" } Property { name: "active"; type: "bool" } Property { name: "orientation"; type: "Qt::Orientation" } - Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "minimumSize"; revision: 4; type: "double" } - Property { name: "visualSize"; revision: 4; type: "double"; isReadonly: true } - Property { name: "visualPosition"; revision: 4; type: "double"; isReadonly: true } - Signal { name: "minimumSizeChanged"; revision: 4 } - Signal { name: "visualSizeChanged"; revision: 4 } - Signal { name: "visualPositionChanged"; revision: 4 } Method { name: "setSize" Parameter { name: "size"; type: "double" } @@ -1909,9 +1278,13 @@ Component { name: "QQuickScrollView" defaultProperty: "contentData" - prototype: "QQuickPane" + prototype: "QQuickControl" exports: ["QtQuick.Templates/ScrollView 2.2"] exportMetaObjectRevisions: [0] + Property { name: "contentWidth"; type: "double" } + Property { name: "contentHeight"; type: "double" } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } } Component { name: "QQuickSlider" @@ -1920,11 +1293,9 @@ exports: [ "QtQuick.Templates/Slider 2.0", "QtQuick.Templates/Slider 2.1", - "QtQuick.Templates/Slider 2.2", - "QtQuick.Templates/Slider 2.3", - "QtQuick.Templates/Slider 2.5" + "QtQuick.Templates/Slider 2.2" ] - exportMetaObjectRevisions: [0, 1, 2, 3, 5] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "SnapMode" values: { @@ -1940,20 +1311,12 @@ Property { name: "visualPosition"; type: "double"; isReadonly: true } Property { name: "stepSize"; type: "double" } Property { name: "snapMode"; type: "SnapMode" } + Property { name: "live"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "orientation"; type: "Qt::Orientation" } Property { name: "handle"; type: "QQuickItem"; isPointer: true } - Property { name: "live"; revision: 2; type: "bool" } - Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "touchDragThreshold"; revision: 5; type: "double" } - Property { name: "implicitHandleWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitHandleHeight"; revision: 5; type: "double"; isReadonly: true } - Signal { name: "moved"; revision: 2 } Signal { name: "liveChanged"; revision: 2 } - Signal { name: "touchDragThresholdChanged"; revision: 5 } - Signal { name: "implicitHandleWidthChanged"; revision: 5 } - Signal { name: "implicitHandleHeightChanged"; revision: 5 } + Signal { name: "moved"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } Method { @@ -1970,12 +1333,9 @@ exports: [ "QtQuick.Templates/SpinBox 2.0", "QtQuick.Templates/SpinBox 2.1", - "QtQuick.Templates/SpinBox 2.2", - "QtQuick.Templates/SpinBox 2.3", - "QtQuick.Templates/SpinBox 2.4", - "QtQuick.Templates/SpinBox 2.5" + "QtQuick.Templates/SpinBox 2.2" ] - exportMetaObjectRevisions: [0, 1, 2, 3, 4, 5] + exportMetaObjectRevisions: [0, 1, 2] Property { name: "from"; type: "int" } Property { name: "to"; type: "int" } Property { name: "value"; type: "int" } @@ -1988,13 +1348,9 @@ Property { name: "down"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true } Property { name: "inputMethodHints"; revision: 2; type: "Qt::InputMethodHints" } Property { name: "inputMethodComposing"; revision: 2; type: "bool"; isReadonly: true } - Property { name: "wrap"; revision: 3; type: "bool" } - Property { name: "displayText"; revision: 4; type: "string"; isReadonly: true } Signal { name: "valueModified"; revision: 2 } Signal { name: "inputMethodHintsChanged"; revision: 2 } Signal { name: "inputMethodComposingChanged"; revision: 2 } - Signal { name: "wrapChanged"; revision: 3 } - Signal { name: "displayTextChanged"; revision: 4 } Method { name: "increase" } Method { name: "decrease" } } @@ -2002,13 +1358,9 @@ name: "QQuickSpinButton" prototype: "QObject" Property { name: "pressed"; type: "bool" } - Property { name: "indicator"; type: "QQuickItem"; isPointer: true } Property { name: "hovered"; revision: 1; type: "bool" } - Property { name: "implicitIndicatorWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitIndicatorHeight"; revision: 5; type: "double"; isReadonly: true } + Property { name: "indicator"; type: "QQuickItem"; isPointer: true } Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "implicitIndicatorWidthChanged"; revision: 5 } - Signal { name: "implicitIndicatorHeightChanged"; revision: 5 } } Component { name: "QQuickStackView" @@ -2049,19 +1401,13 @@ Property { name: "busy"; type: "bool"; isReadonly: true } Property { name: "depth"; type: "int"; isReadonly: true } Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "initialItem"; type: "QJSValue" } + Property { name: "initialItem"; type: "QVariant" } Property { name: "popEnter"; type: "QQuickTransition"; isPointer: true } Property { name: "popExit"; type: "QQuickTransition"; isPointer: true } Property { name: "pushEnter"; type: "QQuickTransition"; isPointer: true } Property { name: "pushExit"; type: "QQuickTransition"; isPointer: true } Property { name: "replaceEnter"; type: "QQuickTransition"; isPointer: true } Property { name: "replaceExit"; type: "QQuickTransition"; isPointer: true } - Property { name: "empty"; revision: 3; type: "bool"; isReadonly: true } - Signal { name: "emptyChanged"; revision: 3 } - Method { - name: "clear" - Parameter { name: "operation"; type: "Operation" } - } Method { name: "clear" } Method { name: "get" @@ -2116,23 +1462,23 @@ prototype: "QObject" Property { name: "position"; type: "double" } Property { name: "complete"; type: "bool"; isReadonly: true } + Property { name: "enabled"; type: "bool" } Property { name: "left"; type: "QQmlComponent"; isPointer: true } Property { name: "behind"; type: "QQmlComponent"; isPointer: true } Property { name: "right"; type: "QQmlComponent"; isPointer: true } Property { name: "leftItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "behindItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "rightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "enabled"; type: "bool" } Property { name: "transition"; type: "QQuickTransition"; isPointer: true } Signal { name: "completed" } Signal { name: "opened" } Signal { name: "closed" } - Method { name: "close"; revision: 1 } Method { name: "open" revision: 2 Parameter { name: "side"; type: "QQuickSwipeDelegate::Side" } } + Method { name: "close"; revision: 1 } } Component { name: "QQuickSwipeDelegate" @@ -2173,8 +1519,6 @@ attachedType: "QQuickSwipeViewAttached" Property { name: "interactive"; revision: 1; type: "bool" } Property { name: "orientation"; revision: 2; type: "Qt::Orientation" } - Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } Signal { name: "interactiveChanged"; revision: 1 } Signal { name: "orientationChanged"; revision: 2 } } @@ -2183,9 +1527,9 @@ prototype: "QObject" Property { name: "index"; type: "int"; isReadonly: true } Property { name: "isCurrentItem"; type: "bool"; isReadonly: true } - Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true } Property { name: "isNextItem"; revision: 1; type: "bool"; isReadonly: true } Property { name: "isPreviousItem"; revision: 1; type: "bool"; isReadonly: true } + Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true } } Component { name: "QQuickSwitch" @@ -2214,7 +1558,6 @@ "QtQuick.Templates/TabBar 2.2" ] exportMetaObjectRevisions: [0, 2] - attachedType: "QQuickTabBarAttached" Enum { name: "Position" values: { @@ -2225,13 +1568,8 @@ Property { name: "position"; type: "Position" } Property { name: "contentWidth"; revision: 2; type: "double" } Property { name: "contentHeight"; revision: 2; type: "double" } - } - Component { - name: "QQuickTabBarAttached" - prototype: "QObject" - Property { name: "index"; type: "int"; isReadonly: true } - Property { name: "tabBar"; type: "QQuickTabBar"; isReadonly: true; isPointer: true } - Property { name: "position"; type: "QQuickTabBar::Position"; isReadonly: true } + Signal { name: "contentWidthChanged"; revision: 2 } + Signal { name: "contentHeightChanged"; revision: 2 } } Component { name: "QQuickTabButton" @@ -2246,11 +1584,9 @@ prototype: "QQuickTextEdit" exports: [ "QtQuick.Templates/TextArea 2.0", - "QtQuick.Templates/TextArea 2.1", - "QtQuick.Templates/TextArea 2.3", - "QtQuick.Templates/TextArea 2.5" + "QtQuick.Templates/TextArea 2.1" ] - exportMetaObjectRevisions: [0, 1, 3, 5] + exportMetaObjectRevisions: [0, 1] attachedType: "QQuickTextAreaAttached" Property { name: "font"; type: "QFont" } Property { name: "implicitWidth"; type: "double" } @@ -2260,16 +1596,10 @@ Property { name: "focusReason"; type: "Qt::FocusReason" } Property { name: "hovered"; revision: 1; type: "bool"; isReadonly: true } Property { name: "hoverEnabled"; revision: 1; type: "bool" } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "placeholderTextColor"; revision: 5; type: "QColor" } - Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "topInset"; revision: 5; type: "double" } - Property { name: "leftInset"; revision: 5; type: "double" } - Property { name: "rightInset"; revision: 5; type: "double" } - Property { name: "bottomInset"; revision: 5; type: "double" } Signal { name: "implicitWidthChanged3" } Signal { name: "implicitHeightChanged3" } + Signal { name: "hoveredChanged"; revision: 1 } + Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "pressAndHold" Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } @@ -2284,16 +1614,6 @@ revision: 1 Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } } - Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "hoverEnabledChanged"; revision: 1 } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "placeholderTextColorChanged"; revision: 5 } - Signal { name: "implicitBackgroundWidthChanged"; revision: 5 } - Signal { name: "implicitBackgroundHeightChanged"; revision: 5 } - Signal { name: "topInsetChanged"; revision: 5 } - Signal { name: "leftInsetChanged"; revision: 5 } - Signal { name: "rightInsetChanged"; revision: 5 } - Signal { name: "bottomInsetChanged"; revision: 5 } } Component { name: "QQuickTextAreaAttached" @@ -2306,11 +1626,9 @@ prototype: "QQuickTextInput" exports: [ "QtQuick.Templates/TextField 2.0", - "QtQuick.Templates/TextField 2.1", - "QtQuick.Templates/TextField 2.3", - "QtQuick.Templates/TextField 2.5" + "QtQuick.Templates/TextField 2.1" ] - exportMetaObjectRevisions: [0, 1, 3, 5] + exportMetaObjectRevisions: [0, 1] Property { name: "font"; type: "QFont" } Property { name: "implicitWidth"; type: "double" } Property { name: "implicitHeight"; type: "double" } @@ -2319,16 +1637,10 @@ Property { name: "focusReason"; type: "Qt::FocusReason" } Property { name: "hovered"; revision: 1; type: "bool"; isReadonly: true } Property { name: "hoverEnabled"; revision: 1; type: "bool" } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "placeholderTextColor"; revision: 5; type: "QColor" } - Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "topInset"; revision: 5; type: "double" } - Property { name: "leftInset"; revision: 5; type: "double" } - Property { name: "rightInset"; revision: 5; type: "double" } - Property { name: "bottomInset"; revision: 5; type: "double" } Signal { name: "implicitWidthChanged3" } Signal { name: "implicitHeightChanged3" } + Signal { name: "hoveredChanged"; revision: 1 } + Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "pressAndHold" Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } @@ -2343,16 +1655,6 @@ revision: 1 Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } } - Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "hoverEnabledChanged"; revision: 1 } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "placeholderTextColorChanged"; revision: 5 } - Signal { name: "implicitBackgroundWidthChanged"; revision: 5 } - Signal { name: "implicitBackgroundHeightChanged"; revision: 5 } - Signal { name: "topInsetChanged"; revision: 5 } - Signal { name: "leftInsetChanged"; revision: 5 } - Signal { name: "rightInsetChanged"; revision: 5 } - Signal { name: "bottomInsetChanged"; revision: 5 } } Component { name: "QQuickToolBar" @@ -2390,27 +1692,12 @@ name: "QQuickToolTip" defaultProperty: "contentData" prototype: "QQuickPopup" - exports: [ - "QtQuick.Templates/ToolTip 2.0", - "QtQuick.Templates/ToolTip 2.5" - ] - exportMetaObjectRevisions: [0, 5] + exports: ["QtQuick.Templates/ToolTip 2.0"] + exportMetaObjectRevisions: [0] attachedType: "QQuickToolTipAttached" Property { name: "delay"; type: "int" } Property { name: "timeout"; type: "int" } Property { name: "text"; type: "string" } - Method { - name: "show" - revision: 5 - Parameter { name: "text"; type: "string" } - Parameter { name: "ms"; type: "int" } - } - Method { - name: "show" - revision: 5 - Parameter { name: "text"; type: "string" } - } - Method { name: "hide"; revision: 5 } } Component { name: "QQuickToolTipAttached" @@ -2442,17 +1729,6 @@ ] exportMetaObjectRevisions: [0, 1, 2] attachedType: "QQuickTumblerAttached" - Enum { - name: "PositionMode" - values: { - "Beginning": 0, - "Center": 1, - "End": 2, - "Visible": 3, - "Contain": 4, - "SnapPosition": 5 - } - } Property { name: "model"; type: "QVariant" } Property { name: "count"; type: "int"; isReadonly: true } Property { name: "currentIndex"; type: "int" } @@ -2463,12 +1739,6 @@ Property { name: "moving"; revision: 2; type: "bool"; isReadonly: true } Signal { name: "wrapChanged"; revision: 1 } Signal { name: "movingChanged"; revision: 2 } - Method { - name: "positionViewAtIndex" - revision: 5 - Parameter { name: "index"; type: "int" } - Parameter { name: "mode"; type: "PositionMode" } - } } Component { name: "QQuickTumblerAttached" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Popup.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,31 +34,25 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.Popup { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 12 background: Rectangle { - color: control.palette.window - border.color: control.palette.dark - } - - T.Overlay.modal: Rectangle { - color: Color.transparent(control.palette.shadow, 0.5) - } - - T.Overlay.modeless: Rectangle { - color: Color.transparent(control.palette.shadow, 0.12) + border.color: Default.frameDarkColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ProgressBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ProgressBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ProgressBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ProgressBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 T.ProgressBar { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) contentItem: ProgressBarImpl { implicitHeight: 6 @@ -53,15 +53,16 @@ scale: control.mirrored ? -1 : 1 progress: control.position indeterminate: control.visible && control.indeterminate - color: control.palette.dark } background: Rectangle { implicitWidth: 200 implicitHeight: 6 - y: (control.height - height) / 2 + x: control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + width: control.availableWidth height: 6 - color: control.palette.midlight + color: Default.progressBarColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qmldir qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qmldir --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qmldir 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qmldir 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ module QtQuick.Controls plugin qtquickcontrols2plugin classname QtQuickControls2Plugin -depends QtQuick.Templates 2.5 +depends QtQuick.Templates 2.2 designersupported diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultbusyindicator.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultbusyindicator.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultbusyindicator.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultbusyindicator.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -45,6 +45,7 @@ static const int CircleCount = 10; static const int TotalDuration = 100 * CircleCount * 2; static const QRgb TransparentColor = 0x00000000; +static const QRgb FillColor = 0xFF353637; static QPointF moveCircle(const QPointF &pos, qreal rotation, qreal distance) { @@ -58,10 +59,6 @@ void updateCurrentTime(int time) override; void sync(QQuickItem *item) override; - -private: - QColor m_pen; - QColor m_fill; }; QQuickDefaultBusyIndicatorNode::QQuickDefaultBusyIndicatorNode(QQuickDefaultBusyIndicator *item) @@ -95,9 +92,8 @@ Q_ASSERT(rectNode->type() == QSGNode::GeometryNodeType); const bool fill = (firstPhaseProgress > qreal(i) / CircleCount) || (secondPhaseProgress > 0 && secondPhaseProgress < qreal(i) / CircleCount); - rectNode->setColor(fill ? m_fill : QColor::fromRgba(TransparentColor)); - rectNode->setPenColor(m_pen); - rectNode->setPenWidth(1); + rectNode->setColor(QColor::fromRgba(fill ? FillColor : TransparentColor)); + rectNode->setPenWidth(fill ? 0 : 1); rectNode->update(); transformNode = static_cast(transformNode->nextSibling()); @@ -113,9 +109,6 @@ const qreal dy = (h - sz) / 2; const int circleRadius = sz / 12; - m_pen = static_cast(item)->pen(); - m_fill = static_cast(item)->fill(); - QSGTransformNode *transformNode = static_cast(firstChild()); for (int i = 0; i < CircleCount; ++i) { Q_ASSERT(transformNode->type() == QSGNode::TransformNodeType); @@ -138,39 +131,11 @@ } QQuickDefaultBusyIndicator::QQuickDefaultBusyIndicator(QQuickItem *parent) : - QQuickItem(parent) + QQuickItem(parent), m_elapsed(0) { setFlag(ItemHasContents); } -QColor QQuickDefaultBusyIndicator::pen() const -{ - return m_pen; -} - -void QQuickDefaultBusyIndicator::setPen(const QColor &pen) -{ - if (pen == m_pen) - return; - - m_pen = pen; - update(); -} - -QColor QQuickDefaultBusyIndicator::fill() const -{ - return m_fill; -} - -void QQuickDefaultBusyIndicator::setFill(const QColor &fill) -{ - if (fill == m_fill) - return; - - m_fill = fill; - update(); -} - bool QQuickDefaultBusyIndicator::isRunning() const { return isVisible(); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultbusyindicator_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultbusyindicator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultbusyindicator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultbusyindicator_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -49,26 +49,17 @@ // #include -#include QT_BEGIN_NAMESPACE class QQuickDefaultBusyIndicator : public QQuickItem { Q_OBJECT - Q_PROPERTY(QColor pen READ pen WRITE setPen FINAL) - Q_PROPERTY(QColor fill READ fill WRITE setFill FINAL) Q_PROPERTY(bool running READ isRunning WRITE setRunning) public: explicit QQuickDefaultBusyIndicator(QQuickItem *parent = nullptr); - QColor pen() const; - void setPen(const QColor &pen); - - QColor fill() const; - void setFill(const QColor &fill); - bool isRunning() const; void setRunning(bool running); @@ -79,9 +70,7 @@ QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: - int m_elapsed = 0; - QColor m_pen; - QColor m_fill; + int m_elapsed; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultdial.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultdial.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultdial.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultdial.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,122 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickdefaultdial_p.h" - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -QQuickDefaultDial::QQuickDefaultDial(QQuickItem *parent) : - QQuickPaintedItem(parent) -{ -} - -qreal QQuickDefaultDial::progress() const -{ - return m_progress; -} - -void QQuickDefaultDial::setProgress(qreal progress) -{ - if (progress == m_progress) - return; - - m_progress = progress; - update(); -} - -QColor QQuickDefaultDial::color() const -{ - return m_color; -} - -void QQuickDefaultDial::setColor(const QColor &color) -{ - if (color == m_color) - return; - - m_color = color; - update(); -} - -void QQuickDefaultDial::paint(QPainter *painter) -{ - if (width() <= 0 || height() <= 0) - return; - - QPen pen(m_color); - pen.setWidth(8); - pen.setCapStyle(Qt::FlatCap); - painter->setPen(pen); - - const QRectF bounds = boundingRect(); - const qreal smallest = qMin(bounds.width(), bounds.height()); - QRectF rect = QRectF(pen.widthF() / 2.0 + 1, pen.widthF() / 2.0 + 1, smallest - pen.widthF() - 2, smallest - pen.widthF() - 2); - rect.moveCenter(bounds.center()); - - // Make sure the arc is aligned to whole pixels. - if (rect.x() - int(rect.x()) > 0) - rect.setX(qCeil(rect.x())); - if (rect.y() - int(rect.y()) > 0) - rect.setY(qCeil(rect.y())); - if (rect.width() - int(rect.width()) > 0) - rect.setWidth(qFloor(rect.width())); - if (rect.height() - int(rect.height()) > 0) - rect.setHeight(qFloor(rect.height())); - - painter->setRenderHint(QPainter::Antialiasing); - - const qreal startAngle = (140 + 90); - const qreal spanAngle = (m_progress * 280) * -1; - QPainterPath path; - path.arcMoveTo(rect, startAngle); - path.arcTo(rect, startAngle, spanAngle); - painter->drawPath(path); - - rect.adjust(-pen.widthF() / 2.0, -pen.widthF() / 2.0, pen.widthF() / 2.0, pen.widthF() / 2.0); - pen.setWidth(1); - painter->setPen(pen); - - path = QPainterPath(); - path.arcMoveTo(rect, 0); - path.arcTo(rect, 0, 360); - painter->drawPath(path); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultdial_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultdial_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultdial_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultdial_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKDEFAULTDIAL_P_H -#define QQUICKDEFAULTDIAL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickDefaultDial : public QQuickPaintedItem -{ - Q_OBJECT - Q_PROPERTY(qreal progress READ progress WRITE setProgress FINAL) - Q_PROPERTY(QColor color READ color WRITE setColor FINAL) - -public: - explicit QQuickDefaultDial(QQuickItem *parent = nullptr); - - qreal progress() const; - void setProgress(qreal progress); - - QColor color() const; - void setColor(const QColor &color); - - void paint(QPainter *painter) override; - -private: - qreal m_progress = 0; - QColor m_color = Qt::black; -}; - -QT_END_NAMESPACE - -#endif // QQUICKDEFAULTDIAL_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultprogressbar.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultprogressbar.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultprogressbar.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultprogressbar.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -51,6 +51,7 @@ static const int TotalDuration = 4000; static const int SecondPhaseStart = TotalDuration * 0.4; static const int ThirdPhaseStart = TotalDuration * 0.6; +static const QRgb FillColor = 0x353637; static inline qreal blockStartX(int blockIndex) { @@ -77,12 +78,13 @@ void sync(QQuickItem *item) override; private: - bool m_indeterminate = false; - qreal m_pixelsPerSecond = 0; + bool m_indeterminate; + qreal m_pixelsPerSecond; }; QQuickDefaultProgressBarNode::QQuickDefaultProgressBarNode(QQuickDefaultProgressBar *item) : QQuickAnimatedNode(item), + m_indeterminate(false), m_pixelsPerSecond(item->width()) { setLoopCount(Infinite); @@ -176,7 +178,7 @@ QSGInternalRectangleNode *rectNode = static_cast(transformNode->firstChild()); if (!rectNode) { rectNode = d->sceneGraphContext()->createInternalRectangleNode(); - rectNode->setColor(bar->color()); + rectNode->setColor(FillColor); transformNode->appendChildNode(rectNode); } @@ -198,7 +200,7 @@ QSGInternalRectangleNode *rectNode = static_cast(firstChild()); if (!rectNode) { rectNode = d->sceneGraphContext()->createInternalRectangleNode(); - rectNode->setColor(bar->color()); + rectNode->setColor(FillColor); appendChildNode(rectNode); } @@ -208,7 +210,9 @@ } QQuickDefaultProgressBar::QQuickDefaultProgressBar(QQuickItem *parent) : - QQuickItem(parent) + QQuickItem(parent), + m_progress(0), + m_indeterminate(false) { setFlag(ItemHasContents); } @@ -225,6 +229,7 @@ m_progress = progress; update(); + emit progressChanged(); } bool QQuickDefaultProgressBar::isIndeterminate() const @@ -240,20 +245,7 @@ m_indeterminate = indeterminate; setClip(m_indeterminate); update(); -} - -QColor QQuickDefaultProgressBar::color() const -{ - return m_color; -} - -void QQuickDefaultProgressBar::setColor(const QColor &color) -{ - if (color == m_color) - return; - - m_color = color; - update(); + emit indeterminateChanged(); } void QQuickDefaultProgressBar::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultprogressbar_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultprogressbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaultprogressbar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaultprogressbar_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -49,16 +49,14 @@ // #include -#include QT_BEGIN_NAMESPACE class QQuickDefaultProgressBar : public QQuickItem { Q_OBJECT - Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate FINAL) - Q_PROPERTY(qreal progress READ progress WRITE setProgress FINAL) - Q_PROPERTY(QColor color READ color WRITE setColor FINAL) + Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate NOTIFY indeterminateChanged FINAL) + Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged FINAL) public: explicit QQuickDefaultProgressBar(QQuickItem *parent = nullptr); @@ -69,17 +67,17 @@ qreal progress() const; void setProgress(qreal progress); - QColor color() const; - void setColor(const QColor &color); +Q_SIGNALS: + void progressChanged(); + void indeterminateChanged(); protected: void itemChange(ItemChange change, const ItemChangeData &data) override; QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: - qreal m_progress = 0; - bool m_indeterminate = false; - QColor m_color; + qreal m_progress; + bool m_indeterminate; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaulttheme.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaulttheme.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaulttheme.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaulttheme.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickdefaulttheme_p.h" - -#include - -QT_BEGIN_NAMESPACE - -void QQuickDefaultTheme::initialize(QQuickTheme *theme) -{ - QPalette systemPalette; - - systemPalette.setColor(QPalette::Base, QColor::fromRgba(0xFFFFFFFF)); - systemPalette.setColor(QPalette::Disabled, QPalette::Base, QColor::fromRgba(0xFFD6D6D6)); - - systemPalette.setColor(QPalette::Button, QColor::fromRgba(0xFFE0E0E0)); - - systemPalette.setColor(QPalette::ButtonText, QColor::fromRgba(0xFF26282A)); - systemPalette.setColor(QPalette::Disabled, QPalette::ButtonText, QColor::fromRgba(0x4D26282A)); - - systemPalette.setColor(QPalette::BrightText, QColor::fromRgba(0xFFFFFFFF)); - systemPalette.setColor(QPalette::Disabled, QPalette::BrightText, QColor::fromRgba(0x4DFFFFFF)); - - systemPalette.setColor(QPalette::Dark, QColor::fromRgba(0xFF353637)); - - systemPalette.setColor(QPalette::Highlight, QColor::fromRgba(0xFF0066FF)); - systemPalette.setColor(QPalette::Disabled, QPalette::Highlight, QColor::fromRgba(0xFFF0F6FF)); - - systemPalette.setColor(QPalette::HighlightedText, QColor::fromRgba(0xFF090909)); - - systemPalette.setColor(QPalette::Light, QColor::fromRgba(0xFFF6F6F6)); - - systemPalette.setColor(QPalette::Link, QColor::fromRgba(0xFF45A7D7)); - - systemPalette.setColor(QPalette::Mid, QColor::fromRgba(0xFFBDBDBD)); - - systemPalette.setColor(QPalette::Midlight, QColor::fromRgba(0xFFE4E4E4)); - - systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637)); - systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0x7F353637)); - - systemPalette.setColor(QPalette::Shadow, QColor::fromRgba(0xFF28282A)); - - systemPalette.setColor(QPalette::ToolTipBase, QColor::fromRgba(0xFFFFFFFF)); - systemPalette.setColor(QPalette::ToolTipText, QColor::fromRgba(0xFF000000)); - - systemPalette.setColor(QPalette::Window, QColor::fromRgba(0xFFFFFFFF)); - - systemPalette.setColor(QPalette::WindowText, QColor::fromRgba(0xFF26282A)); - systemPalette.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgba(0xFFBDBEBF)); - - theme->setPalette(QQuickTheme::System, systemPalette); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaulttheme_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaulttheme_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdefaulttheme_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdefaulttheme_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKDEFAULTTHEME_P_H -#define QQUICKDEFAULTTHEME_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -QT_BEGIN_NAMESPACE - -class QQuickTheme; - -class QQuickDefaultTheme -{ -public: - static void initialize(QQuickTheme *theme); -}; - -QT_END_NAMESPACE - -#endif // QQUICKDEFAULTTHEME_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdialring.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdialring.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdialring.cpp 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdialring.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,126 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qquickdialring_p.h" + +#include +#include +#include + +QT_BEGIN_NAMESPACE + +QQuickDialRing::QQuickDialRing(QQuickItem *parent) : + QQuickPaintedItem(parent), + m_progress(0), + m_color(Qt::black) +{ +} + +qreal QQuickDialRing::progress() const +{ + return m_progress; +} + +void QQuickDialRing::setProgress(qreal progress) +{ + if (progress == m_progress) + return; + + m_progress = progress; + update(); + emit progressChanged(); +} + +QColor QQuickDialRing::color() const +{ + return m_color; +} + +void QQuickDialRing::setColor(const QColor &color) +{ + if (color == m_color) + return; + + m_color = color; + update(); + emit colorChanged(); +} + +void QQuickDialRing::paint(QPainter *painter) +{ + if (width() <= 0 || height() <= 0) + return; + + QPen pen(m_color); + pen.setWidth(8); + pen.setCapStyle(Qt::FlatCap); + painter->setPen(pen); + + const QRectF bounds = boundingRect(); + const qreal smallest = qMin(bounds.width(), bounds.height()); + QRectF rect = QRectF(pen.widthF() / 2.0 + 1, pen.widthF() / 2.0 + 1, smallest - pen.widthF() - 2, smallest - pen.widthF() - 2); + rect.moveCenter(bounds.center()); + + // Make sure the arc is aligned to whole pixels. + if (rect.x() - int(rect.x()) > 0) + rect.setX(qCeil(rect.x())); + if (rect.y() - int(rect.y()) > 0) + rect.setY(qCeil(rect.y())); + if (rect.width() - int(rect.width()) > 0) + rect.setWidth(qFloor(rect.width())); + if (rect.height() - int(rect.height()) > 0) + rect.setHeight(qFloor(rect.height())); + + painter->setRenderHint(QPainter::Antialiasing); + + const qreal startAngle = (140 + 90); + const qreal spanAngle = (m_progress * 280) * -1; + QPainterPath path; + path.arcMoveTo(rect, startAngle); + path.arcTo(rect, startAngle, spanAngle); + painter->drawPath(path); + + rect.adjust(-pen.widthF() / 2.0, -pen.widthF() / 2.0, pen.widthF() / 2.0, pen.widthF() / 2.0); + pen.setWidth(1); + painter->setPen(pen); + + path = QPainterPath(); + path.arcMoveTo(rect, 0); + path.arcTo(rect, 0, 360); + painter->drawPath(path); +} + +QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdialring_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdialring_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qquickdialring_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qquickdialring_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKDIALRING_P_H +#define QQUICKDIALRING_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include + +QT_BEGIN_NAMESPACE + +class QQuickDialRing : public QQuickPaintedItem +{ + Q_OBJECT + Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged) + Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) + +public: + QQuickDialRing(QQuickItem *parent = nullptr); + + qreal progress() const; + void setProgress(qreal progress); + + QColor color() const; + void setColor(const QColor &color); + + void paint(QPainter *painter) override; + +Q_SIGNALS: + void progressChanged(); + void colorChanged(); + +private: + qreal m_progress; + QColor m_color; +}; + +QT_END_NAMESPACE + +#endif // QQUICKDIALRING_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qtquickcontrols2plugin.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qtquickcontrols2plugin.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qtquickcontrols2plugin.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qtquickcontrols2plugin.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -34,37 +34,31 @@ ** ****************************************************************************/ -#include -#include -#include -#include #include -#include -#include #include -#include -#include -#include -#include -#include -#include #include -#include #include #include +#include +#include #if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview) #include #endif -#include #include #include -#include #include "qquickdefaultbusyindicator_p.h" -#include "qquickdefaultdial_p.h" #include "qquickdefaultprogressbar_p.h" #include "qquickdefaultstyle_p.h" -#include "qquickdefaulttheme_p.h" +#include "qquickdialring_p.h" + +static inline void initResources() +{ + Q_INIT_RESOURCE(qtquickcontrols2plugin); +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtQuick_Controls_2); +#endif +} QT_BEGIN_NAMESPACE @@ -75,246 +69,115 @@ public: QtQuickControls2Plugin(QObject *parent = nullptr); - ~QtQuickControls2Plugin(); - - void registerTypes(const char *uri) override; - - QString name() const override; - void initializeTheme(QQuickTheme *theme) override; - -private: - QList loadStylePlugins(); - QQuickTheme *createTheme(const QString &name); + void registerTypes(const char *uri); + void initializeEngine(QQmlEngine *engine, const char *uri); }; QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQuickStylePlugin(parent) { -} - -QtQuickControls2Plugin::~QtQuickControls2Plugin() -{ - QQuickStylePrivate::reset(); -} - -static bool isDefaultStyle(const QString &style) -{ - return style.isEmpty() || style.compare(QStringLiteral("Default"), Qt::CaseInsensitive) == 0; + initResources(); } void QtQuickControls2Plugin::registerTypes(const char *uri) { - QQuickStylePrivate::init(baseUrl()); - + QQuickStylePrivate::init(typeUrl()); const QString style = QQuickStyle::name(); if (!style.isEmpty()) QFileSelectorPrivate::addStatics(QStringList() << style.toLower()); - QQuickTheme *theme = createTheme(style.isEmpty() ? name() : style); - if (isDefaultStyle(style)) - initializeTheme(theme); - - // load the style's plugins to get access to its resources and initialize the theme - QList stylePlugins = loadStylePlugins(); - for (QQuickStylePlugin *stylePlugin : stylePlugins) - stylePlugin->initializeTheme(theme); - qDeleteAll(stylePlugins); - - // Register the latest version, even if there are no new types or new revisions for existing types yet. - // Before Qt 5.12, we would do the following: - // - // qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... - // - // However, we want to align with the rest of Qt Quick which uses Qt's minor version. - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); + QQuickStyleSelector selector; + selector.setBaseUrl(typeUrl()); + + qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... // QtQuick.Controls 2.0 (originally introduced in Qt 5.7) - qmlRegisterType(resolvedUrl(QStringLiteral("AbstractButton.qml")), uri, 2, 0, "AbstractButton"); - qmlRegisterType(resolvedUrl(QStringLiteral("ApplicationWindow.qml")), uri, 2, 0, "ApplicationWindow"); - qmlRegisterType(resolvedUrl(QStringLiteral("BusyIndicator.qml")), uri, 2, 0, "BusyIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("Button.qml")), uri, 2, 0, "Button"); - qmlRegisterType(resolvedUrl(QStringLiteral("ButtonGroup.qml")), uri, 2, 0, "ButtonGroup"); - qmlRegisterType(resolvedUrl(QStringLiteral("CheckBox.qml")), uri, 2, 0, "CheckBox"); - qmlRegisterType(resolvedUrl(QStringLiteral("CheckDelegate.qml")), uri, 2, 0, "CheckDelegate"); - qmlRegisterType(resolvedUrl(QStringLiteral("ComboBox.qml")), uri, 2, 0, "ComboBox"); - qmlRegisterType(resolvedUrl(QStringLiteral("Container.qml")), uri, 2, 0, "Container"); - qmlRegisterType(resolvedUrl(QStringLiteral("Control.qml")), uri, 2, 0, "Control"); - qmlRegisterType(resolvedUrl(QStringLiteral("Dial.qml")), uri, 2, 0, "Dial"); - qmlRegisterType(resolvedUrl(QStringLiteral("Drawer.qml")), uri, 2, 0, "Drawer"); - qmlRegisterType(resolvedUrl(QStringLiteral("Frame.qml")), uri, 2, 0, "Frame"); - qmlRegisterType(resolvedUrl(QStringLiteral("GroupBox.qml")), uri, 2, 0, "GroupBox"); - qmlRegisterType(resolvedUrl(QStringLiteral("ItemDelegate.qml")), uri, 2, 0, "ItemDelegate"); - qmlRegisterType(resolvedUrl(QStringLiteral("Label.qml")), uri, 2, 0, "Label"); - qmlRegisterType(resolvedUrl(QStringLiteral("Menu.qml")), uri, 2, 0, "Menu"); - qmlRegisterType(resolvedUrl(QStringLiteral("MenuItem.qml")), uri, 2, 0, "MenuItem"); - qmlRegisterType(resolvedUrl(QStringLiteral("Page.qml")), uri, 2, 0, "Page"); - qmlRegisterType(resolvedUrl(QStringLiteral("PageIndicator.qml")), uri, 2, 0, "PageIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("Pane.qml")), uri, 2, 0, "Pane"); - qmlRegisterType(resolvedUrl(QStringLiteral("Popup.qml")), uri, 2, 0, "Popup"); - qmlRegisterType(resolvedUrl(QStringLiteral("ProgressBar.qml")), uri, 2, 0, "ProgressBar"); - qmlRegisterType(resolvedUrl(QStringLiteral("RadioButton.qml")), uri, 2, 0, "RadioButton"); - qmlRegisterType(resolvedUrl(QStringLiteral("RadioDelegate.qml")), uri, 2, 0, "RadioDelegate"); - qmlRegisterType(resolvedUrl(QStringLiteral("RangeSlider.qml")), uri, 2, 0, "RangeSlider"); - qmlRegisterType(resolvedUrl(QStringLiteral("ScrollBar.qml")), uri, 2, 0, "ScrollBar"); - qmlRegisterType(resolvedUrl(QStringLiteral("ScrollIndicator.qml")), uri, 2, 0, "ScrollIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("Slider.qml")), uri, 2, 0, "Slider"); - qmlRegisterType(resolvedUrl(QStringLiteral("SpinBox.qml")), uri, 2, 0, "SpinBox"); - qmlRegisterType(resolvedUrl(QStringLiteral("StackView.qml")), uri, 2, 0, "StackView"); - qmlRegisterType(resolvedUrl(QStringLiteral("SwipeDelegate.qml")), uri, 2, 0, "SwipeDelegate"); - qmlRegisterType(resolvedUrl(QStringLiteral("SwipeView.qml")), uri, 2, 0, "SwipeView"); - qmlRegisterType(resolvedUrl(QStringLiteral("Switch.qml")), uri, 2, 0, "Switch"); - qmlRegisterType(resolvedUrl(QStringLiteral("SwitchDelegate.qml")), uri, 2, 0, "SwitchDelegate"); - qmlRegisterType(resolvedUrl(QStringLiteral("TabBar.qml")), uri, 2, 0, "TabBar"); - qmlRegisterType(resolvedUrl(QStringLiteral("TabButton.qml")), uri, 2, 0, "TabButton"); - qmlRegisterType(resolvedUrl(QStringLiteral("TextArea.qml")), uri, 2, 0, "TextArea"); - qmlRegisterType(resolvedUrl(QStringLiteral("TextField.qml")), uri, 2, 0, "TextField"); - qmlRegisterType(resolvedUrl(QStringLiteral("ToolBar.qml")), uri, 2, 0, "ToolBar"); - qmlRegisterType(resolvedUrl(QStringLiteral("ToolButton.qml")), uri, 2, 0, "ToolButton"); - qmlRegisterType(resolvedUrl(QStringLiteral("ToolTip.qml")), uri, 2, 0, "ToolTip"); + qmlRegisterType(selector.select(QStringLiteral("AbstractButton.qml")), uri, 2, 0, "AbstractButton"); + qmlRegisterType(selector.select(QStringLiteral("ApplicationWindow.qml")), uri, 2, 0, "ApplicationWindow"); + qmlRegisterType(selector.select(QStringLiteral("BusyIndicator.qml")), uri, 2, 0, "BusyIndicator"); + qmlRegisterType(selector.select(QStringLiteral("Button.qml")), uri, 2, 0, "Button"); + qmlRegisterType(selector.select(QStringLiteral("ButtonGroup.qml")), uri, 2, 0, "ButtonGroup"); + qmlRegisterType(selector.select(QStringLiteral("CheckBox.qml")), uri, 2, 0, "CheckBox"); + qmlRegisterType(selector.select(QStringLiteral("CheckDelegate.qml")), uri, 2, 0, "CheckDelegate"); + qmlRegisterType(selector.select(QStringLiteral("ComboBox.qml")), uri, 2, 0, "ComboBox"); + qmlRegisterType(selector.select(QStringLiteral("Container.qml")), uri, 2, 0, "Container"); + qmlRegisterType(selector.select(QStringLiteral("Control.qml")), uri, 2, 0, "Control"); + qmlRegisterType(selector.select(QStringLiteral("Dial.qml")), uri, 2, 0, "Dial"); + qmlRegisterType(selector.select(QStringLiteral("Drawer.qml")), uri, 2, 0, "Drawer"); + qmlRegisterType(selector.select(QStringLiteral("Frame.qml")), uri, 2, 0, "Frame"); + qmlRegisterType(selector.select(QStringLiteral("GroupBox.qml")), uri, 2, 0, "GroupBox"); + qmlRegisterType(selector.select(QStringLiteral("ItemDelegate.qml")), uri, 2, 0, "ItemDelegate"); + qmlRegisterType(selector.select(QStringLiteral("Label.qml")), uri, 2, 0, "Label"); + qmlRegisterType(selector.select(QStringLiteral("Menu.qml")), uri, 2, 0, "Menu"); + qmlRegisterType(selector.select(QStringLiteral("MenuItem.qml")), uri, 2, 0, "MenuItem"); + qmlRegisterType(selector.select(QStringLiteral("Page.qml")), uri, 2, 0, "Page"); + qmlRegisterType(selector.select(QStringLiteral("PageIndicator.qml")), uri, 2, 0, "PageIndicator"); + qmlRegisterType(selector.select(QStringLiteral("Pane.qml")), uri, 2, 0, "Pane"); + qmlRegisterType(selector.select(QStringLiteral("Popup.qml")), uri, 2, 0, "Popup"); + qmlRegisterType(selector.select(QStringLiteral("ProgressBar.qml")), uri, 2, 0, "ProgressBar"); + qmlRegisterType(selector.select(QStringLiteral("RadioButton.qml")), uri, 2, 0, "RadioButton"); + qmlRegisterType(selector.select(QStringLiteral("RadioDelegate.qml")), uri, 2, 0, "RadioDelegate"); + qmlRegisterType(selector.select(QStringLiteral("RangeSlider.qml")), uri, 2, 0, "RangeSlider"); + qmlRegisterType(selector.select(QStringLiteral("ScrollBar.qml")), uri, 2, 0, "ScrollBar"); + qmlRegisterType(selector.select(QStringLiteral("ScrollIndicator.qml")), uri, 2, 0, "ScrollIndicator"); + qmlRegisterType(selector.select(QStringLiteral("Slider.qml")), uri, 2, 0, "Slider"); + qmlRegisterType(selector.select(QStringLiteral("SpinBox.qml")), uri, 2, 0, "SpinBox"); + qmlRegisterType(selector.select(QStringLiteral("StackView.qml")), uri, 2, 0, "StackView"); + qmlRegisterType(selector.select(QStringLiteral("SwipeDelegate.qml")), uri, 2, 0, "SwipeDelegate"); + qmlRegisterType(selector.select(QStringLiteral("SwipeView.qml")), uri, 2, 0, "SwipeView"); + qmlRegisterType(selector.select(QStringLiteral("Switch.qml")), uri, 2, 0, "Switch"); + qmlRegisterType(selector.select(QStringLiteral("SwitchDelegate.qml")), uri, 2, 0, "SwitchDelegate"); + qmlRegisterType(selector.select(QStringLiteral("TabBar.qml")), uri, 2, 0, "TabBar"); + qmlRegisterType(selector.select(QStringLiteral("TabButton.qml")), uri, 2, 0, "TabButton"); + qmlRegisterType(selector.select(QStringLiteral("TextArea.qml")), uri, 2, 0, "TextArea"); + qmlRegisterType(selector.select(QStringLiteral("TextField.qml")), uri, 2, 0, "TextField"); + qmlRegisterType(selector.select(QStringLiteral("ToolBar.qml")), uri, 2, 0, "ToolBar"); + qmlRegisterType(selector.select(QStringLiteral("ToolButton.qml")), uri, 2, 0, "ToolButton"); + qmlRegisterType(selector.select(QStringLiteral("ToolTip.qml")), uri, 2, 0, "ToolTip"); #if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview) - qmlRegisterType(resolvedUrl(QStringLiteral("Tumbler.qml")), uri, 2, 0, "Tumbler"); + qmlRegisterType(selector.select(QStringLiteral("Tumbler.qml")), uri, 2, 0, "Tumbler"); #endif // QtQuick.Controls 2.1 (new types in Qt 5.8) - qmlRegisterType(resolvedUrl(QStringLiteral("Dialog.qml")), uri, 2, 1, "Dialog"); - qmlRegisterType(resolvedUrl(QStringLiteral("DialogButtonBox.qml")), uri, 2, 1, "DialogButtonBox"); - qmlRegisterType(resolvedUrl(QStringLiteral("MenuSeparator.qml")), uri, 2, 1, "MenuSeparator"); - qmlRegisterType(resolvedUrl(QStringLiteral("RoundButton.qml")), uri, 2, 1, "RoundButton"); - qmlRegisterType(resolvedUrl(QStringLiteral("ToolSeparator.qml")), uri, 2, 1, "ToolSeparator"); + qmlRegisterType(selector.select(QStringLiteral("Dialog.qml")), uri, 2, 1, "Dialog"); + qmlRegisterType(selector.select(QStringLiteral("DialogButtonBox.qml")), uri, 2, 1, "DialogButtonBox"); + qmlRegisterType(selector.select(QStringLiteral("MenuSeparator.qml")), uri, 2, 1, "MenuSeparator"); + qmlRegisterType(selector.select(QStringLiteral("RoundButton.qml")), uri, 2, 1, "RoundButton"); + qmlRegisterType(selector.select(QStringLiteral("ToolSeparator.qml")), uri, 2, 1, "ToolSeparator"); // QtQuick.Controls 2.2 (new types in Qt 5.9) - qmlRegisterType(resolvedUrl(QStringLiteral("DelayButton.qml")), uri, 2, 2, "DelayButton"); - qmlRegisterType(resolvedUrl(QStringLiteral("ScrollView.qml")), uri, 2, 2, "ScrollView"); - - // QtQuick.Controls 2.3 (new types in Qt 5.10) - qmlRegisterType(resolvedUrl(QStringLiteral("Action.qml")), uri, 2, 3, "Action"); - qmlRegisterType(resolvedUrl(QStringLiteral("ActionGroup.qml")), uri, 2, 3, "ActionGroup"); - qmlRegisterType(resolvedUrl(QStringLiteral("MenuBar.qml")), uri, 2, 3, "MenuBar"); - qmlRegisterType(resolvedUrl(QStringLiteral("MenuBarItem.qml")), uri, 2, 3, "MenuBarItem"); - qmlRegisterUncreatableType(uri, 2, 3, "Overlay", QStringLiteral("Overlay is only available as an attached property.")); - - // Register the latest version, even if there are no new types or new revisions for existing types yet. - // Before Qt 5.12, we would do the following: - // - // qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... - // - // However, we want to align with the rest of Qt Quick which uses Qt's minor version. - const QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR); - - // QtQuick.Controls.impl 2.0 (Qt 5.7) - qmlRegisterType(import, 2, 0, "BusyIndicatorImpl"); - qmlRegisterType(import, 2, 0, "DialImpl"); - qmlRegisterType(import, 2, 0, "PaddedRectangle"); - qmlRegisterType(import, 2, 0, "ProgressBarImpl"); - - // QtQuick.Controls.impl 2.1 (Qt 5.8) -#if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview) - qmlRegisterType(import, 2, 1, "TumblerView"); -#endif - qmlRegisterSingletonType(import, 2, 1, "Default", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* { - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new QQuickDefaultStyle; - }); - - // QtQuick.Controls.impl 2.2 (Qt 5.9) - qmlRegisterType(import, 2, 2, "ClippedText"); - qmlRegisterType(import, 2, 2, "ItemGroup"); - qmlRegisterType(import, 2, 2, "PlaceholderText"); - - // QtQuick.Controls.impl 2.3 (Qt 5.10) - qmlRegisterType(import, 2, 3, "ColorImage"); - qmlRegisterType(import, 2, 3, "IconImage"); - qmlRegisterSingletonType(import, 2, 3, "Color", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* { - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new QQuickColor; - }); - qmlRegisterType(import, 2, 3, "IconLabel"); - qmlRegisterType(import, 2, 3, "CheckLabel"); - qmlRegisterType(import, 2, 3, "MnemonicLabel"); - qmlRegisterRevision(import, 2, 3); + qmlRegisterType(selector.select(QStringLiteral("DelayButton.qml")), uri, 2, 2, "DelayButton"); + qmlRegisterType(selector.select(QStringLiteral("ScrollView.qml")), uri, 2, 2, "ScrollView"); } -QString QtQuickControls2Plugin::name() const +static QObject *styleSingleton(QQmlEngine *engine, QJSEngine *scriptEngine) { - return QStringLiteral("Default"); + Q_UNUSED(engine); + Q_UNUSED(scriptEngine); + return new QQuickDefaultStyle; } -void QtQuickControls2Plugin::initializeTheme(QQuickTheme *theme) +void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *uri) { - QQuickDefaultTheme::initialize(theme); -} + Q_UNUSED(uri); -QList QtQuickControls2Plugin::loadStylePlugins() -{ - QList stylePlugins; + engine->addImageProvider(QStringLiteral("default"), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/QtQuick/Controls.2/images"))); - QFileInfo fileInfo = QQmlFile::urlToLocalFileOrQrc(resolvedUrl(QStringLiteral("qmldir"))); - if (fileInfo.exists() && fileInfo.path() != QQmlFile::urlToLocalFileOrQrc(baseUrl())) { - QFile file(fileInfo.filePath()); - if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { - QQmlDirParser parser; - parser.parse(QString::fromUtf8(file.readAll())); - if (!parser.hasError()) { -#ifdef QT_STATIC - const auto plugins = QPluginLoader::staticInstances(); - for (QObject *instance : plugins) { - QQuickStylePlugin *stylePlugin = qobject_cast(instance); - if (!stylePlugin || parser.className() != QLatin1String(instance->metaObject()->className())) - continue; - stylePlugins += stylePlugin; - } -#elif QT_CONFIG(library) - QPluginLoader loader; - const auto plugins = parser.plugins(); - for (const QQmlDirParser::Plugin &plugin : plugins) { - QDir dir = fileInfo.dir(); - if (!plugin.path.isEmpty() && !dir.cd(plugin.path)) - continue; - QString filePath = dir.filePath(plugin.name); -#if defined(Q_OS_MACOS) && defined(QT_DEBUG) - // Avoid mismatching plugins on macOS so that we don't end up loading both debug and - // release versions of the same Qt libraries (due to the plugin's dependencies). - filePath += QStringLiteral("_debug"); -#endif // Q_OS_MACOS && QT_DEBUG -#if defined(Q_OS_WIN) && defined(QT_DEBUG) - // Debug versions of plugins have a "d" prefix on Windows. - filePath += QLatin1Char('d'); -#endif // Q_OS_WIN && QT_DEBUG - loader.setFileName(filePath); - QQuickStylePlugin *stylePlugin = qobject_cast(loader.instance()); - if (stylePlugin) - stylePlugins += stylePlugin; - } -#endif - } - } - } - return stylePlugins; -} + const QByteArray import = QByteArray(uri) + ".impl"; + qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... -QQuickTheme *QtQuickControls2Plugin::createTheme(const QString &name) -{ - QQuickTheme *theme = new QQuickTheme; -#if QT_CONFIG(settings) - QQuickThemePrivate *p = QQuickThemePrivate::get(theme); - QSharedPointer settings = QQuickStylePrivate::settings(name); - if (settings) { - p->defaultFont.reset(QQuickStylePrivate::readFont(settings)); - // Set the default font as the System scope, because that's what - // QQuickControlPrivate::parentFont() uses as its fallback if no - // parent item has a font explicitly set. QQuickControlPrivate::parentFont() - // is used as the starting point for font inheritance/resolution. - // The same goes for palettes below. - theme->setFont(QQuickTheme::System, *p->defaultFont); - - p->defaultPalette.reset(QQuickStylePrivate::readPalette(settings)); - theme->setPalette(QQuickTheme::System, *p->defaultPalette); - } + qmlRegisterType(import, 2, 0, "BusyIndicatorImpl"); + qmlRegisterType(import, 2, 2, "ClippedText"); + qmlRegisterType(import, 2, 0, "ProgressBarImpl"); + qmlRegisterType(import, 2, 0, "DialRing"); + qmlRegisterType(import, 2, 2, "ItemGroup"); + qmlRegisterType(import, 2, 2, "PlaceholderText"); +#if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview) + qmlRegisterType(import, 2, 1, "TumblerView"); #endif - QQuickThemePrivate::instance.reset(theme); - return theme; + qmlRegisterSingletonType(import, 2, 1, "Default", styleSingleton); + qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qtquickcontrols2plugin.qrc qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qtquickcontrols2plugin.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/qtquickcontrols2plugin.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/qtquickcontrols2plugin.qrc 2018-03-21 07:59:29.000000000 +0000 @@ -1,9 +1,5 @@ - images/arrow-indicator.png - images/arrow-indicator@2x.png - images/arrow-indicator@3x.png - images/arrow-indicator@4x.png images/check.png images/check@2x.png images/check@3x.png diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/RadioButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/RadioButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/RadioButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/RadioButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,53 +34,39 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.RadioButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 spacing: 6 - // keep in sync with RadioDelegate.qml (shared RadioIndicator.qml was removed for performance reasons) - indicator: Rectangle { - implicitWidth: 28 - implicitHeight: 28 - + indicator: RadioIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - - radius: width / 2 - color: control.down ? control.palette.light : control.palette.base - border.width: control.visualFocus ? 2 : 1 - border.color: control.visualFocus ? control.palette.highlight : control.palette.mid - - Rectangle { - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - width: 20 - height: 20 - radius: width / 2 - color: control.palette.text - visible: control.checked - } + control: control } - contentItem: CheckLabel { + contentItem: Text { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 text: control.text font: control.font - color: control.palette.windowText + color: control.down ? Default.textDarkColor : Default.textColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + opacity: enabled ? 1 : 0.3 } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/RadioDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/RadioDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/RadioDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/RadioDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,70 +34,46 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.RadioDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 12 spacing: 12 - icon.width: 24 - icon.height: 24 - icon.color: control.palette.text - - contentItem: IconLabel { + contentItem: Text { leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0 - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon text: control.text font: control.font - color: control.palette.text + color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } - // keep in sync with RadioButton.qml (shared RadioIndicator.qml was removed for performance reasons) - indicator: Rectangle { - implicitWidth: 28 - implicitHeight: 28 - + indicator: RadioIndicator { x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding y: control.topPadding + (control.availableHeight - height) / 2 - radius: width / 2 - color: control.down ? control.palette.light : control.palette.base - border.width: control.visualFocus ? 2 : 1 - border.color: control.visualFocus ? control.palette.highlight : control.palette.mid - - Rectangle { - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - width: 20 - height: 20 - radius: width / 2 - color: control.palette.text - visible: control.checked - } + control: control } background: Rectangle { implicitWidth: 100 implicitHeight: 40 visible: control.down || control.highlighted - color: control.down ? control.palette.midlight : control.palette.light + color: control.down ? Default.delegatePressedColor : Default.delegateColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/RadioIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/RadioIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/RadioIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/RadioIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 + +Rectangle { + implicitWidth: 28 + implicitHeight: 28 + + radius: width / 2 + color: control.down + ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor) + : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor) + border.width: control.visualFocus ? 2 : 1 + border.color: control.visualFocus ? Default.focusColor : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor) + opacity: enabled ? 1 : 0.3 + + property Item control + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 20 + height: 20 + radius: width / 2 + color: control.down ? Default.textDarkColor : Default.buttonCheckedColor + visible: control.checked + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/RangeSlider.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/RangeSlider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/RangeSlider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/RangeSlider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,63 +34,77 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.RangeSlider { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - first.implicitHandleWidth + leftPadding + rightPadding, - second.implicitHandleWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - first.implicitHandleHeight + topPadding + bottomPadding, - second.implicitHandleHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(first.handle ? first.handle.implicitWidth : 0, + second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(first.handle ? first.handle.implicitHeight : 0, + second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 first.handle: Rectangle { - x: control.leftPadding + (control.horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) + x: control.leftPadding + (horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) implicitWidth: 28 implicitHeight: 28 radius: width / 2 border.width: activeFocus ? 2 : 1 - border.color: activeFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight - color: control.first.pressed ? control.palette.light : control.palette.window + border.color: control.enabled ? (activeFocus + ? Default.focusColor + : (control.first.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor + color: control.enabled ? (first.pressed + ? (activeFocus ? Default.focusPressedColor : Default.indicatorPressedColor) + : (activeFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor + + readonly property bool horizontal: control.orientation === Qt.Horizontal } second.handle: Rectangle { - x: control.leftPadding + (control.horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) + x: control.leftPadding + (horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) implicitWidth: 28 implicitHeight: 28 radius: width / 2 border.width: activeFocus ? 2 : 1 - border.color: activeFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight - color: control.second.pressed ? control.palette.light : control.palette.window + border.color: control.enabled ? (activeFocus + ? Default.focusColor + : (control.second.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor + color: control.enabled ? (second.pressed + ? (activeFocus ? Default.focusPressedColor : Default.indicatorPressedColor) + : (activeFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor + + readonly property bool horizontal: control.orientation === Qt.Horizontal } background: Rectangle { - x: control.leftPadding + (control.horizontal ? 0 : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0) - implicitWidth: control.horizontal ? 200 : 6 - implicitHeight: control.horizontal ? 6 : 200 - width: control.horizontal ? control.availableWidth : implicitWidth - height: control.horizontal ? implicitHeight : control.availableHeight + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + implicitWidth: horizontal ? 200 : 6 + implicitHeight: horizontal ? 6 : 200 + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.availableHeight radius: 3 - color: control.palette.midlight - scale: control.horizontal && control.mirrored ? -1 : 1 + color: Default.buttonColor + scale: horizontal && control.mirrored ? -1 : 1 + + readonly property bool horizontal: control.orientation === Qt.Horizontal Rectangle { - x: control.horizontal ? control.first.position * parent.width + 3 : 0 - y: control.horizontal ? 0 : control.second.visualPosition * parent.height + 3 - width: control.horizontal ? control.second.position * parent.width - control.first.position * parent.width - 6 : 6 - height: control.horizontal ? 6 : control.second.position * parent.height - control.first.position * parent.height - 6 + x: parent.horizontal ? control.first.position * parent.width + 3 : 0 + y: parent.horizontal ? 0 : control.second.visualPosition * parent.height + 3 + width: parent.horizontal ? control.second.position * parent.width - control.first.position * parent.width - 6 : 6 + height: parent.horizontal ? 6 : control.second.position * parent.height - control.first.position * parent.height - 6 - color: control.palette.dark + color: Default.textColor } } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/RoundButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/RoundButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/RoundButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/RoundButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,37 +34,30 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.RoundButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 - spacing: 6 - icon.width: 24 - icon.height: 24 - icon.color: control.checked || control.highlighted ? control.palette.brightText : - control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font - color: control.checked || control.highlighted ? control.palette.brightText : - control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText + opacity: enabled || control.highlighted || control.checked ? 1 : 0.3 + color: control.checked || control.highlighted ? Default.textLightColor : (control.visualFocus ? Default.focusColor : (control.down ? Default.textDarkColor : Default.textColor)) + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight } background: Rectangle { @@ -73,9 +66,10 @@ radius: control.radius opacity: enabled ? 1 : 0.3 visible: !control.flat || control.down || control.checked || control.highlighted - color: Color.blend(control.checked || control.highlighted ? control.palette.dark : control.palette.button, - control.palette.mid, control.down ? 0.5 : 0.0) - border.color: control.palette.highlight + color: control.checked || control.highlighted ? + (control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : Default.focusColor) : (control.down ? Default.buttonCheckedPressedColor : Default.buttonCheckedColor)) : + (control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor)) + border.color: Default.focusColor border.width: control.visualFocus ? 2 : 0 } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ScrollBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ScrollBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ScrollBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ScrollBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.ScrollBar { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) padding: 2 visible: control.policy !== T.ScrollBar.AlwaysOff @@ -55,7 +55,7 @@ implicitHeight: control.interactive ? 6 : 2 radius: width / 2 - color: control.pressed ? control.palette.dark : control.palette.mid + color: control.pressed ? Default.scrollBarPressedColor : Default.scrollBarColor opacity: 0.0 states: State { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ScrollIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ScrollIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ScrollIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ScrollIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.ScrollIndicator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) padding: 2 @@ -53,7 +53,7 @@ implicitWidth: 2 implicitHeight: 2 - color: control.palette.mid + color: Default.scrollBarColor visible: control.size < 1.0 opacity: 0.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ScrollView.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ScrollView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ScrollView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ScrollView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,19 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.ScrollView { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : -1) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : -1) ScrollBar.vertical: ScrollBar { parent: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Slider.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,50 +34,49 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.Slider { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitHandleWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitHandleHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + (handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 handle: Rectangle { - x: control.leftPadding + (control.horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) + x: control.leftPadding + (horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) implicitWidth: 28 implicitHeight: 28 radius: width / 2 - color: control.pressed ? control.palette.light : control.palette.window + color: control.enabled ? (control.pressed + ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor) + : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor border.width: control.visualFocus ? 2 : 1 - border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight + border.color: control.enabled ? (control.visualFocus + ? Default.focusColor + : (control.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor + + readonly property bool horizontal: control.orientation === Qt.Horizontal } background: Rectangle { - x: control.leftPadding + (control.horizontal ? 0 : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0) - implicitWidth: control.horizontal ? 200 : 6 - implicitHeight: control.horizontal ? 6 : 200 - width: control.horizontal ? control.availableWidth : implicitWidth - height: control.horizontal ? implicitHeight : control.availableHeight + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + implicitWidth: horizontal ? 200 : 6 + implicitHeight: horizontal ? 6 : 200 + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.availableHeight radius: 3 - color: control.palette.midlight - scale: control.horizontal && control.mirrored ? -1 : 1 + color: Default.buttonColor + scale: horizontal && control.mirrored ? -1 : 1 - Rectangle { - y: control.horizontal ? 0 : control.visualPosition * parent.height - width: control.horizontal ? control.position * parent.width : 6 - height: control.horizontal ? 6 : control.position * parent.height - - radius: 3 - color: control.palette.dark - } + readonly property bool horizontal: control.orientation === Qt.Horizontal } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/SpinBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/SpinBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/SpinBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/SpinBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,22 +34,23 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.SpinBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + 2 * padding + - up.implicitIndicatorWidth + - down.implicitIndicatorWidth) - implicitHeight: Math.max(implicitContentHeight + topPadding + bottomPadding, - implicitBackgroundHeight, - up.implicitIndicatorHeight, - down.implicitIndicatorHeight) + (up.indicator ? up.indicator.implicitWidth : 0) + + (down.indicator ? down.indicator.implicitWidth : 0)) + implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + up.indicator ? up.indicator.implicitHeight : 0, + down.indicator ? down.indicator.implicitHeight : 0) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 leftPadding: padding + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) @@ -63,12 +64,13 @@ contentItem: TextInput { z: 2 - text: control.displayText + text: control.textFromValue(control.value, control.locale) + opacity: control.enabled ? 1 : 0.3 font: control.font - color: control.palette.text - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText + color: Default.textColor + selectionColor: Default.focusColor + selectedTextColor: Default.textLightColor horizontalAlignment: Qt.AlignHCenter verticalAlignment: Qt.AlignVCenter @@ -83,7 +85,7 @@ height: control.height visible: control.activeFocus color: "transparent" - border.color: control.palette.highlight + border.color: Default.focusColor border.width: 2 } } @@ -93,21 +95,21 @@ height: parent.height implicitWidth: 40 implicitHeight: 40 - color: up.pressed ? control.palette.mid : control.palette.button + color: up.pressed ? Default.buttonPressedColor : Default.buttonColor Rectangle { x: (parent.width - width) / 2 y: (parent.height - height) / 2 width: parent.width / 3 height: 2 - color: enabled ? control.palette.buttonText : control.palette.mid + color: enabled ? Default.textColor : Default.textDisabledColor } Rectangle { x: (parent.width - width) / 2 y: (parent.height - height) / 2 width: 2 height: parent.width / 3 - color: enabled ? control.palette.buttonText : control.palette.mid + color: enabled ? Default.textColor : Default.textDisabledColor } } @@ -116,20 +118,19 @@ height: parent.height implicitWidth: 40 implicitHeight: 40 - color: down.pressed ? control.palette.mid : control.palette.button + color: down.pressed ? Default.buttonPressedColor : Default.buttonColor Rectangle { x: (parent.width - width) / 2 y: (parent.height - height) / 2 width: parent.width / 3 height: 2 - color: enabled ? control.palette.buttonText : control.palette.mid + color: enabled ? Default.textColor : Default.textDisabledColor } } background: Rectangle { implicitWidth: 140 - color: enabled ? control.palette.base : control.palette.button - border.color: control.palette.button + border.color: Default.buttonColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/StackView.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/StackView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/StackView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/StackView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Templates 2.2 as T T.StackView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/SwipeDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/SwipeDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/SwipeDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/SwipeDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,45 +34,40 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.SwipeDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 12 spacing: 12 - icon.width: 24 - icon.height: 24 - icon.color: control.palette.text - swipe.transition: Transition { SmoothedAnimation { velocity: 3; easing.type: Easing.InOutCubic } } - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft + contentItem: Text { + leftPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 + rightPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 - icon: control.icon text: control.text font: control.font - color: control.palette.text + color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } background: Rectangle { - implicitWidth: 100 - implicitHeight: 40 - color: Color.blend(control.down ? control.palette.midlight : control.palette.light, - control.palette.highlight, control.visualFocus ? 0.15 : 0.0) + color: control.visualFocus + ? (control.down ? Default.focusPressedColor : Default.delegateFocusColor) + : (control.down ? Default.delegatePressedColor : Default.backgroundColor) } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/SwipeView.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/SwipeView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/SwipeView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/SwipeView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,17 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Templates 2.2 as T T.SwipeView { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) contentItem: ListView { model: control.contentModel diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/SwitchDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/SwitchDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/SwitchDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/SwitchDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,76 +34,45 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 T.SwitchDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 12 spacing: 12 - icon.width: 24 - icon.height: 24 - icon.color: control.palette.text - - indicator: PaddedRectangle { - implicitWidth: 56 - implicitHeight: 28 - + indicator: SwitchIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - - radius: 8 - leftPadding: 0 - rightPadding: 0 - padding: (height - 16) / 2 - color: control.checked ? control.palette.dark : control.palette.midlight - - Rectangle { - x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2))) - y: (parent.height - height) / 2 - width: 28 - height: 28 - radius: 16 - color: control.down ? control.palette.light : control.palette.window - border.width: control.visualFocus ? 2 : 1 - border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight - - Behavior on x { - enabled: !control.down - SmoothedAnimation { velocity: 200 } - } - } + control: control } - contentItem: IconLabel { - leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0 - rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0 - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft + contentItem: Text { + leftPadding: control.indicator && !control.mirrored ? 0 : control.indicator.width + control.spacing + rightPadding: control.indicator && control.mirrored ? 0 : control.indicator.width + control.spacing - icon: control.icon text: control.text font: control.font - color: control.palette.text + color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } background: Rectangle { implicitWidth: 100 implicitHeight: 40 visible: control.down || control.highlighted - color: control.down ? control.palette.midlight : control.palette.light + color: control.down ? Default.delegatePressedColor : Default.delegateColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/SwitchIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/SwitchIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/SwitchIndicator.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/SwitchIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,76 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 + +Item { + implicitWidth: 56 + implicitHeight: 28 + + property Item control + + Rectangle { + y: parent.height / 2 - height / 2 + width: 56 + height: 16 + radius: 8 + color: control.checked ? (control.visualFocus ? Default.focusColor : Default.buttonCheckedColor) : Default.buttonColor + border.width: control.visualFocus ? 2 : 0 + border.color: Default.focusColor + } + + Rectangle { + x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2))) + y: (parent.height - height) / 2 + width: 28 + height: 28 + radius: 16 + color: control.enabled ? (control.down + ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor) + : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor + border.width: control.visualFocus ? 2 : 1 + border.color: control.enabled ? (control.visualFocus + ? Default.focusColor + : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor + + Behavior on x { + enabled: !control.down + SmoothedAnimation { velocity: 200 } + } + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Switch.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,59 +34,38 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 T.Switch { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 spacing: 6 - indicator: PaddedRectangle { - implicitWidth: 56 - implicitHeight: 28 - + indicator: SwitchIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - - radius: 8 - leftPadding: 0 - rightPadding: 0 - padding: (height - 16) / 2 - color: control.checked ? control.palette.dark : control.palette.midlight - - Rectangle { - x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2))) - y: (parent.height - height) / 2 - width: 28 - height: 28 - radius: 16 - color: control.down ? control.palette.light : control.palette.window - border.width: control.visualFocus ? 2 : 1 - border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight - - Behavior on x { - enabled: !control.down - SmoothedAnimation { velocity: 200 } - } - } + control: control } - contentItem: CheckLabel { + contentItem: Text { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 text: control.text font: control.font - color: control.palette.windowText + color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/TabBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/TabBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/TabBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/TabBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,19 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TabBar { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) spacing: 1 + contentHeight: 40 contentItem: ListView { model: control.contentModel @@ -63,7 +64,5 @@ preferredHighlightEnd: width - 40 } - background: Rectangle { - color: control.palette.window - } + background: Rectangle { } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/TabButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/TabButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/TabButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/TabButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,40 +34,36 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.TabButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 - spacing: 6 - icon.width: 24 - icon.height: 24 - icon.color: checked ? control.palette.windowText : control.palette.brightText - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font - color: checked ? control.palette.windowText : control.palette.brightText + elide: Text.ElideRight + opacity: enabled ? 1 : 0.3 + color: !control.checked ? Default.textLightColor : control.down ? Default.textDarkColor : Default.textColor + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter } background: Rectangle { implicitHeight: 40 - color: Color.blend(control.checked ? control.palette.window : control.palette.dark, - control.palette.mid, control.down ? 0.5 : 0.0) + color: control.down + ? (control.checked ? Default.tabButtonCheckedPressedColor : Default.tabButtonPressedColor) + : (control.checked ? "transparent" : Default.tabButtonColor) } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/TextArea.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/TextArea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/TextArea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/TextArea.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,28 +34,27 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.TextArea { id: control implicitWidth: Math.max(contentWidth + leftPadding + rightPadding, - implicitBackgroundWidth + leftInset + rightInset, + background ? background.implicitWidth : 0, placeholder.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, - implicitBackgroundHeight + topInset + bottomInset, + background ? background.implicitHeight : 0, placeholder.implicitHeight + topPadding + bottomPadding) padding: 6 leftPadding: padding + 4 - color: control.palette.text - placeholderTextColor: Color.transparent(control.color, 0.5) - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText + color: enabled ? Default.textColor : Default.textDisabledLightColor + selectionColor: Default.textSelectionColor + selectedTextColor: color PlaceholderText { id: placeholder @@ -66,10 +65,9 @@ text: control.placeholderText font: control.font - color: control.placeholderTextColor + color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight - renderType: control.renderType } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/TextField.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/TextField.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/TextField.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/TextField.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,27 +34,27 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.TextField { id: control - implicitWidth: implicitBackgroundWidth + leftInset + rightInset - || Math.max(contentWidth, placeholder.implicitWidth) + leftPadding + rightPadding - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding, + implicitWidth: Math.max(background ? background.implicitWidth : 0, + placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding : 0) + || contentWidth + leftPadding + rightPadding + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, placeholder.implicitHeight + topPadding + bottomPadding) padding: 6 leftPadding: padding + 4 - color: control.palette.text - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText - placeholderTextColor: Color.transparent(control.color, 0.5) + color: enabled ? Default.textColor : Default.textDisabledColor + selectionColor: Default.textSelectionColor + selectedTextColor: color verticalAlignment: TextInput.AlignVCenter PlaceholderText { @@ -66,18 +66,17 @@ text: control.placeholderText font: control.font - color: control.placeholderTextColor + color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight - renderType: control.renderType } background: Rectangle { implicitWidth: 200 implicitHeight: 40 border.width: control.activeFocus ? 2 : 1 - color: control.palette.base - border.color: control.activeFocus ? control.palette.highlight : control.palette.mid + color: control.enabled ? Default.backgroundColor : Default.indicatorFrameDisabledColor + border.color: control.activeFocus ? Default.focusColor : (control.enabled ? Default.disabledLightColor : "transparent") } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ToolBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ToolBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,21 +34,22 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.ToolBar { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) background: Rectangle { implicitHeight: 40 - color: control.palette.button + color: Default.delegateColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ToolButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ToolButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ToolButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ToolButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,42 +34,37 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.ToolButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 - spacing: 6 - icon.width: 24 - icon.height: 24 - icon.color: visualFocus ? control.palette.highlight : control.palette.buttonText - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font - color: control.visualFocus ? control.palette.highlight : control.palette.buttonText + color: control.enabled ? (control.visualFocus ? Default.focusColor : Default.textDarkColor) : Default.textDisabledLightColor + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter } background: Rectangle { implicitWidth: 40 implicitHeight: 40 - opacity: control.down ? 1.0 : 0.5 - color: control.down || control.checked || control.highlighted ? control.palette.mid : control.palette.button + color: Qt.darker(Default.toolButtonColor, control.enabled && (control.checked || control.highlighted) ? 1.5 : 1.0) + opacity: control.down ? 1.0 : control.enabled && (control.checked || control.highlighted) ? 0.5 : 0 + visible: control.down || (control.enabled && (control.checked || control.highlighted)) } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ToolSeparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ToolSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ToolSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ToolSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,25 +34,24 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.ToolSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) padding: vertical ? 6 : 2 - verticalPadding: vertical ? 2 : 6 + topPadding: vertical ? 2 : 6 + bottomPadding: vertical ? 2 : 6 contentItem: Rectangle { implicitWidth: vertical ? 1 : 30 implicitHeight: vertical ? 30 : 1 - color: control.palette.mid + color: Default.separatorColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ToolTip.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ToolTip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/ToolTip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/ToolTip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.ToolTip { id: control @@ -45,10 +45,10 @@ x: parent ? (parent.width - implicitWidth) / 2 : 0 y: -implicitHeight - 3 - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) margins: 6 padding: 6 @@ -58,12 +58,10 @@ contentItem: Text { text: control.text font: control.font - color: control.palette.toolTipText // TODO: wrapMode: Label.Wrap } background: Rectangle { - border.color: control.palette.dark - color: control.palette.toolTipBase + border.color: Default.frameDarkColor } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Tumbler.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/Tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/Tumbler.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,31 +34,26 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Templates 2.2 as T T.Tumbler { id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) || 60 // ### remove 60 in Qt 6 - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) || 200 // ### remove 200 in Qt 6 + implicitWidth: 60 + implicitHeight: 200 delegate: Text { text: modelData - color: control.visualFocus ? control.palette.highlight : control.palette.text + color: control.visualFocus ? Default.focusColor : Default.textDarkColor font: control.font - opacity: 1.0 - Math.abs(Tumbler.displacement) / (control.visibleItemCount / 2) + opacity: (1.0 - Math.abs(Tumbler.displacement) / (control.visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } contentItem: TumblerView { - implicitWidth: 60 - implicitHeight: 200 model: control.model delegate: control.delegate path: Path { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ApplicationWindow.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ApplicationWindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ApplicationWindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ApplicationWindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick 2.9 +import QtQuick.Window 2.3 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 +import QtQuick.Controls.Universal.impl 2.2 T.ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/BusyIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/BusyIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/BusyIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/BusyIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,16 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 +import QtQuick.Controls.Universal.impl 2.2 T.BusyIndicator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding + implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding contentItem: BusyIndicatorImpl { implicitWidth: 20 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Button.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,39 +34,34 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.Button { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 8 - verticalPadding: padding - 4 - spacing: 8 - - icon.width: 20 - icon.height: 20 - icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) + topPadding: padding - 4 + bottomPadding: padding - 4 property bool useSystemFocusVisuals: true - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font - color: Color.transparent(control.Universal.foreground, enabled ? 1.0 : 0.2) + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + + opacity: enabled ? 1.0 : 0.2 + color: control.Universal.foreground } background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/CheckBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,19 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 +import QtQuick.Controls.Universal.impl 2.2 T.CheckBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 spacing: 8 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/CheckDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/CheckDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/CheckDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/CheckDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,21 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 +import QtQuick.Controls.Universal.impl 2.2 T.CheckDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset spacing: 12 @@ -56,29 +55,23 @@ topPadding: padding - 1 bottomPadding: padding + 1 - icon.width: 20 - icon.height: 20 - icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) - indicator: CheckIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - contentItem: IconLabel { + contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon text: control.text font: control.font - color: Color.transparent(control.Universal.foreground, enabled ? 1.0 : 0.2) + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + + opacity: enabled ? 1.0 : 0.2 + color: control.Universal.foreground } background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/CheckIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/CheckIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/CheckIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/CheckIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,11 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 Rectangle { implicitWidth: 20 @@ -55,13 +53,14 @@ property Item control readonly property bool partiallyChecked: control.checkState === Qt.PartiallyChecked - ColorImage { + Image { x: (parent.width - width) / 2 y: (parent.height - height) / 2 visible: control.checkState === Qt.Checked - color: !control.enabled ? control.Universal.baseLowColor : control.Universal.chromeWhiteColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/checkmark.png" + source: "image://universal/checkmark/" + (!control.enabled ? control.Universal.baseLowColor : control.Universal.chromeWhiteColor) + sourceSize.width: width + sourceSize.height: height } Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ComboBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ComboBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ComboBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ComboBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,21 +34,21 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Window 2.3 +import QtQuick.Controls 2.2 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.ComboBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) @@ -58,16 +58,16 @@ delegate: ItemDelegate { width: parent.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData - font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal highlighted: control.highlightedIndex === index hoverEnabled: control.hoverEnabled } - indicator: ColorImage { + indicator: Image { x: control.mirrored ? control.padding : control.width - width - control.padding y: control.topPadding + (control.availableHeight - height) / 2 - color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseMediumHighColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/downarrow.png" + source: "image://universal/downarrow/" + (!control.enabled ? control.Universal.baseLowColor : control.Universal.baseMediumHighColor) + sourceSize.width: width + sourceSize.height: height Rectangle { z: -1 @@ -144,6 +144,7 @@ implicitHeight: contentHeight model: control.delegateModel currentIndex: control.highlightedIndex + highlightRangeMode: ListView.ApplyRange highlightMoveDuration: 0 T.ScrollIndicator.vertical: ScrollIndicator { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/DelayButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/DelayButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/DelayButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/DelayButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,22 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.DelayButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 8 - verticalPadding: padding - 4 + topPadding: padding - 4 + bottomPadding: padding - 4 property bool useSystemFocusVisuals: true diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/DialogButtonBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/DialogButtonBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/DialogButtonBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/DialogButtonBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,19 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.Universal 2.2 T.DialogButtonBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - (control.count === 1 ? implicitContentWidth * 2 : implicitContentWidth) + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - contentWidth: contentItem.contentWidth + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) spacing: 4 padding: 24 @@ -59,6 +58,9 @@ } contentItem: ListView { + implicitWidth: contentWidth + implicitHeight: 32 + model: control.contentModel spacing: control.spacing orientation: ListView.Horizontal diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Dialog.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,25 +34,29 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.Universal 2.2 T.Dialog { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitHeaderWidth, - implicitFooterWidth) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding - + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) - + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + header && header.visible ? header.implicitWidth : 0, + footer && footer.visible ? footer.implicitWidth : 0, + contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + (header && header.visible ? header.implicitHeight + spacing : 0) + + (footer && footer.visible ? footer.implicitHeight + spacing : 0) + + (contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 24 - verticalPadding: 18 + topPadding: 18 + bottomPadding: 18 background: Rectangle { color: control.Universal.chromeMediumLowColor @@ -80,12 +84,4 @@ footer: DialogButtonBox { visible: count > 0 } - - T.Overlay.modal: Rectangle { - color: control.Universal.baseLowColor - } - - T.Overlay.modeless: Rectangle { - color: control.Universal.baseLowColor - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Dial.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Dial.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,22 +34,17 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.Dial { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) || 100 // ### remove 100 in Qt 6 - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) || 100 // ### remove 100 in Qt 6 + implicitWidth: 100 + implicitHeight: 100 background: Rectangle { - implicitWidth: 100 - implicitHeight: 100 - x: control.width / 2 - width / 2 y: control.height / 2 - height / 2 width: Math.max(64, Math.min(control.width, control.height)) @@ -61,8 +56,8 @@ } handle: Rectangle { - implicitWidth: 14 - implicitHeight: 14 + implicitWidth: 20 + implicitHeight: 20 x: background.x + background.width / 2 - handle.width / 2 y: background.y + background.height / 2 - handle.height / 2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Drawer.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,19 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.Drawer { id: control - parent: T.Overlay.overlay + parent: T.ApplicationWindow.overlay - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) topPadding: control.edge === Qt.BottomEdge leftPadding: control.edge === Qt.RightEdge @@ -67,12 +68,4 @@ y: control.edge === Qt.TopEdge ? parent.height - 1 : 0 } } - - T.Overlay.modal: Rectangle { - color: control.Universal.baseLowColor - } - - T.Overlay.modeless: Rectangle { - color: control.Universal.baseLowColor - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Frame.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.Frame { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 12 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/GroupBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/GroupBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/GroupBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/GroupBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,22 +34,24 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.GroupBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitLabelWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + label ? label.implicitWidth + leftPadding + rightPadding : 0, + contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) spacing: 12 padding: 12 - topPadding: padding + (implicitLabelWidth > 0 ? implicitLabelHeight + spacing : 0) + topPadding: padding + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) label: Text { x: control.leftPadding @@ -65,9 +67,9 @@ } background: Rectangle { - y: control.topPadding - control.bottomPadding + y: control.topPadding - control.padding width: parent.width - height: parent.height - control.topPadding + control.bottomPadding + height: parent.height - control.topPadding + control.padding color: "transparent" border.color: control.Universal.chromeDisabledLowColor diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ItemDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ItemDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ItemDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ItemDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,19 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.ItemDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset spacing: 12 @@ -55,20 +54,17 @@ topPadding: padding - 1 bottomPadding: padding + 1 - icon.width: 20 - icon.height: 20 - icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft + contentItem: Text { + leftPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 + rightPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 - icon: control.icon text: control.text font: control.font - color: Color.transparent(control.Universal.foreground, enabled ? 1.0 : 0.2) + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + + opacity: enabled ? 1.0 : 0.2 + color: control.Universal.foreground } background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Label.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.Label { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/MenuBarItem.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/MenuBarItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/MenuBarItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/MenuBarItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 - -T.MenuBarItem { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) - - padding: 12 - topPadding: padding - 1 - bottomPadding: padding + 1 - spacing: 12 - - icon.width: 20 - icon.height: 20 - icon.color: !enabled ? Universal.baseLowColor : Universal.baseHighColor - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: Qt.AlignLeft - - icon: control.icon - text: control.text - font: control.font - color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor - } - - background: Rectangle { - implicitWidth: 40 - implicitHeight: 40 - - color: !control.enabled ? control.Universal.baseLowColor : - control.down ? control.Universal.listMediumColor : - control.highlighted ? control.Universal.listLowColor : "transparent" - - Rectangle { - x: 1; y: 1 - width: parent.width - 2 - height: parent.height - 2 - - visible: control.visualFocus - color: control.Universal.accent - opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6 - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/MenuBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/MenuBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/MenuBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/MenuBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 - -T.MenuBar { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) - - delegate: MenuBarItem { } - - contentItem: Row { - spacing: control.spacing - Repeater { - model: control.contentModel - } - } - - background: Rectangle { - implicitHeight: 40 - color: control.Universal.chromeMediumColor - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/MenuItem.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/MenuItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/MenuItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/MenuItem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,64 +34,44 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.MenuItem { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 12 topPadding: padding - 1 bottomPadding: padding + 1 spacing: 12 - icon.width: 20 - icon.height: 20 - icon.color: !enabled ? Universal.baseLowColor : Universal.baseHighColor - - contentItem: IconLabel { - readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0 - readonly property real indicatorPadding: control.checkable && control.indicator ? control.indicator.width + control.spacing : 0 - leftPadding: !control.mirrored ? indicatorPadding : arrowPadding - rightPadding: control.mirrored ? indicatorPadding : arrowPadding - - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: Qt.AlignLeft + contentItem: Text { + leftPadding: !control.mirrored ? control.indicator.width + control.spacing : 0 + rightPadding: control.mirrored ? control.indicator.width + control.spacing : 0 - icon: control.icon text: control.text font: control.font color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter } - arrow: ColorImage { - x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding - y: control.topPadding + (control.availableHeight - height) / 2 - - visible: control.subMenu - mirror: control.mirrored - color: !enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/rightarrow.png" - } - - indicator: ColorImage { + indicator: Image { x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 visible: control.checked - color: !control.enabled ? control.Universal.baseLowColor : control.down ? control.Universal.baseHighColor : control.Universal.baseMediumHighColor - source: !control.checkable ? "" : "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/checkmark.png" + source: !control.checkable ? "" : "image://universal/checkmark/" + (!control.enabled ? control.Universal.baseLowColor : control.down ? control.Universal.baseHighColor : control.Universal.baseMediumHighColor) + sourceSize.width: width + sourceSize.height: height } background: Rectangle { @@ -100,7 +80,7 @@ color: !control.enabled ? control.Universal.baseLowColor : control.down ? control.Universal.listMediumColor : - control.highlighted ? control.Universal.listLowColor : control.Universal.altMediumLowColor + control.hovered ? control.Universal.listLowColor : control.Universal.altMediumLowColor Rectangle { x: 1; y: 1 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Menu.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,31 +34,29 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Window 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.Menu { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding margins: 0 - overlap: 1 - - delegate: MenuItem { } contentItem: ListView { implicitHeight: contentHeight model: control.contentModel - interactive: Window.window ? contentHeight > Window.window.height : false + // TODO: improve this? + interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false clip: true - currentIndex: control.currentIndex + keyNavigationWraps: false + currentIndex: -1 ScrollIndicator.vertical: ScrollIndicator {} } @@ -70,12 +68,4 @@ border.color: control.Universal.chromeHighColor border.width: 1 // FlyoutBorderThemeThickness } - - T.Overlay.modal: Rectangle { - color: control.Universal.baseLowColor - } - - T.Overlay.modeless: Rectangle { - color: control.Universal.baseLowColor - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/MenuSeparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/MenuSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/MenuSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/MenuSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,15 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.MenuSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) padding: 12 topPadding: 9 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/PageIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,17 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.PageIndicator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) padding: 6 spacing: 7 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Page.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Page.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,21 +34,24 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.Page { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding, - implicitHeaderWidth, - implicitFooterWidth) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(contentWidth, + header && header.visible ? header.implicitWidth : 0, + footer && footer.visible ? footer.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding - + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) - + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) + + (header && header.visible ? header.implicitHeight + spacing : 0) + + (footer && footer.visible ? footer.implicitHeight + spacing : 0)) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) background: Rectangle { color: control.Universal.background diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Pane.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.Pane { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 12 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/plugins.qmltypes qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/plugins.qmltypes --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/plugins.qmltypes 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/plugins.qmltypes 2018-03-21 07:59:29.000000000 +0000 @@ -4,14 +4,14 @@ // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Controls.Universal 2.3' +// 'qmlplugindump -nonrelocatable QtQuick.Controls.Universal 2.0' Module { dependencies: [] - Component { name: "QQuickAttachedObject"; prototype: "QObject" } + Component { name: "QQuickStyle"; prototype: "QObject" } Component { name: "QQuickUniversalStyle" - prototype: "QQuickAttachedObject" + prototype: "QQuickStyle" exports: ["QtQuick.Controls.Universal/Universal 2.0"] isCreatable: false exportMetaObjectRevisions: [0] @@ -19,8 +19,7 @@ name: "Theme" values: { "Light": 0, - "Dark": 1, - "System": 2 + "Dark": 1 } } Enum { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Popup.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.Popup { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) padding: 12 @@ -53,12 +56,4 @@ border.color: control.Universal.chromeHighColor border.width: 1 // FlyoutBorderThemeThickness } - - T.Overlay.modal: Rectangle { - color: control.Universal.baseLowColor - } - - T.Overlay.modeless: Rectangle { - color: control.Universal.baseLowColor - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ProgressBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ProgressBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ProgressBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ProgressBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 +import QtQuick.Controls.Universal.impl 2.2 T.ProgressBar { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) contentItem: ProgressBarImpl { implicitHeight: 10 @@ -59,7 +59,10 @@ background: Rectangle { implicitWidth: 100 implicitHeight: 10 - y: (control.height - height) / 2 + + x: control.leftPadding + y: control.topPadding + (control.availableHeight - height) / 2 + width: control.availableWidth height: 10 visible: !control.indeterminate diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qmldir qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qmldir --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qmldir 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qmldir 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ module QtQuick.Controls.Universal plugin qtquickcontrols2universalstyleplugin classname QtQuickControls2UniversalStylePlugin -depends QtQuick.Controls 2.5 +depends QtQuick.Controls 2.2 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalbusyindicator.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalbusyindicator.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalbusyindicator.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalbusyindicator.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -58,12 +58,12 @@ private: struct Phase { - Phase() = default; + Phase() : duration(0), from(0), to(0), curve(QEasingCurve::Linear) { } Phase(int d, qreal f, qreal t, QEasingCurve::Type c) : duration(d), from(f), to(t), curve(c) { } - int duration = 0; - qreal from = 0; - qreal to = 0; - QEasingCurve curve = QEasingCurve::Linear; + int duration; + qreal from; + qreal to; + QEasingCurve curve; }; Phase m_phases[PhaseCount]; @@ -186,7 +186,7 @@ } QQuickUniversalBusyIndicator::QQuickUniversalBusyIndicator(QQuickItem *parent) - : QQuickItem(parent) + : QQuickItem(parent), m_count(5), m_elapsed(0), m_color(Qt::black) { setFlag(ItemHasContents); } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalbusyindicator_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalbusyindicator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalbusyindicator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalbusyindicator_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -75,9 +75,9 @@ QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: - int m_count = 5; - int m_elapsed = 0; - QColor m_color = Qt::black; + int m_count; + int m_elapsed; + QColor m_color; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalprogressbar.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalprogressbar.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalprogressbar.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalprogressbar.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -67,20 +67,21 @@ private: struct Phase { - Phase() = default; + Phase() : duration(0), from(0), to(0) { } Phase(int d, qreal f, qreal t) : duration(d), from(f), to(t) { } - int duration = 0; - qreal from = 0; - qreal to = 0; + int duration; + qreal from; + qreal to; }; - bool m_indeterminate = false; + bool m_indeterminate; Phase m_borderPhases[PhaseCount]; Phase m_ellipsePhases[PhaseCount]; }; QQuickUniversalProgressBarNode::QQuickUniversalProgressBarNode(QQuickUniversalProgressBar *item) - : QQuickAnimatedNode(item) + : QQuickAnimatedNode(item), + m_indeterminate(false) { setLoopCount(Infinite); setDuration(TotalDuration); @@ -266,7 +267,7 @@ } QQuickUniversalProgressBar::QQuickUniversalProgressBar(QQuickItem *parent) - : QQuickItem(parent) + : QQuickItem(parent), m_color(Qt::black), m_progress(0.0), m_indeterminate(false) { setFlag(ItemHasContents); } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalprogressbar_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalprogressbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalprogressbar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalprogressbar_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -77,9 +77,9 @@ QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: - QColor m_color = Qt::black; - qreal m_progress = 0.0; - bool m_indeterminate = false; + QColor m_color; + qreal m_progress; + bool m_indeterminate; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalstyle.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalstyle.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalstyle.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalstyle.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -39,7 +39,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE @@ -132,10 +132,12 @@ return colors[accent]; } +extern bool qt_is_dark_system_theme(); + static QQuickUniversalStyle::Theme qquickuniversal_effective_theme(QQuickUniversalStyle::Theme theme) { if (theme == QQuickUniversalStyle::System) - theme = QQuickStylePrivate::isDarkSystemTheme() ? QQuickUniversalStyle::Dark : QQuickUniversalStyle::Light; + theme = qt_is_dark_system_theme() ? QQuickUniversalStyle::Dark : QQuickUniversalStyle::Light; return theme; } @@ -151,7 +153,8 @@ static bool HasGlobalForeground = false; static bool HasGlobalBackground = false; -QQuickUniversalStyle::QQuickUniversalStyle(QObject *parent) : QQuickAttachedObject(parent), +QQuickUniversalStyle::QQuickUniversalStyle(QObject *parent) : QQuickStyleAttached(parent), + m_explicitTheme(false), m_explicitAccent(false), m_explicitForeground(false), m_explicitBackground(false), m_hasForeground(HasGlobalForeground), m_hasBackground(HasGlobalBackground), m_theme(GlobalTheme), m_accent(GlobalAccent), m_foreground(GlobalForeground), m_background(GlobalBackground) { @@ -198,8 +201,8 @@ void QQuickUniversalStyle::propagateTheme() { - const auto styles = attachedChildren(); - for (QQuickAttachedObject *child : styles) { + const auto styles = childStyles(); + for (QQuickStyleAttached *child : styles) { QQuickUniversalStyle *universal = qobject_cast(child); if (universal) universal->inheritTheme(m_theme); @@ -212,7 +215,7 @@ return; m_explicitTheme = false; - QQuickUniversalStyle *universal = qobject_cast(attachedParent()); + QQuickUniversalStyle *universal = qobject_cast(parentStyle()); inheritTheme(universal ? universal->theme() : GlobalTheme); } @@ -248,8 +251,8 @@ void QQuickUniversalStyle::propagateAccent() { - const auto styles = attachedChildren(); - for (QQuickAttachedObject *child : styles) { + const auto styles = childStyles(); + for (QQuickStyleAttached *child : styles) { QQuickUniversalStyle *universal = qobject_cast(child); if (universal) universal->inheritAccent(m_accent); @@ -262,7 +265,7 @@ return; m_explicitAccent = false; - QQuickUniversalStyle *universal = qobject_cast(attachedParent()); + QQuickUniversalStyle *universal = qobject_cast(parentStyle()); inheritAccent(universal ? universal->m_accent : GlobalAccent); } @@ -302,8 +305,8 @@ void QQuickUniversalStyle::propagateForeground() { - const auto styles = attachedChildren(); - for (QQuickAttachedObject *child : styles) { + const auto styles = childStyles(); + for (QQuickStyleAttached *child : styles) { QQuickUniversalStyle *universal = qobject_cast(child); if (universal) universal->inheritForeground(m_foreground, m_hasForeground); @@ -317,7 +320,7 @@ m_hasForeground = false; m_explicitForeground = false; - QQuickUniversalStyle *universal = qobject_cast(attachedParent()); + QQuickUniversalStyle *universal = qobject_cast(parentStyle()); inheritForeground(universal ? universal->m_foreground : GlobalForeground, universal ? universal->m_hasForeground : false); } @@ -357,8 +360,8 @@ void QQuickUniversalStyle::propagateBackground() { - const auto styles = attachedChildren(); - for (QQuickAttachedObject *child : styles) { + const auto styles = childStyles(); + for (QQuickStyleAttached *child : styles) { QQuickUniversalStyle *universal = qobject_cast(child); if (universal) universal->inheritBackground(m_background, m_hasBackground); @@ -372,7 +375,7 @@ m_hasBackground = false; m_explicitBackground = false; - QQuickUniversalStyle *universal = qobject_cast(attachedParent()); + QQuickUniversalStyle *universal = qobject_cast(parentStyle()); inheritBackground(universal ? universal->m_background : GlobalBackground, universal ? universal->m_hasBackground : false); } @@ -506,7 +509,7 @@ return QColor::fromRgba(m_theme == QQuickUniversalStyle::Dark ? qquickuniversal_dark_color(role) : qquickuniversal_light_color(role)); } -void QQuickUniversalStyle::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) +void QQuickUniversalStyle::parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent) { Q_UNUSED(oldParent); QQuickUniversalStyle *universal = qobject_cast(newParent); @@ -535,59 +538,66 @@ return value; } -void QQuickUniversalStyle::initGlobals() +void QQuickUniversalStyle::init() { - QSharedPointer settings = QQuickStylePrivate::settings(QStringLiteral("Universal")); - - bool ok = false; - QByteArray themeValue = resolveSetting("QT_QUICK_CONTROLS_UNIVERSAL_THEME", settings, QStringLiteral("Theme")); - Theme themeEnum = toEnumValue(themeValue, &ok); - if (ok) - GlobalTheme = qquickuniversal_effective_theme(themeEnum); - else if (!themeValue.isEmpty()) - qWarning().nospace().noquote() << "Universal: unknown theme value: " << themeValue; - - QByteArray accentValue = resolveSetting("QT_QUICK_CONTROLS_UNIVERSAL_ACCENT", settings, QStringLiteral("Accent")); - Color accentEnum = toEnumValue(accentValue, &ok); - if (ok) { - GlobalAccent = qquickuniversal_accent_color(accentEnum); - } else if (!accentValue.isEmpty()) { - QColor color(accentValue.constData()); - if (color.isValid()) - GlobalAccent = color.rgba(); - else - qWarning().nospace().noquote() << "Universal: unknown accent value: " << accentValue; - } + static bool globalsInitialized = false; + if (!globalsInitialized) { + QSharedPointer settings = QQuickStyleAttached::settings(QStringLiteral("Universal")); + + bool ok = false; + QByteArray themeValue = resolveSetting("QT_QUICK_CONTROLS_UNIVERSAL_THEME", settings, QStringLiteral("Theme")); + Theme themeEnum = toEnumValue(themeValue, &ok); + if (ok) + GlobalTheme = m_theme = qquickuniversal_effective_theme(themeEnum); + else if (!themeValue.isEmpty()) + qWarning().nospace().noquote() << "Universal: unknown theme value: " << themeValue; + + QByteArray accentValue = resolveSetting("QT_QUICK_CONTROLS_UNIVERSAL_ACCENT", settings, QStringLiteral("Accent")); + Color accentEnum = toEnumValue(accentValue, &ok); + if (ok) { + GlobalAccent = m_accent = qquickuniversal_accent_color(accentEnum); + } else if (!accentValue.isEmpty()) { + QColor color(accentValue.constData()); + if (color.isValid()) + GlobalAccent = m_accent = color.rgba(); + else + qWarning().nospace().noquote() << "Universal: unknown accent value: " << accentValue; + } - QByteArray foregroundValue = resolveSetting("QT_QUICK_CONTROLS_UNIVERSAL_FOREGROUND", settings, QStringLiteral("Foreground")); - Color foregroundEnum = toEnumValue(foregroundValue, &ok); - if (ok) { - GlobalForeground = qquickuniversal_accent_color(foregroundEnum); - HasGlobalForeground = true; - } else if (!foregroundValue.isEmpty()) { - QColor color(foregroundValue.constData()); - if (color.isValid()) { - GlobalForeground = color.rgba(); - HasGlobalForeground = true; - } else { - qWarning().nospace().noquote() << "Universal: unknown foreground value: " << foregroundValue; + QByteArray foregroundValue = resolveSetting("QT_QUICK_CONTROLS_UNIVERSAL_FOREGROUND", settings, QStringLiteral("Foreground")); + Color foregroundEnum = toEnumValue(foregroundValue, &ok); + if (ok) { + GlobalForeground = m_foreground = qquickuniversal_accent_color(foregroundEnum); + HasGlobalForeground = m_hasForeground = true; + } else if (!foregroundValue.isEmpty()) { + QColor color(foregroundValue.constData()); + if (color.isValid()) { + GlobalForeground = m_foreground = color.rgba(); + HasGlobalForeground = m_hasForeground = true; + } else { + qWarning().nospace().noquote() << "Universal: unknown foreground value: " << foregroundValue; + } } - } - QByteArray backgroundValue = resolveSetting("QT_QUICK_CONTROLS_UNIVERSAL_BACKGROUND", settings, QStringLiteral("Background")); - Color backgroundEnum = toEnumValue(backgroundValue, &ok); - if (ok) { - GlobalBackground = qquickuniversal_accent_color(backgroundEnum); - HasGlobalBackground = true; - } else if (!backgroundValue.isEmpty()) { - QColor color(backgroundValue.constData()); - if (color.isValid()) { - GlobalBackground = color.rgba(); - HasGlobalBackground = true; - } else { - qWarning().nospace().noquote() << "Universal: unknown background value: " << backgroundValue; + QByteArray backgroundValue = resolveSetting("QT_QUICK_CONTROLS_UNIVERSAL_BACKGROUND", settings, QStringLiteral("Background")); + Color backgroundEnum = toEnumValue(backgroundValue, &ok); + if (ok) { + GlobalBackground = m_background = qquickuniversal_accent_color(backgroundEnum); + HasGlobalBackground = m_hasBackground = true; + } else if (!backgroundValue.isEmpty()) { + QColor color(backgroundValue.constData()); + if (color.isValid()) { + GlobalBackground = m_background = color.rgba(); + HasGlobalBackground = m_hasBackground = true; + } else { + qWarning().nospace().noquote() << "Universal: unknown background value: " << backgroundValue; + } } + + globalsInitialized = true; } + + QQuickStyleAttached::init(); // TODO: lazy init? } bool QQuickUniversalStyle::variantToRgba(const QVariant &var, const char *name, QRgb *rgba) const diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalstyle_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalstyle_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversalstyle_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversalstyle_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -49,13 +49,13 @@ // #include -#include +#include QT_BEGIN_NAMESPACE class QQuickUniversalStylePrivate; -class QQuickUniversalStyle : public QQuickAttachedObject +class QQuickUniversalStyle : public QQuickStyleAttached { Q_OBJECT Q_PROPERTY(Theme theme READ theme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL) @@ -200,8 +200,6 @@ QColor systemColor(SystemColor role) const; - static void initGlobals(); - Q_SIGNALS: void themeChanged(); void accentChanged(); @@ -210,28 +208,29 @@ void paletteChanged(); protected: - void attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) override; + void parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent) override; private: + void init(); bool variantToRgba(const QVariant &var, const char *name, QRgb *rgba) const; // These reflect whether a color value was explicitly set on the specific // item that this attached style object represents. - bool m_explicitTheme = false; - bool m_explicitAccent = false; - bool m_explicitForeground = false; - bool m_explicitBackground = false; + bool m_explicitTheme; + bool m_explicitAccent; + bool m_explicitForeground; + bool m_explicitBackground; // These will be true when this item has an explicit or inherited foreground/background // color, or these colors were declared globally via settings (e.g. conf or env vars). // Some color properties of the style will return different values depending on whether // or not these are set. - bool m_hasForeground = false; - bool m_hasBackground = false; + bool m_hasForeground; + bool m_hasBackground; // The actual values for this item, whether explicit, inherited or globally set. - Theme m_theme = Light; - QRgb m_accent = Qt::blue; - QRgb m_foreground = Qt::black; - QRgb m_background = Qt::white; + QQuickUniversalStyle::Theme m_theme; + QRgb m_accent; + QRgb m_foreground; + QRgb m_background; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversaltheme.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversaltheme.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversaltheme.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversaltheme.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -36,17 +36,14 @@ #include "qquickuniversaltheme_p.h" +#include #include -#include QT_BEGIN_NAMESPACE -void QQuickUniversalTheme::initialize(QQuickTheme *theme) +QQuickUniversalTheme::QQuickUniversalTheme(QPlatformTheme *theme) + : QQuickProxyTheme(theme) { - QFont systemFont; - QFont groupBoxTitleFont; - QFont tabButtonFont; - const QFont font(QLatin1String("Segoe UI")); if (QFontInfo(font).family() == QLatin1String("Segoe UI")) { const QString family = font.family(); @@ -56,15 +53,24 @@ } systemFont.setPixelSize(15); - theme->setFont(QQuickTheme::System, systemFont); groupBoxTitleFont.setPixelSize(15); groupBoxTitleFont.setWeight(QFont::DemiBold); - theme->setFont(QQuickTheme::GroupBox, groupBoxTitleFont); tabButtonFont.setPixelSize(24); tabButtonFont.setWeight(QFont::Light); - theme->setFont(QQuickTheme::TabBar, tabButtonFont); +} + +const QFont *QQuickUniversalTheme::font(QPlatformTheme::Font type) const +{ + switch (type) { + case QPlatformTheme::GroupBoxTitleFont: + return &groupBoxTitleFont; + case QPlatformTheme::TabButtonFont: + return &tabButtonFont; + default: + return &systemFont; + } } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversaltheme_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversaltheme_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qquickuniversaltheme_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qquickuniversaltheme_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,16 +48,22 @@ // We mean it. // -#include +#include +#include QT_BEGIN_NAMESPACE -class QQuickTheme; - -class QQuickUniversalTheme +class QQuickUniversalTheme : public QQuickProxyTheme { public: - static void initialize(QQuickTheme *theme); + explicit QQuickUniversalTheme(QPlatformTheme *theme = nullptr); + + const QFont *font(Font type = SystemFont) const override; + +private: + QFont systemFont; + QFont groupBoxTitleFont; + QFont tabButtonFont; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -42,6 +42,16 @@ #include "qquickuniversalstyle_p.h" #include "qquickuniversaltheme_p.h" +#include + +static inline void initResources() +{ + Q_INIT_RESOURCE(qtquickcontrols2universalstyleplugin); +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtQuick_Controls_2_Universal); +#endif +} + QT_BEGIN_NAMESPACE class QtQuickControls2UniversalStylePlugin: public QQuickStylePlugin @@ -53,41 +63,49 @@ QtQuickControls2UniversalStylePlugin(QObject *parent = nullptr); void registerTypes(const char *uri) override; + void initializeEngine(QQmlEngine *engine, const char *uri) override; QString name() const override; - void initializeTheme(QQuickTheme *theme) override; + QQuickProxyTheme *createTheme() const override; }; QtQuickControls2UniversalStylePlugin::QtQuickControls2UniversalStylePlugin(QObject *parent) : QQuickStylePlugin(parent) { - QQuickUniversalStyle::initGlobals(); + initResources(); } void QtQuickControls2UniversalStylePlugin::registerTypes(const char *uri) { - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... + qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... qmlRegisterUncreatableType(uri, 2, 0, "Universal", tr("Universal is an attached property")); +} + +void QtQuickControls2UniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) +{ + QQuickStylePlugin::initializeEngine(engine, uri); + + engine->addImageProvider(name(), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/QtQuick/Controls.2/Universal/images"))); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... + qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... qmlRegisterType(import, 2, 0, "FocusRectangle"); qmlRegisterType(import, 2, 0, "BusyIndicatorImpl"); qmlRegisterType(import, 2, 0, "ProgressBarImpl"); - qmlRegisterType(resolvedUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); } QString QtQuickControls2UniversalStylePlugin::name() const { - return QStringLiteral("Universal"); + return QStringLiteral("universal"); } -void QtQuickControls2UniversalStylePlugin::initializeTheme(QQuickTheme *theme) +QQuickProxyTheme *QtQuickControls2UniversalStylePlugin::createTheme() const { - QQuickUniversalTheme::initialize(theme); + return new QQuickUniversalTheme; } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/RadioButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/RadioButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/RadioButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/RadioButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,19 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 +import QtQuick.Controls.Universal.impl 2.2 T.RadioButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 spacing: 8 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/RadioDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/RadioDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/RadioDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/RadioDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,21 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 +import QtQuick.Controls.Universal.impl 2.2 T.RadioDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset spacing: 12 @@ -56,29 +55,23 @@ topPadding: padding - 1 bottomPadding: padding + 1 - icon.width: 20 - icon.height: 20 - icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) - indicator: RadioIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - contentItem: IconLabel { + contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon text: control.text font: control.font - color: Color.transparent(control.Universal.foreground, enabled ? 1.0 : 0.2) + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + + opacity: enabled ? 1.0 : 0.2 + color: control.Universal.foreground } background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/RadioIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/RadioIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/RadioIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/RadioIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,8 +34,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Controls.Universal 2.2 Rectangle { implicitWidth: 20 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/RangeSlider.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/RangeSlider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/RangeSlider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/RangeSlider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,28 +34,30 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.RangeSlider { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - first.implicitHandleWidth + leftPadding + rightPadding, - second.implicitHandleWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - first.implicitHandleHeight + topPadding + bottomPadding, - second.implicitHandleHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + Math.max(first.handle ? first.handle.implicitWidth : 0, + second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(first.handle ? first.handle.implicitHeight : 0, + second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 first.handle: Rectangle { - implicitWidth: control.horizontal ? 8 : 24 - implicitHeight: control.horizontal ? 24 : 8 + implicitWidth: horizontal ? 8 : 24 + implicitHeight: horizontal ? 24 : 8 - x: control.leftPadding + (control.horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) + readonly property bool horizontal: control.orientation === Qt.Horizontal + + x: control.leftPadding + (horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) radius: 4 color: control.first.pressed ? control.Universal.chromeHighColor : @@ -64,11 +66,13 @@ } second.handle: Rectangle { - implicitWidth: control.horizontal ? 8 : 24 - implicitHeight: control.horizontal ? 24 : 8 + implicitWidth: horizontal ? 8 : 24 + implicitHeight: horizontal ? 24 : 8 + + readonly property bool horizontal: control.orientation === Qt.Horizontal - x: control.leftPadding + (control.horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) + x: control.leftPadding + (horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) radius: 4 color: control.second.pressed ? control.Universal.chromeHighColor : @@ -77,31 +81,33 @@ } background: Item { - implicitWidth: control.horizontal ? 200 : 18 - implicitHeight: control.horizontal ? 18 : 200 + implicitWidth: horizontal ? 200 : 18 + implicitHeight: horizontal ? 18 : 200 + + readonly property bool horizontal: control.orientation === Qt.Horizontal - x: control.leftPadding + (control.horizontal ? 0 : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0) - width: control.horizontal ? control.availableWidth : implicitWidth - height: control.horizontal ? implicitHeight : control.availableHeight + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.availableHeight - scale: control.horizontal && control.mirrored ? -1 : 1 + scale: horizontal && control.mirrored ? -1 : 1 Rectangle { - x: control.horizontal ? 0 : (parent.width - width) / 2 - y: control.horizontal ? (parent.height - height) / 2 : 0 - width: control.horizontal ? parent.width : 2 // SliderBackgroundThemeHeight - height: control.vertical ? parent.height : 2 // SliderBackgroundThemeHeight + x: parent.horizontal ? 0 : (parent.width - width) / 2 + y: parent.horizontal ? (parent.height - height) / 2 : 0 + width: parent.horizontal ? parent.width : 2 // SliderBackgroundThemeHeight + height: !parent.horizontal ? parent.height : 2 // SliderBackgroundThemeHeight color: control.hovered && !control.pressed ? control.Universal.baseMediumColor : control.enabled ? control.Universal.baseMediumLowColor : control.Universal.chromeDisabledHighColor } Rectangle { - x: control.horizontal ? control.first.position * parent.width : (parent.width - width) / 2 - y: control.horizontal ? (parent.height - height) / 2 : control.second.visualPosition * parent.height - width: control.horizontal ? control.second.position * parent.width - control.first.position * parent.width : 2 // SliderBackgroundThemeHeight - height: control.vertical ? control.second.position * parent.height - control.first.position * parent.height : 2 // SliderBackgroundThemeHeight + x: parent.horizontal ? control.first.position * parent.width : (parent.width - width) / 2 + y: parent.horizontal ? (parent.height - height) / 2 : control.second.visualPosition * parent.height + width: parent.horizontal ? control.second.position * parent.width - control.first.position * parent.width : 2 // SliderBackgroundThemeHeight + height: !parent.horizontal ? control.second.position * parent.height - control.first.position * parent.height : 2 // SliderBackgroundThemeHeight color: control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/RoundButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/RoundButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/RoundButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/RoundButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,38 +34,32 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.RoundButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 8 - spacing: 8 - - icon.width: 20 - icon.height: 20 - icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) property bool useSystemFocusVisuals: true - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font - color: Color.transparent(control.Universal.foreground, enabled ? 1.0 : 0.2) + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + + opacity: enabled ? 1.0 : 0.2 + color: control.Universal.foreground } background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ScrollBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ScrollBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ScrollBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ScrollBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,17 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.ScrollBar { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) visible: control.policy !== T.ScrollBar.AlwaysOff diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ScrollIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ScrollIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ScrollIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ScrollIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,17 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.ScrollIndicator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) contentItem: Rectangle { implicitWidth: 6 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Slider.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,28 +34,30 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.Slider { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitHandleWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitHandleHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + (handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + (handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 property bool useSystemFocusVisuals: true handle: Rectangle { - implicitWidth: control.horizontal ? 8 : 24 - implicitHeight: control.horizontal ? 24 : 8 + implicitWidth: horizontal ? 8 : 24 + implicitHeight: horizontal ? 24 : 8 - x: control.leftPadding + (control.horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) + readonly property bool horizontal: control.orientation === Qt.Horizontal + + x: control.leftPadding + (horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) radius: 4 color: control.pressed ? control.Universal.chromeHighColor : @@ -64,31 +66,33 @@ } background: Item { - implicitWidth: control.horizontal ? 200 : 18 - implicitHeight: control.horizontal ? 18 : 200 + implicitWidth: horizontal ? 200 : 18 + implicitHeight: horizontal ? 18 : 200 + + readonly property bool horizontal: control.orientation === Qt.Horizontal - x: control.leftPadding + (control.horizontal ? 0 : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0) - width: control.horizontal ? control.availableWidth : implicitWidth - height: control.horizontal ? implicitHeight : control.availableHeight + x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) + y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.availableHeight - scale: control.horizontal && control.mirrored ? -1 : 1 + scale: horizontal && control.mirrored ? -1 : 1 Rectangle { - x: control.horizontal ? 0 : (parent.width - width) / 2 - y: control.horizontal ? (parent.height - height) / 2 : 0 - width: control.horizontal ? parent.width : 2 // SliderTrackThemeHeight - height: !control.horizontal ? parent.height : 2 // SliderTrackThemeHeight + x: parent.horizontal ? 0 : (parent.width - width) / 2 + y: parent.horizontal ? (parent.height - height) / 2 : 0 + width: parent.horizontal ? parent.width : 2 // SliderTrackThemeHeight + height: !parent.horizontal ? parent.height : 2 // SliderTrackThemeHeight color: control.hovered && !control.pressed ? control.Universal.baseMediumColor : control.enabled ? control.Universal.baseMediumLowColor : control.Universal.chromeDisabledHighColor } Rectangle { - x: control.horizontal ? 0 : (parent.width - width) / 2 - y: control.horizontal ? (parent.height - height) / 2 : control.visualPosition * parent.height - width: control.horizontal ? control.position * parent.width : 2 // SliderTrackThemeHeight - height: !control.horizontal ? control.position * parent.height : 2 // SliderTrackThemeHeight + x: parent.horizontal ? 0 : (parent.width - width) / 2 + y: parent.horizontal ? (parent.height - height) / 2 : control.visualPosition * parent.height + width: parent.horizontal ? control.position * parent.width : 2 // SliderTrackThemeHeight + height: !parent.horizontal ? control.position * parent.height : 2 // SliderTrackThemeHeight color: control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/SpinBox.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/SpinBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/SpinBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/SpinBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,23 +34,22 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.SpinBox { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + 16 + - up.implicitIndicatorWidth + - down.implicitIndicatorWidth) - implicitHeight: Math.max(implicitContentHeight + topPadding + bottomPadding, - implicitBackgroundHeight, - up.implicitIndicatorHeight, - down.implicitIndicatorHeight) + (up.indicator ? up.indicator.implicitWidth : 0) + + (down.indicator ? down.indicator.implicitWidth : 0)) + implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + up.indicator ? up.indicator.implicitHeight : 0, + down.indicator ? down.indicator.implicitHeight : 0) + baselineOffset: contentItem.y + contentItem.baselineOffset // TextControlThemePadding + 2 (border) padding: 12 @@ -68,7 +67,7 @@ } contentItem: TextInput { - text: control.displayText + text: control.textFromValue(control.value, control.locale) font: control.font color: !enabled ? control.Universal.chromeDisabledLowColor : @@ -100,12 +99,14 @@ opacity: control.activeFocus && !control.up.pressed ? 0.4 : 1.0 } - ColorImage { + Image { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - color: !enabled ? control.Universal.chromeDisabledLowColor : - control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/" + (control.mirrored ? "left" : "right") + "arrow.png" + source: "image://universal/" + (control.mirrored ? "left" : "right") + "arrow/" + + (!enabled ? control.Universal.chromeDisabledLowColor : + control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor) + sourceSize.width: width + sourceSize.height: height } } @@ -126,12 +127,14 @@ opacity: control.activeFocus && !control.down.pressed ? 0.4 : 1.0 } - ColorImage { + Image { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - color: !enabled ? control.Universal.chromeDisabledLowColor : - control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/" + (control.mirrored ? "right" : "left") + "arrow.png" + source: "image://universal/" + (control.mirrored ? "right" : "left") + "arrow/" + + (!enabled ? control.Universal.chromeDisabledLowColor : + control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor) + sourceSize.width: width + sourceSize.height: height } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/StackView.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/StackView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/StackView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/StackView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.StackView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/SwipeDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/SwipeDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/SwipeDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/SwipeDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,19 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.SwipeDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset spacing: 12 @@ -55,22 +54,19 @@ topPadding: padding - 1 bottomPadding: padding + 1 - icon.width: 20 - icon.height: 20 - icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) - swipe.transition: Transition { SmoothedAnimation { velocity: 3; easing.type: Easing.InOutCubic } } - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft + contentItem: Text { + leftPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 + rightPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 - icon: control.icon text: control.text font: control.font - color: Color.transparent(control.Universal.foreground, enabled ? 1.0 : 0.2) + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + + opacity: enabled ? 1.0 : 0.2 + color: control.Universal.foreground } background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/SwitchDelegate.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/SwitchDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/SwitchDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/SwitchDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,21 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 +import QtQuick.Controls.Universal.impl 2.2 T.SwitchDelegate { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset spacing: 12 @@ -56,29 +55,23 @@ topPadding: padding - 1 bottomPadding: padding + 1 - icon.width: 20 - icon.height: 20 - icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) - indicator: SwitchIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - contentItem: IconLabel { + contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing - spacing: control.spacing - mirrored: control.mirrored - display: control.display - alignment: control.display === IconLabel.IconOnly || control.display === IconLabel.TextUnderIcon ? Qt.AlignCenter : Qt.AlignLeft - - icon: control.icon text: control.text font: control.font - color: Color.transparent(control.Universal.foreground, enabled ? 1.0 : 0.2) + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + + opacity: enabled ? 1.0 : 0.2 + color: control.Universal.foreground } background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/SwitchIndicator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/SwitchIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/SwitchIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/SwitchIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 Item { implicitWidth: 44 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Switch.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,19 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 +import QtQuick.Controls.Universal.impl 2.2 T.Switch { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding, - implicitIndicatorHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 5 spacing: 8 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/TabBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/TabBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/TabBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/TabBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,18 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.TabBar { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + contentHeight: 48 + contentItem: PathView { model: control.contentModel currentIndex: control.currentIndex diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/TabButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/TabButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/TabButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/TabButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,37 +34,29 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.TabButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 12 // PivotItemMargin - spacing: 8 - icon.width: 20 - icon.height: 20 - icon.color: Color.transparent(control.hovered ? control.Universal.baseMediumHighColor : control.Universal.foreground, - control.checked || control.down || control.hovered ? 1.0 : 0.2) - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font - color: Color.transparent(control.hovered ? control.Universal.baseMediumHighColor : control.Universal.foreground, - control.checked || control.down || control.hovered ? 1.0 : 0.2) + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + + opacity: control.checked || control.down || control.hovered ? 1.0 : 0.2 + color: control.hovered ? control.Universal.baseMediumHighColor : control.Universal.foreground } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/TextArea.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/TextArea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/TextArea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/TextArea.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,20 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Controls.Universal 2.2 T.TextArea { id: control implicitWidth: Math.max(contentWidth + leftPadding + rightPadding, - implicitBackgroundWidth + leftInset + rightInset, + background ? background.implicitWidth : 0, placeholder.implicitWidth + leftPadding + rightPadding) implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, - implicitBackgroundHeight + topInset + bottomInset, + background ? background.implicitHeight : 0, placeholder.implicitHeight + topPadding + bottomPadding) // TextControlThemePadding + 2 (border) @@ -61,9 +61,6 @@ color: !enabled ? Universal.chromeDisabledLowColor : Universal.foreground selectionColor: Universal.accent selectedTextColor: Universal.chromeWhiteColor - placeholderTextColor: !enabled ? Universal.chromeDisabledLowColor : - activeFocus ? Universal.chromeBlackMediumLowColor : - Universal.baseMediumColor PlaceholderText { id: placeholder @@ -74,11 +71,11 @@ text: control.placeholderText font: control.font - color: control.placeholderTextColor + color: !control.enabled ? control.Universal.chromeDisabledLowColor : + control.activeFocus ? control.Universal.chromeBlackMediumLowColor : control.Universal.baseMediumColor visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) verticalAlignment: control.verticalAlignment elide: Text.ElideRight - renderType: control.renderType } background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/TextField.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/TextField.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/TextField.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/TextField.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,19 +34,20 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 +import QtQuick.Controls.Universal 2.2 T.TextField { id: control - implicitWidth: implicitBackgroundWidth + leftInset + rightInset - || Math.max(contentWidth, placeholder.implicitWidth) + leftPadding + rightPadding - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding, + implicitWidth: Math.max(background ? background.implicitWidth : 0, + placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding : 0) + || contentWidth + leftPadding + rightPadding + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, placeholder.implicitHeight + topPadding + bottomPadding) // TextControlThemePadding + 2 (border) @@ -60,9 +61,6 @@ color: !enabled ? Universal.chromeDisabledLowColor : Universal.foreground selectionColor: Universal.accent selectedTextColor: Universal.chromeWhiteColor - placeholderTextColor: !enabled ? Universal.chromeDisabledLowColor : - activeFocus ? Universal.chromeBlackMediumLowColor : - Universal.baseMediumColor verticalAlignment: TextInput.AlignVCenter PlaceholderText { @@ -74,11 +72,11 @@ text: control.placeholderText font: control.font - color: control.placeholderTextColor + color: !control.enabled ? control.Universal.chromeDisabledLowColor : + control.activeFocus ? control.Universal.chromeBlackMediumLowColor : control.Universal.baseMediumColor visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) verticalAlignment: control.verticalAlignment elide: Text.ElideRight - renderType: control.renderType } background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ToolBar.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ToolBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,18 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.ToolBar { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) + + contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) + contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) background: Rectangle { implicitHeight: 48 // AppBarThemeCompactHeight diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ToolButton.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ToolButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ToolButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ToolButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,38 +34,32 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.ToolButton { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + baselineOffset: contentItem.y + contentItem.baselineOffset padding: 6 - spacing: 8 - - icon.width: 20 - icon.height: 20 - icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) property bool useSystemFocusVisuals: true - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon + contentItem: Text { text: control.text font: control.font - color: Color.transparent(control.Universal.foreground, enabled ? 1.0 : 0.2) + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + + opacity: enabled ? 1.0 : 0.2 + color: control.Universal.foreground } background: Rectangle { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ToolSeparator.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ToolSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ToolSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ToolSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,17 +34,15 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.ToolSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) leftPadding: vertical ? 16 : 12 rightPadding: vertical ? 15 : 12 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ToolTip.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ToolTip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/ToolTip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/ToolTip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 T.ToolTip { id: control @@ -44,10 +44,10 @@ x: parent ? (parent.width - implicitWidth) / 2 : 0 y: -implicitHeight - 16 - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - contentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - contentHeight + topPadding + bottomPadding) + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) margins: 8 padding: 8 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Tumbler.qml qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/Tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/Tumbler.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,19 +34,17 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Universal 2.2 +import QtQuick.Controls 2.2 +import QtQuick.Controls.impl 2.2 T.Tumbler { id: control - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) || 60 // ### remove 60 in Qt 6 - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) || 200 // ### remove 200 in Qt 6 + implicitWidth: 60 + implicitHeight: 200 delegate: Text { text: modelData @@ -58,8 +56,6 @@ } contentItem: TumblerView { - implicitWidth: 60 - implicitHeight: 200 model: control.model delegate: control.delegate path: Path { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/universal.pri qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/universal.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/universal.pri 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/universal.pri 2018-03-21 07:59:29.000000000 +0000 @@ -16,8 +16,6 @@ $$PWD/ItemDelegate.qml \ $$PWD/Label.qml \ $$PWD/Menu.qml \ - $$PWD/MenuBar.qml \ - $$PWD/MenuBarItem.qml \ $$PWD/MenuItem.qml \ $$PWD/MenuSeparator.qml \ $$PWD/Page.qml \ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/universal.pro qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/universal.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/controls/universal/universal.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/controls/universal/universal.pro 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ TARGET = qtquickcontrols2universalstyleplugin TARGETPATH = QtQuick/Controls.2/Universal -IMPORT_VERSION = 2.5 +IMPORT_VERSION = 2.2 QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private @@ -19,7 +19,8 @@ RESOURCES += \ $$PWD/qtquickcontrols2universalstyleplugin.qrc -CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler +!static: CONFIG += qmlcache +CONFIG += no_cxx_module load(qml_plugin) requires(qtConfig(quickcontrols2-universal)) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/imports.pro qtquickcontrols2-opensource-src-5.9.5/src/imports/imports.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/imports.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/imports.pro 2018-03-21 07:59:29.000000000 +0000 @@ -6,7 +6,5 @@ templates SUBDIRS += \ - controls/fusion/fusion.pro \ - controls/imagine/imagine.pro \ controls/material/material.pro \ controls/universal/universal.pro diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/doc/qtlabsplatform.qdocconf qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/doc/qtlabsplatform.qdocconf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/doc/qtlabsplatform.qdocconf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/doc/qtlabsplatform.qdocconf 2018-03-21 07:59:29.000000000 +0000 @@ -22,10 +22,7 @@ qhp.QtLabsPlatform.subprojects.qmltypes.selectors = qmlclass qhp.QtLabsPlatform.subprojects.qmltypes.sortPages = true -depends = qtcore qtgui qtdoc qtqml qtquick qtquickcontrols qtwidgets - -# This module has no documented C++ types, clear the module header -moduleheader = +depends = qtcore qtgui qtdoc qtqml qtquick qtquickcontrols2 qtwidgets headerdirs += ../ sourcedirs += ../ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \qmlmodule Qt.labs.platform 1.1 + \qmlmodule Qt.labs.platform 1.0 \title Qt Labs Platform QML Types \ingroup qmlmodules \brief Provides QML types for native platform extensions. @@ -39,7 +39,7 @@ following import statement in your .qml file: \badcode - import Qt.labs.platform 1.1 + import Qt.labs.platform 1.0 \endcode \section1 QML Types diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/platform.pri qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/platform.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/platform.pri 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/platform.pri 2018-03-21 07:59:29.000000000 +0000 @@ -4,7 +4,6 @@ $$PWD/qquickplatformfiledialog_p.h \ $$PWD/qquickplatformfolderdialog_p.h \ $$PWD/qquickplatformfontdialog_p.h \ - $$PWD/qquickplatformicon_p.h \ $$PWD/qquickplatformiconloader_p.h \ $$PWD/qquickplatformmenu_p.h \ $$PWD/qquickplatformmenubar_p.h \ @@ -20,7 +19,6 @@ $$PWD/qquickplatformfiledialog.cpp \ $$PWD/qquickplatformfolderdialog.cpp \ $$PWD/qquickplatformfontdialog.cpp \ - $$PWD/qquickplatformicon.cpp \ $$PWD/qquickplatformiconloader.cpp \ $$PWD/qquickplatformmenu.cpp \ $$PWD/qquickplatformmenubar.cpp \ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformcolordialog.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformcolordialog.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformcolordialog.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformcolordialog.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -186,7 +186,6 @@ if (QPlatformColorDialogHelper *colorDialog = qobject_cast(dialog)) { connect(colorDialog, &QPlatformColorDialogHelper::currentColorChanged, this, &QQuickPlatformColorDialog::currentColorChanged); colorDialog->setOptions(m_options); - colorDialog->setCurrentColor(m_currentColor); } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformfiledialog.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformfiledialog.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformfiledialog.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformfiledialog.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -518,9 +518,7 @@ { m_options->setWindowTitle(title()); if (QPlatformFileDialogHelper *fileDialog = qobject_cast(dialog)) { - fileDialog->setOptions(m_options); // setOptions only assigns a member and isn't virtual - if (m_firstShow && m_options->initialDirectory().isValid()) - fileDialog->setDirectory(m_options->initialDirectory()); + fileDialog->setOptions(m_options); if (m_selectedNameFilter) { const int index = m_selectedNameFilter->index(); const QString filter = m_options->nameFilters().value(index); @@ -529,8 +527,6 @@ connect(fileDialog, &QPlatformFileDialogHelper::filterSelected, m_selectedNameFilter, &QQuickPlatformFileNameFilter::update); } } - if (m_firstShow) - m_firstShow = false; } void QQuickPlatformFileDialog::onHide(QPlatformDialogHelper *dialog) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformfiledialog_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformfiledialog_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformfiledialog_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformfiledialog_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -149,7 +149,6 @@ FileMode m_fileMode; QList m_files; - bool m_firstShow = true; QSharedPointer m_options; mutable QQuickPlatformFileNameFilter *m_selectedNameFilter; }; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformicon.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformicon.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformicon.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformicon.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Labs Platform module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickplatformicon_p.h" - -QT_BEGIN_NAMESPACE - -QUrl QQuickPlatformIcon::source() const -{ - return m_source; -} - -void QQuickPlatformIcon::setSource(const QUrl& source) -{ - m_source = source; -} - -QString QQuickPlatformIcon::name() const -{ - return m_name; -} - -void QQuickPlatformIcon::setName(const QString& name) -{ - m_name = name; -} - -bool QQuickPlatformIcon::isMask() const -{ - return m_mask; -} - -void QQuickPlatformIcon::setMask(bool mask) -{ - m_mask = mask; -} - -bool QQuickPlatformIcon::operator==(const QQuickPlatformIcon &other) const -{ - return m_source == other.m_source && m_name == other.m_name && m_mask == other.m_mask; -} - -bool QQuickPlatformIcon::operator!=(const QQuickPlatformIcon &other) const -{ - return !(*this == other); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformiconloader.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformiconloader.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformiconloader.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformiconloader.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -62,32 +62,42 @@ loadIcon(); } -QIcon QQuickPlatformIconLoader::toQIcon() const +QIcon QQuickPlatformIconLoader::icon() const { QIcon fallback = QPixmap::fromImage(image()); - QIcon icon = QIcon::fromTheme(m_icon.name(), fallback); - icon.setIsMask(m_icon.isMask()); - return icon; + return QIcon::fromTheme(m_iconName, fallback); } -QQuickPlatformIcon QQuickPlatformIconLoader::icon() const +QUrl QQuickPlatformIconLoader::iconSource() const { - return m_icon; + return m_iconSource; } -void QQuickPlatformIconLoader::setIcon(const QQuickPlatformIcon& icon) +void QQuickPlatformIconLoader::setIconSource(const QUrl& source) { - m_icon = icon; + m_iconSource = source; + if (m_enabled) + loadIcon(); +} + +QString QQuickPlatformIconLoader::iconName() const +{ + return m_iconName; +} + +void QQuickPlatformIconLoader::setIconName(const QString& name) +{ + m_iconName = name; if (m_enabled) loadIcon(); } void QQuickPlatformIconLoader::loadIcon() { - if (m_icon.source().isEmpty()) { + if (m_iconSource.isEmpty()) { clear(m_parent); } else { - load(qmlEngine(m_parent), m_icon.source()); + load(qmlEngine(m_parent), m_iconSource); if (m_slot != -1 && isLoading()) { connectFinished(m_parent, m_slot); m_slot = -1; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformiconloader_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformiconloader_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformiconloader_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformiconloader_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -53,8 +53,6 @@ #include #include -#include "qquickplatformicon_p.h" - QT_BEGIN_NAMESPACE class QObject; @@ -67,10 +65,13 @@ bool isEnabled() const; void setEnabled(bool enabled); - QIcon toQIcon() const; + QIcon icon() const; + + QUrl iconSource() const; + void setIconSource(const QUrl &source); - QQuickPlatformIcon icon() const; - void setIcon(const QQuickPlatformIcon &icon); + QString iconName() const; + void setIconName(const QString &name); private: void loadIcon(); @@ -78,7 +79,9 @@ QObject *m_parent; int m_slot; bool m_enabled; - QQuickPlatformIcon m_icon; + QIcon m_icon; + QUrl m_iconSource; + QString m_iconName; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformicon_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformicon_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformicon_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformicon_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Labs Platform module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKPLATFORMICON_P_H -#define QQUICKPLATFORMICON_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class QObject; - -class QQuickPlatformIcon -{ - Q_GADGET - Q_PROPERTY(QUrl source READ source WRITE setSource) - Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(bool mask READ isMask WRITE setMask) - -public: - QUrl source() const; - void setSource(const QUrl &source); - - QString name() const; - void setName(const QString &name); - - bool isMask() const; - void setMask(bool mask); - - bool operator==(const QQuickPlatformIcon &other) const; - bool operator!=(const QQuickPlatformIcon &other) const; - -private: - bool m_mask = false; - QUrl m_source; - QString m_name; -}; - -QT_END_NAMESPACE - -#endif // QQUICKPLATFORMICON_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformmenu.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformmenu.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformmenu.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformmenu.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -100,68 +100,6 @@ } \endcode - \section2 Submenus - - To create submenus, declare a Menu as a child of another Menu: - - \qml - Menu { - title: qsTr("Edit") - - Menu { - title: qsTr("Advanced") - - MenuItem { - text: qsTr("Auto-indent Selection") - onTriggered: autoIndentSelection() - } - - MenuItem { - text: qsTr("Rewrap Paragraph") - onTriggered: rewrapParagraph() - } - } - } - \endqml - - \section2 Dynamically Generating Menu Items - - It is possible to dynamically generate menu items. One of the easiest ways - to do so is with \l Instantiator. For example, to implement a - "Recent Files" submenu, where the items are based on a list of files stored - in settings, the following code could be used: - - \qml - Menu { - title: qsTr("File") - - Menu { - id: recentFilesSubMenu - title: qsTr("Recent Files") - enabled: recentFilesInstantiator.count > 0 - - Instantiator { - id: recentFilesInstantiator - model: settings.recentFiles - delegate: MenuItem { - text: settings.displayableFilePath(modelData) - onTriggered: loadFile(modelData) - } - - onObjectAdded: recentFilesSubMenu.insertItem(index, object) - onObjectRemoved: recentFilesSubMenu.removeItem(object) - } - - MenuSeparator {} - - MenuItem { - text: qsTr("Clear Recent Files") - onTriggered: settings.clearRecentFiles() - } - } - } - \endqml - \section2 Availability A native platform menu is currently available on the following platforms: @@ -216,22 +154,15 @@ m_menuBar->removeMenu(this); if (m_parentMenu) m_parentMenu->removeMenu(this); - - unparentSubmenus(); - - delete m_iconLoader; - m_iconLoader = nullptr; - delete m_handle; - m_handle = nullptr; -} - -void QQuickPlatformMenu::unparentSubmenus() -{ for (QQuickPlatformMenuItem *item : qAsConst(m_items)) { if (QQuickPlatformMenu *subMenu = item->subMenu()) subMenu->setParentMenu(nullptr); item->setMenu(nullptr); } + delete m_iconLoader; + m_iconLoader = nullptr; + delete m_handle; + m_handle = nullptr; } QPlatformMenu *QQuickPlatformMenu::handle() const @@ -284,10 +215,6 @@ if (!m_handle) return; - // Ensure that all submenus are unparented before we are destroyed, - // so that they don't try to access a destroyed menu. - unparentSubmenus(); - delete m_handle; m_handle = nullptr; } @@ -533,9 +460,6 @@ if (m_title == title) return; - if (m_menuItem) - m_menuItem->setText(title); - m_title = title; sync(); emit titleChanged(); @@ -543,48 +467,57 @@ /*! \qmlproperty url Qt.labs.platform::Menu::iconSource - \deprecated Use icon.source instead + + This property holds the url of the menu's icon. + + \sa iconName */ QUrl QQuickPlatformMenu::iconSource() const { - return icon().source(); + if (!m_iconLoader) + return QUrl(); + + return m_iconLoader->iconSource(); } void QQuickPlatformMenu::setIconSource(const QUrl& source) { - QQuickPlatformIcon newIcon = icon(); - if (source == newIcon.source()) + if (source == iconSource()) return; if (m_menuItem) m_menuItem->setIconSource(source); - newIcon.setSource(source); - iconLoader()->setIcon(newIcon); + iconLoader()->setIconSource(source); emit iconSourceChanged(); } /*! \qmlproperty string Qt.labs.platform::Menu::iconName - \deprecated Use icon.name instead + + This property holds the theme name of the menu's icon. + + \sa iconSource, QIcon::fromTheme() */ QString QQuickPlatformMenu::iconName() const { - return icon().name(); + if (!m_iconLoader) + return QString(); + + return m_iconLoader->iconName(); } void QQuickPlatformMenu::setIconName(const QString& name) { - QQuickPlatformIcon newIcon = icon(); - if (name == newIcon.name()) + if (name == iconName()) return; if (m_menuItem) m_menuItem->setIconName(name); - newIcon.setName(name); - iconLoader()->setIcon(newIcon); - emit iconNameChanged();} + iconLoader()->setIconName(name); + emit iconNameChanged(); +} /*! \qmlproperty font Qt.labs.platform::Menu::font @@ -609,35 +542,6 @@ } /*! - \since Qt.labs.platform 1.1 (Qt 5.12) - \qmlpropertygroup Qt.labs.platform::MenuItem::icon - \qmlproperty url Qt.labs.platform::MenuItem::icon.source - \qmlproperty string Qt.labs.platform::MenuItem::icon.name - \qmlproperty bool Qt.labs.platform::MenuItem::icon.mask - - This property holds the menu item's icon. -*/ -QQuickPlatformIcon QQuickPlatformMenu::icon() const -{ - if (!m_iconLoader) - return QQuickPlatformIcon(); - - return iconLoader()->icon(); -} - -void QQuickPlatformMenu::setIcon(const QQuickPlatformIcon &icon) -{ - if (iconLoader()->icon() == icon) - return; - - if (m_menuItem) - m_menuItem->setIcon(icon); - - iconLoader()->setIcon(icon); - emit iconChanged(); -} - -/*! \qmlmethod void Qt.labs.platform::Menu::addItem(MenuItem item) Adds an \a item to the end of the menu. @@ -933,7 +837,7 @@ if (!m_handle || !m_iconLoader) return; - m_handle->setIcon(m_iconLoader->toQIcon()); + m_handle->setIcon(m_iconLoader->icon()); sync(); } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformmenuitem.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformmenuitem.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformmenuitem.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformmenuitem.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -144,8 +144,10 @@ m_handle = QWidgetPlatform::createMenuItem(); if (m_handle) { - connect(m_handle, &QPlatformMenuItem::activated, this, &QQuickPlatformMenuItem::activate); + connect(m_handle, &QPlatformMenuItem::activated, this, &QQuickPlatformMenuItem::triggered); connect(m_handle, &QPlatformMenuItem::hovered, this, &QQuickPlatformMenuItem::hovered); + if (m_checkable) + connect(m_handle, &QPlatformMenuItem::activated, this, &QQuickPlatformMenuItem::toggle); } } return m_handle; @@ -352,6 +354,13 @@ if (m_checkable == checkable) return; + if (m_handle) { + if (checkable) + connect(m_handle, &QPlatformMenuItem::activated, this, &QQuickPlatformMenuItem::toggle); + else + disconnect(m_handle, &QPlatformMenuItem::activated, this, &QQuickPlatformMenuItem::toggle); + } + m_checkable = checkable; sync(); emit checkableChanged(); @@ -443,41 +452,63 @@ /*! \qmlproperty url Qt.labs.platform::MenuItem::iconSource - \deprecated Use icon.source instead + + This property holds the url of the menu item's icon. + + \code + MenuItem { + iconName: "edit-undo" + iconSource: "qrc:/images/undo.png" + } + \endcode + + \sa iconName */ QUrl QQuickPlatformMenuItem::iconSource() const { - return icon().source(); + if (!m_iconLoader) + return QUrl(); + + return m_iconLoader->iconSource(); } void QQuickPlatformMenuItem::setIconSource(const QUrl& source) { - QQuickPlatformIcon newIcon = icon(); - if (source == newIcon.source()) + if (source == iconSource()) return; - newIcon.setSource(source); - iconLoader()->setIcon(newIcon); + iconLoader()->setIconSource(source); emit iconSourceChanged(); } /*! \qmlproperty string Qt.labs.platform::MenuItem::iconName - \deprecated Use icon.name instead + + This property holds the theme name of the menu item's icon. + + \code + MenuItem { + iconName: "edit-undo" + iconSource: "qrc:/images/undo.png" + } + \endcode + + \sa iconSource, QIcon::fromTheme() */ QString QQuickPlatformMenuItem::iconName() const { - return icon().name(); + if (!m_iconLoader) + return QString(); + + return m_iconLoader->iconName(); } void QQuickPlatformMenuItem::setIconName(const QString& name) { - QQuickPlatformIcon newIcon = icon(); - if (name == newIcon.name()) + if (name == iconName()) return; - newIcon.setName(name); - iconLoader()->setIcon(newIcon); + iconLoader()->setIconName(name); emit iconNameChanged(); } @@ -538,42 +569,6 @@ } /*! - \since Qt.labs.platform 1.1 (Qt 5.12) - \qmlpropertygroup Qt.labs.platform::MenuItem::icon - \qmlproperty url Qt.labs.platform::MenuItem::icon.source - \qmlproperty string Qt.labs.platform::MenuItem::icon.name - \qmlproperty bool Qt.labs.platform::MenuItem::icon.mask - - This property holds the menu item's icon. - - \code - MenuItem { - icon.mask: true - icon.name: "edit-undo" - icon.source: "qrc:/images/undo.png" - } - \endcode - - \sa QIcon::fromTheme() -*/ -QQuickPlatformIcon QQuickPlatformMenuItem::icon() const -{ - if (!m_iconLoader) - return QQuickPlatformIcon(); - - return m_iconLoader->icon(); -} - -void QQuickPlatformMenuItem::setIcon(const QQuickPlatformIcon &icon) -{ - if (iconLoader()->icon() == icon) - return; - - iconLoader()->setIcon(icon); - emit iconChanged(); -} - -/*! \qmlmethod void Qt.labs.platform::MenuItem::toggle() Toggles the \l checked state to its opposite state. @@ -607,18 +602,12 @@ return m_iconLoader; } -void QQuickPlatformMenuItem::activate() -{ - toggle(); - emit triggered(); -} - void QQuickPlatformMenuItem::updateIcon() { if (!m_handle || !m_iconLoader) return; - m_handle->setIcon(m_iconLoader->toQIcon()); + m_handle->setIcon(m_iconLoader->icon()); sync(); } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformmenuitem_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformmenuitem_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformmenuitem_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformmenuitem_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -55,8 +55,6 @@ #include #include -#include "qquickplatformicon_p.h" - QT_BEGIN_NAMESPACE class QPlatformMenuItem; @@ -82,7 +80,6 @@ Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged FINAL) Q_PROPERTY(QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged FINAL) Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged FINAL) - Q_PROPERTY(QQuickPlatformIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL REVISION 1) Q_ENUMS(QPlatformMenuItem::MenuRole) public: @@ -135,9 +132,6 @@ QFont font() const; void setFont(const QFont &font); - QQuickPlatformIcon icon() const; - void setIcon(const QQuickPlatformIcon &icon); - public Q_SLOTS: void toggle(); @@ -159,7 +153,6 @@ void iconNameChanged(); void shortcutChanged(); void fontChanged(); - Q_REVISION(1) void iconChanged(); protected: void classBegin() override; @@ -168,7 +161,6 @@ QQuickPlatformIconLoader *iconLoader() const; private Q_SLOTS: - void activate(); void updateIcon(); private: diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformmenu_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformmenu_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformmenu_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformmenu_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -56,8 +56,6 @@ #include #include -#include "qquickplatformicon_p.h" - QT_BEGIN_NAMESPACE class QIcon; @@ -88,7 +86,6 @@ Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged FINAL) Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged FINAL) Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged FINAL) - Q_PROPERTY(QQuickPlatformIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL REVISION 1) Q_ENUMS(QPlatformMenu::MenuType) Q_CLASSINFO("DefaultProperty", "data") @@ -139,9 +136,6 @@ QFont font() const; void setFont(const QFont &font); - QQuickPlatformIcon icon() const; - void setIcon(const QQuickPlatformIcon &icon); - Q_INVOKABLE void addItem(QQuickPlatformMenuItem *item); Q_INVOKABLE void insertItem(int index, QQuickPlatformMenuItem *item); Q_INVOKABLE void removeItem(QQuickPlatformMenuItem *item); @@ -172,7 +166,6 @@ void minimumWidthChanged(); void fontChanged(); void typeChanged(); - Q_REVISION(1) void iconChanged(); protected: void classBegin() override; @@ -196,8 +189,6 @@ void updateIcon(); private: - void unparentSubmenus(); - bool m_complete; bool m_enabled; bool m_visible; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformmessagedialog.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformmessagedialog.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformmessagedialog.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformmessagedialog.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -376,7 +376,7 @@ case QPlatformDialogHelper::Apply: emit applyClicked(); break; case QPlatformDialogHelper::Reset: emit resetClicked(); break; case QPlatformDialogHelper::RestoreDefaults: emit restoreDefaultsClicked(); break; - default: qmlWarning(this) << "unknown button" << int(button); break; + default: qmlWarning(this) << "unknown button" << button; break; } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformsystemtrayicon.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformsystemtrayicon.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformsystemtrayicon.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformsystemtrayicon.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -67,7 +67,7 @@ \code SystemTrayIcon { visible: true - icon.source: "qrc:/images/tray-icon.png" + iconSource: "qrc:/images/tray-icon.png" onActivated: { window.show() @@ -88,7 +88,7 @@ \code SystemTrayIcon { visible: true - icon.source: "qrc:/images/tray-icon.png" + iconSource: "qrc:/images/tray-icon.png" menu: Menu { MenuItem { @@ -111,7 +111,7 @@ \code SystemTrayIcon { visible: true - icon.source: "qrc:/images/tray-icon.png" + iconSource: "qrc:/images/tray-icon.png" onMessageClicked: console.log("Message clicked") Component.onCompleted: showMessage("Message title", "Something important came up. Click this to know more.") @@ -254,43 +254,49 @@ /*! \qmlproperty url Qt.labs.platform::SystemTrayIcon::iconSource - \deprecated Use icon.source instead. - \sa icon + + This property holds the url of the system tray icon. + + \sa iconName */ QUrl QQuickPlatformSystemTrayIcon::iconSource() const { - return icon().source(); + if (!m_iconLoader) + return QUrl(); + + return m_iconLoader->iconSource(); } void QQuickPlatformSystemTrayIcon::setIconSource(const QUrl& source) { - QQuickPlatformIcon newIcon = icon(); - if (source == newIcon.source()) + if (source == iconSource()) return; - newIcon.setSource(source); - iconLoader()->setIcon(newIcon); + iconLoader()->setIconSource(source); emit iconSourceChanged(); } /*! \qmlproperty string Qt.labs.platform::SystemTrayIcon::iconName - \deprecated Use icon.name instead. - \sa icon + + This property holds the theme name of the system tray icon. + + \sa iconSource, QIcon::fromTheme() */ QString QQuickPlatformSystemTrayIcon::iconName() const { - return icon().name(); + if (!m_iconLoader) + return QString(); + + return m_iconLoader->iconName(); } void QQuickPlatformSystemTrayIcon::setIconName(const QString& name) { - QQuickPlatformIcon newIcon = icon(); - if (name == newIcon.name()) + if (name == iconName()) return; - newIcon.setName(name); - iconLoader()->setIcon(newIcon); + iconLoader()->setIconName(name); emit iconNameChanged(); } @@ -344,50 +350,6 @@ } /*! - \since Qt.labs.platform 1.1 (Qt 5.12) - \qmlproperty rect Qt.labs.platform::SystemTrayIcon::geometry - - This property holds the geometry of the system tray icon. -*/ -QRect QQuickPlatformSystemTrayIcon::geometry() const -{ - return m_handle ? m_handle->geometry() : QRect(); -} - -/*! - \since Qt.labs.platform 1.1 (Qt 5.12) - \qmlpropertygroup Qt.labs.platform::SystemTrayIcon::icon - \qmlproperty url Qt.labs.platform::SystemTrayIcon::icon.source - \qmlproperty string Qt.labs.platform::SystemTrayIcon::icon.name - \qmlproperty bool Qt.labs.platform::SystemTrayIcon::icon.mask - - This property holds the system tray icon. - - \code - SystemTrayIcon { - icon.mask: true - icon.source: "qrc:/images/tray-icon.png" - } - \endcode -*/ -QQuickPlatformIcon QQuickPlatformSystemTrayIcon::icon() const -{ - if (!m_iconLoader) - return QQuickPlatformIcon(); - - return m_iconLoader->icon(); -} - -void QQuickPlatformSystemTrayIcon::setIcon(const QQuickPlatformIcon &icon) -{ - if (iconLoader()->icon() == icon) - return; - - iconLoader()->setIcon(icon); - emit iconChanged(); -} - -/*! \qmlmethod void Qt.labs.platform::SystemTrayIcon::show() Shows the system tray icon. @@ -473,12 +435,7 @@ if (!m_handle || !m_iconLoader) return; - const QRect oldGeometry = m_handle->geometry(); - - m_handle->updateIcon(m_iconLoader->toQIcon()); - - if (oldGeometry != m_handle->geometry()) - emit geometryChanged(); + m_handle->updateIcon(m_iconLoader->icon()); } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformsystemtrayicon_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformsystemtrayicon_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qquickplatformsystemtrayicon_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qquickplatformsystemtrayicon_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -49,13 +49,10 @@ // #include -#include #include #include #include -#include "qquickplatformicon_p.h" - QT_REQUIRE_CONFIG(systemtrayicon); QT_BEGIN_NAMESPACE @@ -74,8 +71,6 @@ Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged FINAL) Q_PROPERTY(QString tooltip READ tooltip WRITE setTooltip NOTIFY tooltipChanged FINAL) Q_PROPERTY(QQuickPlatformMenu *menu READ menu WRITE setMenu NOTIFY menuChanged FINAL) - Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged FINAL REVISION 1) - Q_PROPERTY(QQuickPlatformIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL REVISION 1) Q_ENUMS(QPlatformSystemTrayIcon::ActivationReason QPlatformSystemTrayIcon::MessageIcon) public: @@ -102,11 +97,6 @@ QQuickPlatformMenu *menu() const; void setMenu(QQuickPlatformMenu *menu); - QRect geometry() const; - - QQuickPlatformIcon icon() const; - void setIcon(const QQuickPlatformIcon &icon); - public Q_SLOTS: void show(); void hide(); @@ -122,8 +112,6 @@ void iconNameChanged(); void tooltipChanged(); void menuChanged(); - Q_REVISION(1) void geometryChanged(); - Q_REVISION(1) void iconChanged(); protected: void init(); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qtlabsplatformplugin.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qtlabsplatformplugin.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/qtlabsplatformplugin.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/qtlabsplatformplugin.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -56,7 +56,12 @@ # include "qquickplatformsystemtrayicon_p.h" #endif -#include "qquickplatformicon_p.h" +static inline void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_Qt_labs_platform); +#endif +} QT_BEGIN_NAMESPACE @@ -76,6 +81,7 @@ QtLabsPlatformPlugin::QtLabsPlatformPlugin(QObject *parent) : QQmlExtensionPlugin(parent) { + initResources(); } void QtLabsPlatformPlugin::registerTypes(const char *uri) @@ -102,13 +108,9 @@ #if QT_CONFIG(systemtrayicon) qmlRegisterType(uri, 1, 0, "SystemTrayIcon"); - qmlRegisterType(uri, 1, 1, "SystemTrayIcon"); qRegisterMetaType(); qRegisterMetaType(); #endif - - qmlRegisterType(); - qRegisterMetaType(); } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/widgets/qwidgetplatformmenu.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/widgets/qwidgetplatformmenu.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/widgets/qwidgetplatformmenu.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/widgets/qwidgetplatformmenu.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE QWidgetPlatformMenu::QWidgetPlatformMenu(QObject *parent) - : m_menu(new QMenu) + : m_tag(reinterpret_cast(this)), m_menu(new QMenu) { setParent(parent); @@ -95,6 +95,16 @@ m_menu->setSeparatorsCollapsible(enable); } +quintptr QWidgetPlatformMenu::tag() const +{ + return m_tag; +} + +void QWidgetPlatformMenu::setTag(quintptr tag) +{ + m_tag = tag; +} + void QWidgetPlatformMenu::setText(const QString &text) { m_menu->setTitle(text); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/widgets/qwidgetplatformmenuitem.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/widgets/qwidgetplatformmenuitem.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/widgets/qwidgetplatformmenuitem.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/widgets/qwidgetplatformmenuitem.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE QWidgetPlatformMenuItem::QWidgetPlatformMenuItem(QObject *parent) - : m_action(new QAction) + : m_tag(reinterpret_cast(this)), m_action(new QAction) { setParent(parent); connect(m_action.data(), &QAction::hovered, this, &QPlatformMenuItem::hovered); @@ -59,6 +59,16 @@ return m_action.data(); } +quintptr QWidgetPlatformMenuItem::tag() const +{ + return m_tag; +} + +void QWidgetPlatformMenuItem::setTag(quintptr tag) +{ + m_tag = tag; +} + void QWidgetPlatformMenuItem::setText(const QString &text) { m_action->setText(text); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/widgets/qwidgetplatformmenuitem_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/widgets/qwidgetplatformmenuitem_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/widgets/qwidgetplatformmenuitem_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/widgets/qwidgetplatformmenuitem_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -64,6 +64,9 @@ QAction *action() const; + quintptr tag()const override; + void setTag(quintptr tag) override; + void setText(const QString &text) override; void setIcon(const QIcon &icon) override; void setMenu(QPlatformMenu *menu) override; @@ -80,6 +83,7 @@ void setIconSize(int size) override; private: + quintptr m_tag; QScopedPointer m_action; }; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/widgets/qwidgetplatformmenu_p.h qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/widgets/qwidgetplatformmenu_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/widgets/qwidgetplatformmenu_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/widgets/qwidgetplatformmenu_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -70,6 +70,9 @@ void syncMenuItem(QPlatformMenuItem *item) override; void syncSeparatorsCollapsible(bool enable) override; + quintptr tag()const override; + void setTag(quintptr tag) override; + void setText(const QString &text) override; void setIcon(const QIcon &icon) override; void setEnabled(bool enabled) override; @@ -89,6 +92,7 @@ QPlatformMenu *createSubMenu() const override; private: + quintptr m_tag; QScopedPointer m_menu; QVector m_items; }; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/widgets/qwidgetplatformsystemtrayicon.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/widgets/qwidgetplatformsystemtrayicon.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/platform/widgets/qwidgetplatformsystemtrayicon.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/platform/widgets/qwidgetplatformsystemtrayicon.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -84,8 +84,6 @@ return; m_systray->setContextMenu(widgetMenu->menu()); -#else - Q_UNUSED(menu); #endif } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc qtquickcontrols2-opensource-src-5.9.5/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc 2018-03-21 07:59:29.000000000 +0000 @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \qmlmodule QtQuick.Templates 2.5 + \qmlmodule QtQuick.Templates 2.2 \title Qt Quick Templates 2 QML Types \ingroup qmlmodules \brief Provides QML types for templates (Qt Quick Templates). @@ -38,7 +38,7 @@ \c .qml file: \badcode - import QtQuick.Templates 2.12 as T + import QtQuick.Templates 2.2 as T \endcode For the sake of clarity, there is a one-to-one mapping between the types diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/templates/plugins.qmltypes qtquickcontrols2-opensource-src-5.9.5/src/imports/templates/plugins.qmltypes --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/templates/plugins.qmltypes 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/templates/plugins.qmltypes 2018-03-21 07:59:29.000000000 +0000 @@ -4,7 +4,7 @@ // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Templates 2.5' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Templates 2.2' Module { dependencies: ["QtQuick 2.9", "QtQuick.Window 2.2"] @@ -14,150 +14,31 @@ prototype: "QQuickControl" exports: [ "QtQuick.Templates/AbstractButton 2.0", - "QtQuick.Templates/AbstractButton 2.2", - "QtQuick.Templates/AbstractButton 2.3", - "QtQuick.Templates/AbstractButton 2.4", - "QtQuick.Templates/AbstractButton 2.5" + "QtQuick.Templates/AbstractButton 2.2" ] - exportMetaObjectRevisions: [0, 2, 3, 4, 5] - Enum { - name: "Display" - values: { - "IconOnly": 0, - "TextOnly": 1, - "TextBesideIcon": 2, - "TextUnderIcon": 3 - } - } + exportMetaObjectRevisions: [0, 2] Property { name: "text"; type: "string" } Property { name: "down"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } Property { name: "checked"; type: "bool" } Property { name: "checkable"; type: "bool" } Property { name: "autoExclusive"; type: "bool" } - Property { name: "autoRepeat"; type: "bool" } Property { name: "indicator"; type: "QQuickItem"; isPointer: true } - Property { name: "icon"; revision: 3; type: "QQuickIcon" } - Property { name: "display"; revision: 3; type: "Display" } - Property { name: "action"; revision: 3; type: "QQuickAction"; isPointer: true } - Property { name: "autoRepeatDelay"; revision: 4; type: "int" } - Property { name: "autoRepeatInterval"; revision: 4; type: "int" } - Property { name: "pressX"; revision: 4; type: "double"; isReadonly: true } - Property { name: "pressY"; revision: 4; type: "double"; isReadonly: true } - Property { name: "implicitIndicatorWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitIndicatorHeight"; revision: 5; type: "double"; isReadonly: true } Signal { name: "pressed" } Signal { name: "released" } Signal { name: "canceled" } Signal { name: "clicked" } + Signal { name: "toggled"; revision: 2 } Signal { name: "pressAndHold" } Signal { name: "doubleClicked" } - Signal { name: "toggled"; revision: 2 } - Signal { name: "iconChanged"; revision: 3 } - Signal { name: "displayChanged"; revision: 3 } - Signal { name: "actionChanged"; revision: 3 } - Signal { name: "autoRepeatDelayChanged"; revision: 4 } - Signal { name: "autoRepeatIntervalChanged"; revision: 4 } - Signal { name: "pressXChanged"; revision: 4 } - Signal { name: "pressYChanged"; revision: 4 } - Signal { name: "implicitIndicatorWidthChanged"; revision: 5 } - Signal { name: "implicitIndicatorHeightChanged"; revision: 5 } Method { name: "toggle" } } Component { - name: "QQuickAction" - prototype: "QObject" - exports: ["QtQuick.Templates/Action 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "text"; type: "string" } - Property { name: "icon"; type: "QQuickIcon" } - Property { name: "enabled"; type: "bool" } - Property { name: "checked"; type: "bool" } - Property { name: "checkable"; type: "bool" } - Property { name: "shortcut"; type: "QVariant" } - Signal { - name: "textChanged" - Parameter { name: "text"; type: "string" } - } - Signal { - name: "iconChanged" - Parameter { name: "icon"; type: "QQuickIcon" } - } - Signal { - name: "enabledChanged" - Parameter { name: "enabled"; type: "bool" } - } - Signal { - name: "checkedChanged" - Parameter { name: "checked"; type: "bool" } - } - Signal { - name: "checkableChanged" - Parameter { name: "checkable"; type: "bool" } - } - Signal { - name: "shortcutChanged" - Parameter { name: "shortcut"; type: "QKeySequence" } - } - Signal { - name: "toggled" - Parameter { name: "source"; type: "QObject"; isPointer: true } - } - Signal { name: "toggled" } - Signal { - name: "triggered" - Parameter { name: "source"; type: "QObject"; isPointer: true } - } - Signal { name: "triggered" } - Method { - name: "toggle" - Parameter { name: "source"; type: "QObject"; isPointer: true } - } - Method { name: "toggle" } - Method { - name: "trigger" - Parameter { name: "source"; type: "QObject"; isPointer: true } - } - Method { name: "trigger" } - } - Component { - name: "QQuickActionGroup" - defaultProperty: "actions" - prototype: "QObject" - exports: ["QtQuick.Templates/ActionGroup 2.3"] - exportMetaObjectRevisions: [0] - attachedType: "QQuickActionGroupAttached" - Property { name: "checkedAction"; type: "QQuickAction"; isPointer: true } - Property { name: "actions"; type: "QQuickAction"; isList: true; isReadonly: true } - Property { name: "exclusive"; type: "bool" } - Property { name: "enabled"; type: "bool" } - Signal { - name: "triggered" - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - Method { - name: "addAction" - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - Method { - name: "removeAction" - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - } - Component { - name: "QQuickActionGroupAttached" - prototype: "QObject" - Property { name: "group"; type: "QQuickActionGroup"; isPointer: true } - } - Component { name: "QQuickApplicationWindow" defaultProperty: "contentData" prototype: "QQuickWindowQmlImpl" - exports: [ - "QtQuick.Templates/ApplicationWindow 2.0", - "QtQuick.Templates/ApplicationWindow 2.3" - ] - exportMetaObjectRevisions: [0, 3] + exports: ["QtQuick.Templates/ApplicationWindow 2.0"] + exportMetaObjectRevisions: [0] attachedType: "QQuickApplicationWindowAttached" Property { name: "background"; type: "QQuickItem"; isPointer: true } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } @@ -168,10 +49,6 @@ Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } Property { name: "font"; type: "QFont" } Property { name: "locale"; type: "QLocale" } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "menuBar"; revision: 3; type: "QQuickItem"; isPointer: true } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "menuBarChanged"; revision: 3 } } Component { name: "QQuickApplicationWindowAttached" @@ -182,7 +59,6 @@ Property { name: "header"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } - Property { name: "menuBar"; type: "QQuickItem"; isReadonly: true; isPointer: true } } Component { name: "QQuickBusyIndicator" @@ -198,6 +74,7 @@ prototype: "QQuickAbstractButton" exports: ["QtQuick.Templates/Button 2.0"] exportMetaObjectRevisions: [0] + Property { name: "autoRepeat"; type: "bool" } Property { name: "highlighted"; type: "bool" } Property { name: "flat"; type: "bool" } } @@ -206,23 +83,17 @@ prototype: "QObject" exports: [ "QtQuick.Templates/ButtonGroup 2.0", - "QtQuick.Templates/ButtonGroup 2.1", - "QtQuick.Templates/ButtonGroup 2.3", - "QtQuick.Templates/ButtonGroup 2.4" + "QtQuick.Templates/ButtonGroup 2.1" ] - exportMetaObjectRevisions: [0, 1, 3, 4] + exportMetaObjectRevisions: [0, 1] attachedType: "QQuickButtonGroupAttached" Property { name: "checkedButton"; type: "QQuickAbstractButton"; isPointer: true } Property { name: "buttons"; type: "QQuickAbstractButton"; isList: true; isReadonly: true } - Property { name: "exclusive"; revision: 3; type: "bool" } - Property { name: "checkState"; revision: 4; type: "Qt::CheckState" } Signal { name: "clicked" revision: 1 Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } } - Signal { name: "exclusiveChanged"; revision: 3 } - Signal { name: "checkStateChanged"; revision: 4 } Method { name: "addButton" Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } @@ -241,29 +112,19 @@ name: "QQuickCheckBox" defaultProperty: "data" prototype: "QQuickAbstractButton" - exports: [ - "QtQuick.Templates/CheckBox 2.0", - "QtQuick.Templates/CheckBox 2.4" - ] - exportMetaObjectRevisions: [0, 4] + exports: ["QtQuick.Templates/CheckBox 2.0"] + exportMetaObjectRevisions: [0] Property { name: "tristate"; type: "bool" } Property { name: "checkState"; type: "Qt::CheckState" } - Property { name: "nextCheckState"; revision: 4; type: "QJSValue" } - Signal { name: "nextCheckStateChanged"; revision: 4 } } Component { name: "QQuickCheckDelegate" defaultProperty: "data" prototype: "QQuickItemDelegate" - exports: [ - "QtQuick.Templates/CheckDelegate 2.0", - "QtQuick.Templates/CheckDelegate 2.4" - ] - exportMetaObjectRevisions: [0, 4] + exports: ["QtQuick.Templates/CheckDelegate 2.0"] + exportMetaObjectRevisions: [0] Property { name: "tristate"; type: "bool" } Property { name: "checkState"; type: "Qt::CheckState" } - Property { name: "nextCheckState"; revision: 4; type: "QJSValue" } - Signal { name: "nextCheckStateChanged"; revision: 4 } } Component { name: "QQuickComboBox" @@ -272,32 +133,37 @@ exports: [ "QtQuick.Templates/ComboBox 2.0", "QtQuick.Templates/ComboBox 2.1", - "QtQuick.Templates/ComboBox 2.2", - "QtQuick.Templates/ComboBox 2.5" + "QtQuick.Templates/ComboBox 2.2" ] - exportMetaObjectRevisions: [0, 1, 2, 5] + exportMetaObjectRevisions: [0, 1, 2] Property { name: "count"; type: "int"; isReadonly: true } Property { name: "model"; type: "QVariant" } Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true } + Property { name: "editable"; revision: 2; type: "bool" } + Property { name: "flat"; revision: 1; type: "bool" } + Property { name: "down"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "highlightedIndex"; type: "int"; isReadonly: true } Property { name: "currentIndex"; type: "int" } Property { name: "currentText"; type: "string"; isReadonly: true } Property { name: "displayText"; type: "string" } + Property { name: "editText"; revision: 2; type: "string" } Property { name: "textRole"; type: "string" } Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "indicator"; type: "QQuickItem"; isPointer: true } Property { name: "popup"; type: "QQuickPopup"; isPointer: true } - Property { name: "flat"; revision: 1; type: "bool" } - Property { name: "down"; revision: 2; type: "bool" } - Property { name: "editable"; revision: 2; type: "bool" } - Property { name: "editText"; revision: 2; type: "string" } Property { name: "validator"; revision: 2; type: "QValidator"; isPointer: true } Property { name: "inputMethodHints"; revision: 2; type: "Qt::InputMethodHints" } Property { name: "inputMethodComposing"; revision: 2; type: "bool"; isReadonly: true } Property { name: "acceptableInput"; revision: 2; type: "bool"; isReadonly: true } - Property { name: "implicitIndicatorWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitIndicatorHeight"; revision: 5; type: "double"; isReadonly: true } + Signal { name: "editableChanged"; revision: 2 } + Signal { name: "flatChanged"; revision: 1 } + Signal { name: "downChanged"; revision: 2 } + Signal { name: "editTextChanged"; revision: 2 } + Signal { name: "validatorChanged"; revision: 2 } + Signal { name: "inputMethodHintsChanged"; revision: 2 } + Signal { name: "inputMethodComposingChanged"; revision: 2 } + Signal { name: "acceptableInputChanged"; revision: 2 } Signal { name: "activated" Parameter { name: "index"; type: "int" } @@ -306,17 +172,7 @@ name: "highlighted" Parameter { name: "index"; type: "int" } } - Signal { name: "flatChanged"; revision: 1 } Signal { name: "accepted"; revision: 2 } - Signal { name: "downChanged"; revision: 2 } - Signal { name: "editableChanged"; revision: 2 } - Signal { name: "editTextChanged"; revision: 2 } - Signal { name: "validatorChanged"; revision: 2 } - Signal { name: "inputMethodHintsChanged"; revision: 2 } - Signal { name: "inputMethodComposingChanged"; revision: 2 } - Signal { name: "acceptableInputChanged"; revision: 2 } - Signal { name: "implicitIndicatorWidthChanged"; revision: 5 } - Signal { name: "implicitIndicatorHeightChanged"; revision: 5 } Method { name: "incrementCurrentIndex" } Method { name: "decrementCurrentIndex" } Method { name: "selectAll"; revision: 2 } @@ -343,21 +199,15 @@ prototype: "QQuickControl" exports: [ "QtQuick.Templates/Container 2.0", - "QtQuick.Templates/Container 2.1", - "QtQuick.Templates/Container 2.3", - "QtQuick.Templates/Container 2.5" + "QtQuick.Templates/Container 2.1" ] - exportMetaObjectRevisions: [0, 1, 3, 5] + exportMetaObjectRevisions: [0, 1] Property { name: "count"; type: "int"; isReadonly: true } Property { name: "contentModel"; type: "QVariant"; isReadonly: true } Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } Property { name: "currentIndex"; type: "int" } Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "contentWidth"; revision: 5; type: "double" } - Property { name: "contentHeight"; revision: 5; type: "double" } - Signal { name: "contentWidthChanged"; revision: 5 } - Signal { name: "contentHeightChanged"; revision: 5 } Method { name: "setCurrentIndex" Parameter { name: "index"; type: "int" } @@ -385,26 +235,15 @@ } Method { name: "removeItem" - Parameter { name: "item"; type: "QVariant" } - } - Method { - name: "takeItem" - revision: 3 - type: "QQuickItem*" Parameter { name: "index"; type: "int" } } } - Component { name: "QQuickContentItem"; defaultProperty: "data"; prototype: "QQuickItem" } Component { name: "QQuickControl" defaultProperty: "data" prototype: "QQuickItem" - exports: [ - "QtQuick.Templates/Control 2.0", - "QtQuick.Templates/Control 2.3", - "QtQuick.Templates/Control 2.5" - ] - exportMetaObjectRevisions: [0, 3, 5] + exports: ["QtQuick.Templates/Control 2.0"] + exportMetaObjectRevisions: [0] Property { name: "font"; type: "QFont" } Property { name: "availableWidth"; type: "double"; isReadonly: true } Property { name: "availableHeight"; type: "double"; isReadonly: true } @@ -424,29 +263,6 @@ Property { name: "wheelEnabled"; type: "bool" } Property { name: "background"; type: "QQuickItem"; isPointer: true } Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } - Property { name: "baselineOffset"; type: "double" } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "horizontalPadding"; revision: 5; type: "double" } - Property { name: "verticalPadding"; revision: 5; type: "double" } - Property { name: "implicitContentWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitContentHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "topInset"; revision: 5; type: "double" } - Property { name: "leftInset"; revision: 5; type: "double" } - Property { name: "rightInset"; revision: 5; type: "double" } - Property { name: "bottomInset"; revision: 5; type: "double" } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "horizontalPaddingChanged"; revision: 5 } - Signal { name: "verticalPaddingChanged"; revision: 5 } - Signal { name: "implicitContentWidthChanged"; revision: 5 } - Signal { name: "implicitContentHeightChanged"; revision: 5 } - Signal { name: "implicitBackgroundWidthChanged"; revision: 5 } - Signal { name: "implicitBackgroundHeightChanged"; revision: 5 } - Signal { name: "topInsetChanged"; revision: 5 } - Signal { name: "leftInsetChanged"; revision: 5 } - Signal { name: "rightInsetChanged"; revision: 5 } - Signal { name: "bottomInsetChanged"; revision: 5 } } Component { name: "QQuickDelayButton" @@ -463,12 +279,8 @@ name: "QQuickDial" defaultProperty: "data" prototype: "QQuickControl" - exports: [ - "QtQuick.Templates/Dial 2.0", - "QtQuick.Templates/Dial 2.2", - "QtQuick.Templates/Dial 2.5" - ] - exportMetaObjectRevisions: [0, 2, 5] + exports: ["QtQuick.Templates/Dial 2.0", "QtQuick.Templates/Dial 2.2"] + exportMetaObjectRevisions: [0, 2] Enum { name: "SnapMode" values: { @@ -477,14 +289,6 @@ "SnapOnRelease": 2 } } - Enum { - name: "InputMode" - values: { - "Circular": 0, - "Horizontal": 1, - "Vertical": 2 - } - } Property { name: "from"; type: "double" } Property { name: "to"; type: "double" } Property { name: "value"; type: "double" } @@ -494,12 +298,10 @@ Property { name: "snapMode"; type: "SnapMode" } Property { name: "wrap"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } - Property { name: "handle"; type: "QQuickItem"; isPointer: true } Property { name: "live"; revision: 2; type: "bool" } - Property { name: "inputMode"; revision: 5; type: "InputMode" } - Signal { name: "moved"; revision: 2 } + Property { name: "handle"; type: "QQuickItem"; isPointer: true } Signal { name: "liveChanged"; revision: 2 } - Signal { name: "inputModeChanged"; revision: 5 } + Signal { name: "moved"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } } @@ -507,58 +309,23 @@ name: "QQuickDialog" defaultProperty: "contentData" prototype: "QQuickPopup" - exports: [ - "QtQuick.Templates/Dialog 2.1", - "QtQuick.Templates/Dialog 2.3", - "QtQuick.Templates/Dialog 2.5" - ] - exportMetaObjectRevisions: [0, 3, 5] - Enum { - name: "StandardCode" - values: { - "Rejected": 0, - "Accepted": 1 - } - } + exports: ["QtQuick.Templates/Dialog 2.1"] + exportMetaObjectRevisions: [0] Property { name: "title"; type: "string" } Property { name: "header"; type: "QQuickItem"; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isPointer: true } Property { name: "standardButtons"; type: "QPlatformDialogHelper::StandardButtons" } - Property { name: "result"; revision: 3; type: "int" } - Property { name: "implicitHeaderWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitHeaderHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitFooterWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitFooterHeight"; revision: 5; type: "double"; isReadonly: true } Signal { name: "accepted" } Signal { name: "rejected" } - Signal { name: "applied"; revision: 3 } - Signal { name: "reset"; revision: 3 } - Signal { name: "discarded"; revision: 3 } - Signal { name: "helpRequested"; revision: 3 } - Signal { name: "resultChanged"; revision: 3 } Method { name: "accept" } Method { name: "reject" } - Method { - name: "done" - Parameter { name: "result"; type: "int" } - } - Method { - name: "standardButton" - revision: 3 - type: "QQuickAbstractButton*" - Parameter { name: "button"; type: "QPlatformDialogHelper::StandardButton" } - } } Component { name: "QQuickDialogButtonBox" defaultProperty: "contentData" prototype: "QQuickContainer" - exports: [ - "QtQuick.Templates/DialogButtonBox 2.1", - "QtQuick.Templates/DialogButtonBox 2.3", - "QtQuick.Templates/DialogButtonBox 2.5" - ] - exportMetaObjectRevisions: [0, 3, 5] + exports: ["QtQuick.Templates/DialogButtonBox 2.1"] + exportMetaObjectRevisions: [0] attachedType: "QQuickDialogButtonBoxAttached" Enum { name: "Position" @@ -571,7 +338,6 @@ Property { name: "alignment"; type: "Qt::Alignment" } Property { name: "standardButtons"; type: "QPlatformDialogHelper::StandardButtons" } Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } - Property { name: "buttonLayout"; revision: 5; type: "QPlatformDialogHelper::ButtonLayout" } Signal { name: "accepted" } Signal { name: "rejected" } Signal { name: "helpRequested" } @@ -579,10 +345,6 @@ name: "clicked" Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } } - Signal { name: "applied"; revision: 3 } - Signal { name: "reset"; revision: 3 } - Signal { name: "discarded"; revision: 3 } - Signal { name: "buttonLayoutChanged"; revision: 5 } Method { name: "standardButton" type: "QQuickAbstractButton*" @@ -621,25 +383,10 @@ name: "QQuickGroupBox" defaultProperty: "contentData" prototype: "QQuickFrame" - exports: [ - "QtQuick.Templates/GroupBox 2.0", - "QtQuick.Templates/GroupBox 2.5" - ] - exportMetaObjectRevisions: [0, 5] + exports: ["QtQuick.Templates/GroupBox 2.0"] + exportMetaObjectRevisions: [0] Property { name: "title"; type: "string" } Property { name: "label"; type: "QQuickItem"; isPointer: true } - Property { name: "implicitLabelWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitLabelHeight"; revision: 5; type: "double"; isReadonly: true } - Signal { name: "implicitLabelWidthChanged"; revision: 5 } - Signal { name: "implicitLabelHeightChanged"; revision: 5 } - } - Component { - name: "QQuickIcon" - Property { name: "name"; type: "string" } - Property { name: "source"; type: "QUrl" } - Property { name: "width"; type: "int" } - Property { name: "height"; type: "int" } - Property { name: "color"; type: "QColor" } } Component { name: "QQuickItemDelegate" @@ -653,56 +400,20 @@ name: "QQuickLabel" defaultProperty: "data" prototype: "QQuickText" - exports: [ - "QtQuick.Templates/Label 2.0", - "QtQuick.Templates/Label 2.3", - "QtQuick.Templates/Label 2.5" - ] - exportMetaObjectRevisions: [0, 3, 5] + exports: ["QtQuick.Templates/Label 2.0"] + exportMetaObjectRevisions: [0] Property { name: "font"; type: "QFont" } Property { name: "background"; type: "QQuickItem"; isPointer: true } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "topInset"; revision: 5; type: "double" } - Property { name: "leftInset"; revision: 5; type: "double" } - Property { name: "rightInset"; revision: 5; type: "double" } - Property { name: "bottomInset"; revision: 5; type: "double" } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "implicitBackgroundWidthChanged"; revision: 5 } - Signal { name: "implicitBackgroundHeightChanged"; revision: 5 } - Signal { name: "topInsetChanged"; revision: 5 } - Signal { name: "leftInsetChanged"; revision: 5 } - Signal { name: "rightInsetChanged"; revision: 5 } - Signal { name: "bottomInsetChanged"; revision: 5 } } Component { name: "QQuickMenu" defaultProperty: "contentData" prototype: "QQuickPopup" - exports: ["QtQuick.Templates/Menu 2.0", "QtQuick.Templates/Menu 2.3"] - exportMetaObjectRevisions: [0, 3] + exports: ["QtQuick.Templates/Menu 2.0"] + exportMetaObjectRevisions: [0] Property { name: "contentModel"; type: "QVariant"; isReadonly: true } Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } Property { name: "title"; type: "string" } - Property { name: "count"; revision: 3; type: "int"; isReadonly: true } - Property { name: "cascade"; revision: 3; type: "bool" } - Property { name: "overlap"; revision: 3; type: "double" } - Property { name: "delegate"; revision: 3; type: "QQmlComponent"; isPointer: true } - Property { name: "currentIndex"; revision: 3; type: "int" } - Signal { - name: "titleChanged" - Parameter { name: "title"; type: "string" } - } - Signal { name: "countChanged"; revision: 3 } - Signal { - name: "cascadeChanged" - revision: 3 - Parameter { name: "cascade"; type: "bool" } - } - Signal { name: "overlapChanged"; revision: 3 } - Signal { name: "delegateChanged"; revision: 3 } - Signal { name: "currentIndexChanged"; revision: 3 } Method { name: "itemAt" type: "QQuickItem*" @@ -724,140 +435,17 @@ } Method { name: "removeItem" - Parameter { name: "item"; type: "QVariant" } - } - Method { - name: "takeItem" - revision: 3 - type: "QQuickItem*" - Parameter { name: "index"; type: "int" } - } - Method { - name: "menuAt" - revision: 3 - type: "QQuickMenu*" - Parameter { name: "index"; type: "int" } - } - Method { - name: "addMenu" - revision: 3 - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "insertMenu" - revision: 3 - Parameter { name: "index"; type: "int" } - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "removeMenu" - revision: 3 - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "takeMenu" - revision: 3 - type: "QQuickMenu*" - Parameter { name: "index"; type: "int" } - } - Method { - name: "actionAt" - revision: 3 - type: "QQuickAction*" Parameter { name: "index"; type: "int" } } - Method { - name: "addAction" - revision: 3 - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - Method { - name: "insertAction" - revision: 3 - Parameter { name: "index"; type: "int" } - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - Method { - name: "removeAction" - revision: 3 - Parameter { name: "action"; type: "QQuickAction"; isPointer: true } - } - Method { - name: "takeAction" - revision: 3 - type: "QQuickAction*" - Parameter { name: "index"; type: "int" } - } - Method { - name: "popup" - revision: 3 - Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } - } - Method { name: "dismiss"; revision: 3 } - } - Component { - name: "QQuickMenuBar" - defaultProperty: "contentData" - prototype: "QQuickContainer" - exports: ["QtQuick.Templates/MenuBar 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } - Property { name: "contentWidth"; type: "double" } - Property { name: "contentHeight"; type: "double" } - Property { name: "menus"; type: "QQuickMenu"; isList: true; isReadonly: true } - Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } - Method { - name: "menuAt" - type: "QQuickMenu*" - Parameter { name: "index"; type: "int" } - } - Method { - name: "addMenu" - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "insertMenu" - Parameter { name: "index"; type: "int" } - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "removeMenu" - Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } - } - Method { - name: "takeMenu" - type: "QQuickMenu*" - Parameter { name: "index"; type: "int" } - } - } - Component { - name: "QQuickMenuBarItem" - defaultProperty: "data" - prototype: "QQuickAbstractButton" - exports: ["QtQuick.Templates/MenuBarItem 2.3"] - exportMetaObjectRevisions: [0] - Property { name: "menuBar"; type: "QQuickMenuBar"; isReadonly: true; isPointer: true } - Property { name: "menu"; type: "QQuickMenu"; isPointer: true } - Property { name: "highlighted"; type: "bool" } - Signal { name: "triggered" } } Component { name: "QQuickMenuItem" defaultProperty: "data" prototype: "QQuickAbstractButton" - exports: [ - "QtQuick.Templates/MenuItem 2.0", - "QtQuick.Templates/MenuItem 2.3" - ] - exportMetaObjectRevisions: [0, 3] + exports: ["QtQuick.Templates/MenuItem 2.0"] + exportMetaObjectRevisions: [0] Property { name: "highlighted"; type: "bool" } - Property { name: "arrow"; revision: 3; type: "QQuickItem"; isPointer: true } - Property { name: "menu"; revision: 3; type: "QQuickMenu"; isReadonly: true; isPointer: true } - Property { name: "subMenu"; revision: 3; type: "QQuickMenu"; isReadonly: true; isPointer: true } Signal { name: "triggered" } - Signal { name: "arrowChanged"; revision: 3 } - Signal { name: "menuChanged"; revision: 3 } - Signal { name: "subMenuChanged"; revision: 3 } } Component { name: "QQuickMenuSeparator" @@ -870,19 +458,6 @@ name: "QQuickOverlay" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtQuick.Templates/Overlay 2.3"] - isCreatable: false - exportMetaObjectRevisions: [0] - attachedType: "QQuickOverlayAttached" - Property { name: "modal"; type: "QQmlComponent"; isPointer: true } - Property { name: "modeless"; type: "QQmlComponent"; isPointer: true } - Signal { name: "pressed" } - Signal { name: "released" } - } - Component { - name: "QQuickOverlayAttached" - prototype: "QObject" - Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } Property { name: "modal"; type: "QQmlComponent"; isPointer: true } Property { name: "modeless"; type: "QQmlComponent"; isPointer: true } Signal { name: "pressed" } @@ -891,22 +466,18 @@ Component { name: "QQuickPage" defaultProperty: "contentData" - prototype: "QQuickPane" - exports: [ - "QtQuick.Templates/Page 2.0", - "QtQuick.Templates/Page 2.1", - "QtQuick.Templates/Page 2.5" - ] - exportMetaObjectRevisions: [0, 1, 5] + prototype: "QQuickControl" + exports: ["QtQuick.Templates/Page 2.0", "QtQuick.Templates/Page 2.1"] + exportMetaObjectRevisions: [0, 1] Property { name: "title"; type: "string" } Property { name: "header"; type: "QQuickItem"; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isPointer: true } Property { name: "contentWidth"; revision: 1; type: "double" } Property { name: "contentHeight"; revision: 1; type: "double" } - Property { name: "implicitHeaderWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitHeaderHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitFooterWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitFooterHeight"; revision: 5; type: "double"; isReadonly: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + Signal { name: "contentWidthChanged"; revision: 1 } + Signal { name: "contentHeightChanged"; revision: 1 } } Component { name: "QQuickPageIndicator" @@ -936,11 +507,9 @@ prototype: "QObject" exports: [ "QtQuick.Templates/Popup 2.0", - "QtQuick.Templates/Popup 2.1", - "QtQuick.Templates/Popup 2.3", - "QtQuick.Templates/Popup 2.5" + "QtQuick.Templates/Popup 2.1" ] - exportMetaObjectRevisions: [0, 1, 3, 5] + exportMetaObjectRevisions: [0, 1] Enum { name: "ClosePolicy" values: { @@ -977,6 +546,7 @@ Property { name: "contentHeight"; type: "double" } Property { name: "availableWidth"; type: "double"; isReadonly: true } Property { name: "availableHeight"; type: "double"; isReadonly: true } + Property { name: "spacing"; revision: 1; type: "double" } Property { name: "margins"; type: "double" } Property { name: "topMargin"; type: "double" } Property { name: "leftMargin"; type: "double" } @@ -1006,51 +576,15 @@ Property { name: "transformOrigin"; type: "TransformOrigin" } Property { name: "enter"; type: "QQuickTransition"; isPointer: true } Property { name: "exit"; type: "QQuickTransition"; isPointer: true } - Property { name: "spacing"; revision: 1; type: "double" } - Property { name: "opened"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "mirrored"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "enabled"; revision: 3; type: "bool" } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "horizontalPadding"; type: "double" } - Property { name: "verticalPadding"; type: "double" } - Property { - name: "anchors" - revision: 5 - type: "QQuickPopupAnchors" - isReadonly: true - isPointer: true - } - Property { name: "implicitContentWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitContentHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "topInset"; revision: 5; type: "double" } - Property { name: "leftInset"; revision: 5; type: "double" } - Property { name: "rightInset"; revision: 5; type: "double" } - Property { name: "bottomInset"; revision: 5; type: "double" } - Signal { name: "opened" } - Signal { name: "closed" } - Signal { name: "aboutToShow" } - Signal { name: "aboutToHide" } + Signal { name: "spacingChanged"; revision: 1 } Signal { name: "windowChanged" Parameter { name: "window"; type: "QQuickWindow"; isPointer: true } } - Signal { name: "spacingChanged"; revision: 1 } - Signal { name: "openedChanged"; revision: 3 } - Signal { name: "mirroredChanged"; revision: 3 } - Signal { name: "enabledChanged"; revision: 3 } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "horizontalPaddingChanged"; revision: 5 } - Signal { name: "verticalPaddingChanged"; revision: 5 } - Signal { name: "implicitContentWidthChanged"; revision: 5 } - Signal { name: "implicitContentHeightChanged"; revision: 5 } - Signal { name: "implicitBackgroundWidthChanged"; revision: 5 } - Signal { name: "implicitBackgroundHeightChanged"; revision: 5 } - Signal { name: "topInsetChanged"; revision: 5 } - Signal { name: "leftInsetChanged"; revision: 5 } - Signal { name: "rightInsetChanged"; revision: 5 } - Signal { name: "bottomInsetChanged"; revision: 5 } + Signal { name: "aboutToShow" } + Signal { name: "aboutToHide" } + Signal { name: "opened" } + Signal { name: "closed" } Method { name: "open" } Method { name: "close" } Method { @@ -1060,12 +594,6 @@ Method { name: "forceActiveFocus" } } Component { - name: "QQuickPopupAnchors" - prototype: "QObject" - Property { name: "centerIn"; type: "QQuickItem"; isPointer: true } - } - Component { name: "QQuickPopupItem"; defaultProperty: "contentData"; prototype: "QQuickPage" } - Component { name: "QQuickProgressBar" defaultProperty: "data" prototype: "QQuickControl" @@ -1099,11 +627,9 @@ exports: [ "QtQuick.Templates/RangeSlider 2.0", "QtQuick.Templates/RangeSlider 2.1", - "QtQuick.Templates/RangeSlider 2.2", - "QtQuick.Templates/RangeSlider 2.3", - "QtQuick.Templates/RangeSlider 2.5" + "QtQuick.Templates/RangeSlider 2.2" ] - exportMetaObjectRevisions: [0, 1, 2, 3, 5] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "SnapMode" values: { @@ -1120,22 +646,12 @@ Property { name: "snapMode"; type: "SnapMode" } Property { name: "orientation"; type: "Qt::Orientation" } Property { name: "live"; revision: 2; type: "bool" } - Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "touchDragThreshold"; revision: 5; type: "double" } Signal { name: "liveChanged"; revision: 2 } - Signal { name: "touchDragThresholdChanged"; revision: 5 } Method { name: "setValues" Parameter { name: "firstValue"; type: "double" } Parameter { name: "secondValue"; type: "double" } } - Method { - name: "valueAt" - revision: 5 - type: "double" - Parameter { name: "position"; type: "double" } - } } Component { name: "QQuickRangeSliderNode" @@ -1146,10 +662,7 @@ Property { name: "handle"; type: "QQuickItem"; isPointer: true } Property { name: "pressed"; type: "bool" } Property { name: "hovered"; revision: 1; type: "bool" } - Property { name: "implicitHandleWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitHandleHeight"; revision: 5; type: "double"; isReadonly: true } Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "moved" } Method { name: "increase" } Method { name: "decrease" } } @@ -1158,7 +671,7 @@ defaultProperty: "data" prototype: "QQuickButton" exports: ["QtQuick.Templates/RoundButton 2.1"] - exportMetaObjectRevisions: [0] + exportMetaObjectRevisions: [1] Property { name: "radius"; type: "double" } } Component { @@ -1167,11 +680,9 @@ prototype: "QQuickControl" exports: [ "QtQuick.Templates/ScrollBar 2.0", - "QtQuick.Templates/ScrollBar 2.2", - "QtQuick.Templates/ScrollBar 2.3", - "QtQuick.Templates/ScrollBar 2.4" + "QtQuick.Templates/ScrollBar 2.2" ] - exportMetaObjectRevisions: [0, 2, 3, 4] + exportMetaObjectRevisions: [0, 2] attachedType: "QQuickScrollBarAttached" Enum { name: "SnapMode" @@ -1198,17 +709,9 @@ Property { name: "snapMode"; revision: 2; type: "SnapMode" } Property { name: "interactive"; revision: 2; type: "bool" } Property { name: "policy"; revision: 2; type: "Policy" } - Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "minimumSize"; revision: 4; type: "double" } - Property { name: "visualSize"; revision: 4; type: "double"; isReadonly: true } - Property { name: "visualPosition"; revision: 4; type: "double"; isReadonly: true } Signal { name: "snapModeChanged"; revision: 2 } Signal { name: "interactiveChanged"; revision: 2 } Signal { name: "policyChanged"; revision: 2 } - Signal { name: "minimumSizeChanged"; revision: 4 } - Signal { name: "visualSizeChanged"; revision: 4 } - Signal { name: "visualPositionChanged"; revision: 4 } Method { name: "increase" } Method { name: "decrease" } Method { @@ -1230,25 +733,13 @@ name: "QQuickScrollIndicator" defaultProperty: "data" prototype: "QQuickControl" - exports: [ - "QtQuick.Templates/ScrollIndicator 2.0", - "QtQuick.Templates/ScrollIndicator 2.3", - "QtQuick.Templates/ScrollIndicator 2.4" - ] - exportMetaObjectRevisions: [0, 3, 4] + exports: ["QtQuick.Templates/ScrollIndicator 2.0"] + exportMetaObjectRevisions: [0] attachedType: "QQuickScrollIndicatorAttached" Property { name: "size"; type: "double" } Property { name: "position"; type: "double" } Property { name: "active"; type: "bool" } Property { name: "orientation"; type: "Qt::Orientation" } - Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "minimumSize"; revision: 4; type: "double" } - Property { name: "visualSize"; revision: 4; type: "double"; isReadonly: true } - Property { name: "visualPosition"; revision: 4; type: "double"; isReadonly: true } - Signal { name: "minimumSizeChanged"; revision: 4 } - Signal { name: "visualSizeChanged"; revision: 4 } - Signal { name: "visualPositionChanged"; revision: 4 } Method { name: "setSize" Parameter { name: "size"; type: "double" } @@ -1267,9 +758,13 @@ Component { name: "QQuickScrollView" defaultProperty: "contentData" - prototype: "QQuickPane" + prototype: "QQuickControl" exports: ["QtQuick.Templates/ScrollView 2.2"] exportMetaObjectRevisions: [0] + Property { name: "contentWidth"; type: "double" } + Property { name: "contentHeight"; type: "double" } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } } Component { name: "QQuickSlider" @@ -1278,11 +773,9 @@ exports: [ "QtQuick.Templates/Slider 2.0", "QtQuick.Templates/Slider 2.1", - "QtQuick.Templates/Slider 2.2", - "QtQuick.Templates/Slider 2.3", - "QtQuick.Templates/Slider 2.5" + "QtQuick.Templates/Slider 2.2" ] - exportMetaObjectRevisions: [0, 1, 2, 3, 5] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "SnapMode" values: { @@ -1298,20 +791,12 @@ Property { name: "visualPosition"; type: "double"; isReadonly: true } Property { name: "stepSize"; type: "double" } Property { name: "snapMode"; type: "SnapMode" } + Property { name: "live"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "orientation"; type: "Qt::Orientation" } Property { name: "handle"; type: "QQuickItem"; isPointer: true } - Property { name: "live"; revision: 2; type: "bool" } - Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "touchDragThreshold"; revision: 5; type: "double" } - Property { name: "implicitHandleWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitHandleHeight"; revision: 5; type: "double"; isReadonly: true } - Signal { name: "moved"; revision: 2 } Signal { name: "liveChanged"; revision: 2 } - Signal { name: "touchDragThresholdChanged"; revision: 5 } - Signal { name: "implicitHandleWidthChanged"; revision: 5 } - Signal { name: "implicitHandleHeightChanged"; revision: 5 } + Signal { name: "moved"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } Method { @@ -1328,12 +813,9 @@ exports: [ "QtQuick.Templates/SpinBox 2.0", "QtQuick.Templates/SpinBox 2.1", - "QtQuick.Templates/SpinBox 2.2", - "QtQuick.Templates/SpinBox 2.3", - "QtQuick.Templates/SpinBox 2.4", - "QtQuick.Templates/SpinBox 2.5" + "QtQuick.Templates/SpinBox 2.2" ] - exportMetaObjectRevisions: [0, 1, 2, 3, 4, 5] + exportMetaObjectRevisions: [0, 1, 2] Property { name: "from"; type: "int" } Property { name: "to"; type: "int" } Property { name: "value"; type: "int" } @@ -1346,13 +828,9 @@ Property { name: "down"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true } Property { name: "inputMethodHints"; revision: 2; type: "Qt::InputMethodHints" } Property { name: "inputMethodComposing"; revision: 2; type: "bool"; isReadonly: true } - Property { name: "wrap"; revision: 3; type: "bool" } - Property { name: "displayText"; revision: 4; type: "string"; isReadonly: true } Signal { name: "valueModified"; revision: 2 } Signal { name: "inputMethodHintsChanged"; revision: 2 } Signal { name: "inputMethodComposingChanged"; revision: 2 } - Signal { name: "wrapChanged"; revision: 3 } - Signal { name: "displayTextChanged"; revision: 4 } Method { name: "increase" } Method { name: "decrease" } } @@ -1360,13 +838,9 @@ name: "QQuickSpinButton" prototype: "QObject" Property { name: "pressed"; type: "bool" } - Property { name: "indicator"; type: "QQuickItem"; isPointer: true } Property { name: "hovered"; revision: 1; type: "bool" } - Property { name: "implicitIndicatorWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitIndicatorHeight"; revision: 5; type: "double"; isReadonly: true } + Property { name: "indicator"; type: "QQuickItem"; isPointer: true } Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "implicitIndicatorWidthChanged"; revision: 5 } - Signal { name: "implicitIndicatorHeightChanged"; revision: 5 } } Component { name: "QQuickStackView" @@ -1407,19 +881,13 @@ Property { name: "busy"; type: "bool"; isReadonly: true } Property { name: "depth"; type: "int"; isReadonly: true } Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "initialItem"; type: "QJSValue" } + Property { name: "initialItem"; type: "QVariant" } Property { name: "popEnter"; type: "QQuickTransition"; isPointer: true } Property { name: "popExit"; type: "QQuickTransition"; isPointer: true } Property { name: "pushEnter"; type: "QQuickTransition"; isPointer: true } Property { name: "pushExit"; type: "QQuickTransition"; isPointer: true } Property { name: "replaceEnter"; type: "QQuickTransition"; isPointer: true } Property { name: "replaceExit"; type: "QQuickTransition"; isPointer: true } - Property { name: "empty"; revision: 3; type: "bool"; isReadonly: true } - Signal { name: "emptyChanged"; revision: 3 } - Method { - name: "clear" - Parameter { name: "operation"; type: "Operation" } - } Method { name: "clear" } Method { name: "get" @@ -1474,23 +942,23 @@ prototype: "QObject" Property { name: "position"; type: "double" } Property { name: "complete"; type: "bool"; isReadonly: true } + Property { name: "enabled"; type: "bool" } Property { name: "left"; type: "QQmlComponent"; isPointer: true } Property { name: "behind"; type: "QQmlComponent"; isPointer: true } Property { name: "right"; type: "QQmlComponent"; isPointer: true } Property { name: "leftItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "behindItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "rightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } - Property { name: "enabled"; type: "bool" } Property { name: "transition"; type: "QQuickTransition"; isPointer: true } Signal { name: "completed" } Signal { name: "opened" } Signal { name: "closed" } - Method { name: "close"; revision: 1 } Method { name: "open" revision: 2 Parameter { name: "side"; type: "QQuickSwipeDelegate::Side" } } + Method { name: "close"; revision: 1 } } Component { name: "QQuickSwipeDelegate" @@ -1531,8 +999,6 @@ attachedType: "QQuickSwipeViewAttached" Property { name: "interactive"; revision: 1; type: "bool" } Property { name: "orientation"; revision: 2; type: "Qt::Orientation" } - Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } Signal { name: "interactiveChanged"; revision: 1 } Signal { name: "orientationChanged"; revision: 2 } } @@ -1541,9 +1007,9 @@ prototype: "QObject" Property { name: "index"; type: "int"; isReadonly: true } Property { name: "isCurrentItem"; type: "bool"; isReadonly: true } - Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true } Property { name: "isNextItem"; revision: 1; type: "bool"; isReadonly: true } Property { name: "isPreviousItem"; revision: 1; type: "bool"; isReadonly: true } + Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true } } Component { name: "QQuickSwitch" @@ -1572,7 +1038,6 @@ "QtQuick.Templates/TabBar 2.2" ] exportMetaObjectRevisions: [0, 2] - attachedType: "QQuickTabBarAttached" Enum { name: "Position" values: { @@ -1583,13 +1048,8 @@ Property { name: "position"; type: "Position" } Property { name: "contentWidth"; revision: 2; type: "double" } Property { name: "contentHeight"; revision: 2; type: "double" } - } - Component { - name: "QQuickTabBarAttached" - prototype: "QObject" - Property { name: "index"; type: "int"; isReadonly: true } - Property { name: "tabBar"; type: "QQuickTabBar"; isReadonly: true; isPointer: true } - Property { name: "position"; type: "QQuickTabBar::Position"; isReadonly: true } + Signal { name: "contentWidthChanged"; revision: 2 } + Signal { name: "contentHeightChanged"; revision: 2 } } Component { name: "QQuickTabButton" @@ -1604,11 +1064,9 @@ prototype: "QQuickTextEdit" exports: [ "QtQuick.Templates/TextArea 2.0", - "QtQuick.Templates/TextArea 2.1", - "QtQuick.Templates/TextArea 2.3", - "QtQuick.Templates/TextArea 2.5" + "QtQuick.Templates/TextArea 2.1" ] - exportMetaObjectRevisions: [0, 1, 3, 5] + exportMetaObjectRevisions: [0, 1] attachedType: "QQuickTextAreaAttached" Property { name: "font"; type: "QFont" } Property { name: "implicitWidth"; type: "double" } @@ -1618,16 +1076,10 @@ Property { name: "focusReason"; type: "Qt::FocusReason" } Property { name: "hovered"; revision: 1; type: "bool"; isReadonly: true } Property { name: "hoverEnabled"; revision: 1; type: "bool" } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "placeholderTextColor"; revision: 5; type: "QColor" } - Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "topInset"; revision: 5; type: "double" } - Property { name: "leftInset"; revision: 5; type: "double" } - Property { name: "rightInset"; revision: 5; type: "double" } - Property { name: "bottomInset"; revision: 5; type: "double" } Signal { name: "implicitWidthChanged3" } Signal { name: "implicitHeightChanged3" } + Signal { name: "hoveredChanged"; revision: 1 } + Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "pressAndHold" Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } @@ -1642,16 +1094,6 @@ revision: 1 Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } } - Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "hoverEnabledChanged"; revision: 1 } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "placeholderTextColorChanged"; revision: 5 } - Signal { name: "implicitBackgroundWidthChanged"; revision: 5 } - Signal { name: "implicitBackgroundHeightChanged"; revision: 5 } - Signal { name: "topInsetChanged"; revision: 5 } - Signal { name: "leftInsetChanged"; revision: 5 } - Signal { name: "rightInsetChanged"; revision: 5 } - Signal { name: "bottomInsetChanged"; revision: 5 } } Component { name: "QQuickTextAreaAttached" @@ -1664,11 +1106,9 @@ prototype: "QQuickTextInput" exports: [ "QtQuick.Templates/TextField 2.0", - "QtQuick.Templates/TextField 2.1", - "QtQuick.Templates/TextField 2.3", - "QtQuick.Templates/TextField 2.5" + "QtQuick.Templates/TextField 2.1" ] - exportMetaObjectRevisions: [0, 1, 3, 5] + exportMetaObjectRevisions: [0, 1] Property { name: "font"; type: "QFont" } Property { name: "implicitWidth"; type: "double" } Property { name: "implicitHeight"; type: "double" } @@ -1677,16 +1117,10 @@ Property { name: "focusReason"; type: "Qt::FocusReason" } Property { name: "hovered"; revision: 1; type: "bool"; isReadonly: true } Property { name: "hoverEnabled"; revision: 1; type: "bool" } - Property { name: "palette"; revision: 3; type: "QPalette" } - Property { name: "placeholderTextColor"; revision: 5; type: "QColor" } - Property { name: "implicitBackgroundWidth"; revision: 5; type: "double"; isReadonly: true } - Property { name: "implicitBackgroundHeight"; revision: 5; type: "double"; isReadonly: true } - Property { name: "topInset"; revision: 5; type: "double" } - Property { name: "leftInset"; revision: 5; type: "double" } - Property { name: "rightInset"; revision: 5; type: "double" } - Property { name: "bottomInset"; revision: 5; type: "double" } Signal { name: "implicitWidthChanged3" } Signal { name: "implicitHeightChanged3" } + Signal { name: "hoveredChanged"; revision: 1 } + Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "pressAndHold" Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } @@ -1701,16 +1135,6 @@ revision: 1 Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } } - Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "hoverEnabledChanged"; revision: 1 } - Signal { name: "paletteChanged"; revision: 3 } - Signal { name: "placeholderTextColorChanged"; revision: 5 } - Signal { name: "implicitBackgroundWidthChanged"; revision: 5 } - Signal { name: "implicitBackgroundHeightChanged"; revision: 5 } - Signal { name: "topInsetChanged"; revision: 5 } - Signal { name: "leftInsetChanged"; revision: 5 } - Signal { name: "rightInsetChanged"; revision: 5 } - Signal { name: "bottomInsetChanged"; revision: 5 } } Component { name: "QQuickToolBar" @@ -1748,27 +1172,12 @@ name: "QQuickToolTip" defaultProperty: "contentData" prototype: "QQuickPopup" - exports: [ - "QtQuick.Templates/ToolTip 2.0", - "QtQuick.Templates/ToolTip 2.5" - ] - exportMetaObjectRevisions: [0, 5] + exports: ["QtQuick.Templates/ToolTip 2.0"] + exportMetaObjectRevisions: [0] attachedType: "QQuickToolTipAttached" Property { name: "delay"; type: "int" } Property { name: "timeout"; type: "int" } Property { name: "text"; type: "string" } - Method { - name: "show" - revision: 5 - Parameter { name: "text"; type: "string" } - Parameter { name: "ms"; type: "int" } - } - Method { - name: "show" - revision: 5 - Parameter { name: "text"; type: "string" } - } - Method { name: "hide"; revision: 5 } } Component { name: "QQuickToolTipAttached" @@ -1800,17 +1209,6 @@ ] exportMetaObjectRevisions: [0, 1, 2] attachedType: "QQuickTumblerAttached" - Enum { - name: "PositionMode" - values: { - "Beginning": 0, - "Center": 1, - "End": 2, - "Visible": 3, - "Contain": 4, - "SnapPosition": 5 - } - } Property { name: "model"; type: "QVariant" } Property { name: "count"; type: "int"; isReadonly: true } Property { name: "currentIndex"; type: "int" } @@ -1821,12 +1219,6 @@ Property { name: "moving"; revision: 2; type: "bool"; isReadonly: true } Signal { name: "wrapChanged"; revision: 1 } Signal { name: "movingChanged"; revision: 2 } - Method { - name: "positionViewAtIndex" - revision: 5 - Parameter { name: "index"; type: "int" } - Parameter { name: "mode"; type: "PositionMode" } - } } Component { name: "QQuickTumblerAttached" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/templates/qtquicktemplates2plugin.cpp qtquickcontrols2-opensource-src-5.9.5/src/imports/templates/qtquicktemplates2plugin.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/templates/qtquicktemplates2plugin.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/templates/qtquicktemplates2plugin.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -35,11 +35,8 @@ ****************************************************************************/ #include -#include #include -#include -#include #include #include #include @@ -56,21 +53,16 @@ #include #include #include -#include #include #include #include -#include -#include #include #include #include #include #include -#include #include #include -#include #include #include #include @@ -100,6 +92,13 @@ #include #endif +static inline void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtQuick_Templates_2); +#endif +} + #if QT_CONFIG(shortcut) // qtdeclarative/src/quick/util/qquickshortcut.cpp typedef bool (*ShortcutContextMatcher)(QObject *, Qt::ShortcutContext); @@ -109,16 +108,6 @@ QT_BEGIN_NAMESPACE -static void initProviders() -{ - QQuickPaletteProvider::init(); -} - -static void cleanupProviders() -{ - QQuickPaletteProvider::cleanup(); -} - class QtQuickTemplates2Plugin: public QQmlExtensionPlugin { Q_OBJECT @@ -128,18 +117,18 @@ QtQuickTemplates2Plugin(QObject *parent = nullptr); ~QtQuickTemplates2Plugin(); - void registerTypes(const char *uri) override; + void registerTypes(const char *uri); private: - bool registered; #if QT_CONFIG(shortcut) ShortcutContextMatcher originalContextMatcher; #endif }; -QtQuickTemplates2Plugin::QtQuickTemplates2Plugin(QObject *parent) - : QQmlExtensionPlugin(parent), registered(false) +QtQuickTemplates2Plugin::QtQuickTemplates2Plugin(QObject *parent) : QQmlExtensionPlugin(parent) { + initResources(); + #if QT_CONFIG(shortcut) originalContextMatcher = qt_quick_shortcut_context_matcher(); qt_quick_set_shortcut_context_matcher(QQuickShortcutContext::matcher); @@ -148,9 +137,6 @@ QtQuickTemplates2Plugin::~QtQuickTemplates2Plugin() { - if (registered) - cleanupProviders(); - #if QT_CONFIG(shortcut) qt_quick_set_shortcut_context_matcher(originalContextMatcher); #endif @@ -158,16 +144,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) { - registered = true; - initProviders(); - - // Register the latest version, even if there are no new types or new revisions for existing types yet. - // Before Qt 5.12, we would do the following: - // - // qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... - // - // However, we want to align with the rest of Qt Quick which uses Qt's minor version. - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); + qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... // QtQuick.Templates 2.0 (originally introduced in Qt 5.7) qmlRegisterType(uri, 2, 0, "AbstractButton"); @@ -209,21 +186,21 @@ qmlRegisterType(); qmlRegisterType(uri, 2, 0, "StackView"); qmlRegisterType(); - qmlRegisterType(); qmlRegisterType(uri, 2, 0, "SwipeDelegate"); - qmlRegisterType(uri, 2, 0, "SwipeView"); + qmlRegisterType(); qmlRegisterType(); + qmlRegisterType(uri, 2, 0, "SwipeView"); qmlRegisterType(uri, 2, 0, "Switch"); qmlRegisterType(uri, 2, 0, "SwitchDelegate"); qmlRegisterType(uri, 2, 0, "TabBar"); qmlRegisterType(uri, 2, 0, "TabButton"); - qmlRegisterType(uri, 2, 0, "TextArea"); qmlRegisterType(); + qmlRegisterType(uri, 2, 0, "TextArea"); qmlRegisterType(uri, 2, 0, "TextField"); qmlRegisterType(uri, 2, 0, "ToolBar"); qmlRegisterType(uri, 2, 0, "ToolButton"); - qmlRegisterType(uri, 2, 0, "ToolTip"); qmlRegisterType(); + qmlRegisterType(uri, 2, 0, "ToolTip"); #if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview) qmlRegisterType(); qmlRegisterType(uri, 2, 0, "Tumbler"); @@ -232,10 +209,10 @@ // NOTE: register the latest revisions of all template/control base classes to // make revisioned properties available to their subclasses (synced with Qt 5.7) qmlRegisterRevision(uri, 2, 0); + qmlRegisterRevision(uri, 2, 0); qmlRegisterRevision(uri, 2, 0); qmlRegisterRevision(uri, 2, 0); qmlRegisterRevision(uri, 2, 0); - qmlRegisterRevision(uri, 2, 0); qmlRegisterRevision(uri, 2, 0); // QtQuick.Templates 2.1 (new types and revisions in Qt 5.8) @@ -285,68 +262,6 @@ qmlRegisterRevision(uri, 2, 2); qmlRegisterRevision(uri, 2, 2); qmlRegisterRevision(uri, 2, 2); - - // QtQuick.Templates 2.3 (new types and revisions in Qt 5.10) - qmlRegisterType(uri, 2, 3, "AbstractButton"); - qmlRegisterType(uri, 2, 3, "Action"); - qmlRegisterType(uri, 2, 3, "ActionGroup"); - qmlRegisterType(uri, 2, 3, "ApplicationWindow"); - qmlRegisterType(uri, 2, 3, "ButtonGroup"); - qmlRegisterType(uri, 2, 3, "Control"); - qmlRegisterType(uri, 2, 3, "Container"); - qmlRegisterType(uri, 2, 3, "Dialog"); - qmlRegisterType(uri, 2, 3, "DialogButtonBox"); - qmlRegisterType(); - qRegisterMetaType(); - qmlRegisterType(uri, 2, 3, "Label"); - qmlRegisterType(uri, 2, 3, "Menu"); - qmlRegisterType(uri, 2, 3, "MenuBar"); - qmlRegisterType(uri, 2, 3, "MenuBarItem"); - qmlRegisterType(uri, 2, 3, "MenuItem"); - qmlRegisterUncreatableType(uri, 2, 3, "Overlay", QStringLiteral("Overlay is only available as an attached property.")); - qmlRegisterType(); - qmlRegisterType(uri, 2, 3, "Popup"); - qmlRegisterType(uri, 2, 3, "RangeSlider"); - qmlRegisterType(uri, 2, 3, "ScrollBar"); - qmlRegisterType(uri, 2, 3, "ScrollIndicator"); - qmlRegisterType(uri, 2, 3, "Slider"); - qmlRegisterType(uri, 2, 3, "SpinBox"); - qmlRegisterType(uri, 2, 3, "TextArea"); - qmlRegisterType(uri, 2, 3, "TextField"); - - // NOTE: register the latest revisions of all template/control base classes to - // make revisioned properties available to their subclasses (synced with Qt 5.10) - qmlRegisterRevision(uri, 2, 3); - qmlRegisterRevision(uri, 2, 3); - - // QtQuick.Templates 2.4 (new types and revisions in Qt 5.11) - qmlRegisterType(uri, 2, 4, "AbstractButton"); - qmlRegisterType(uri, 2, 4, "ButtonGroup"); - qmlRegisterType(uri, 2, 4, "CheckBox"); - qmlRegisterType(uri, 2, 4, "CheckDelegate"); - qmlRegisterType(uri, 2, 4, "ScrollBar"); - qmlRegisterType(uri, 2, 4, "ScrollIndicator"); - qmlRegisterType(uri, 2, 4, "SpinBox"); - - // QtQuick.Templates 2.5 (new types and revisions in Qt 5.12) - qmlRegisterType(uri, 2, 5, "AbstractButton"); - qmlRegisterType(uri, 2, 5, "DialogButtonBox"); - qmlRegisterType(uri, 2, 5, "ComboBox"); - qmlRegisterType(uri, 2, 5, "Control"); - qmlRegisterType(uri, 2, 5, "Container"); - qmlRegisterType(uri, 2, 5, "Dial"); - qmlRegisterType(uri, 2, 5, "Dialog"); - qmlRegisterType(uri, 2, 5, "GroupBox"); - qmlRegisterType(uri, 2, 5, "Label"); - qmlRegisterType(uri, 2, 5, "Page"); - qmlRegisterType(uri, 2, 5, "Popup"); - qmlRegisterType(); - qmlRegisterType(uri, 2, 5, "RangeSlider"); - qmlRegisterType(uri, 2, 5, "Slider"); - qmlRegisterType(uri, 2, 5, "SpinBox"); - qmlRegisterType(uri, 2, 5, "TextArea"); - qmlRegisterType(uri, 2, 5, "TextField"); - qmlRegisterType(uri, 2, 5, "ToolTip"); } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/templates/templates.pro qtquickcontrols2-opensource-src-5.9.5/src/imports/templates/templates.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/imports/templates/templates.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/imports/templates/templates.pro 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ TARGET = qtquicktemplates2plugin TARGETPATH = QtQuick/Templates.2 -IMPORT_VERSION = 2.5 +IMPORT_VERSION = 2.2 QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/configure.json qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/configure.json --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/configure.json 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/configure.json 2018-03-21 07:59:29.000000000 +0000 @@ -3,8 +3,6 @@ "commandline": { "options": { - "style-fusion": { "type": "boolean", "name": "quickcontrols2-fusion" }, - "style-imagine": { "type": "boolean", "name": "quickcontrols2-imagine" }, "style-material": { "type": "boolean", "name": "quickcontrols2-material" }, "style-universal": { "type": "boolean", "name": "quickcontrols2-universal" } } @@ -15,20 +13,6 @@ "label": "Default", "output": [ "privateFeature" ] }, - "quickcontrols2-fusion": { - "label": "Fusion", - "purpose": "Provides the platform agnostic desktop-oriented Fusion style.", - "section": "Quick Controls 2", - "condition": "features.quickcontrols2-default", - "output": [ "privateFeature" ] - }, - "quickcontrols2-imagine": { - "label": "Imagine", - "purpose": "Provides a style based on configurable image assets.", - "section": "Quick Controls 2", - "condition": "features.quickcontrols2-default", - "output": [ "privateFeature" ] - }, "quickcontrols2-material": { "label": "Material", "purpose": "Provides a style based on the Material Design guidelines.", @@ -52,7 +36,7 @@ { "message": "Styles", "type": "featureList", - "args": "quickcontrols2-default quickcontrols2-fusion quickcontrols2-imagine quickcontrols2-material quickcontrols2-universal" + "args": "quickcontrols2-default quickcontrols2-material quickcontrols2-universal" } ] } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickanimatednode.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickanimatednode.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickanimatednode.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickanimatednode.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -44,7 +44,12 @@ QT_BEGIN_NAMESPACE QQuickAnimatedNode::QQuickAnimatedNode(QQuickItem *target) - : m_window(target->window()) + : m_running(false), + m_duration(0), + m_loopCount(1), + m_currentTime(0), + m_currentLoop(0), + m_window(target->window()) { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickanimatednode_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickanimatednode_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickanimatednode_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickanimatednode_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -98,13 +98,13 @@ void update(); private: - bool m_running = false; - int m_duration = 0; - int m_loopCount = 1; - int m_currentTime = 0; - int m_currentLoop = 0; + bool m_running; + int m_duration; + int m_loopCount; + int m_currentTime; + int m_currentLoop; QElapsedTimer m_timer; - QQuickWindow *m_window = nullptr; + QQuickWindow *m_window; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickattachedobject.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickattachedobject.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickattachedobject.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickattachedobject.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,274 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickattachedobject_p.h" - -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -static QQuickAttachedObject *attachedObject(const QMetaObject *type, QObject *object, bool create = false) -{ - if (!object) - return nullptr; - int idx = -1; - return qobject_cast(qmlAttachedPropertiesObject(&idx, object, type, create)); -} - -static QQuickAttachedObject *findAttachedParent(const QMetaObject *type, QObject *object) -{ - QQuickItem *item = qobject_cast(object); - if (item) { - // lookup parent items and popups - QQuickItem *parent = item->parentItem(); - while (parent) { - QQuickAttachedObject *attached = attachedObject(type, parent); - if (attached) - return attached; - - QQuickPopup *popup = qobject_cast(parent->parent()); - if (popup) - return attachedObject(type, popup); - - parent = parent->parentItem(); - } - - // fallback to item's window - QQuickAttachedObject *attached = attachedObject(type, item->window()); - if (attached) - return attached; - } else { - // lookup popup's window - QQuickPopup *popup = qobject_cast(object); - if (popup) - return attachedObject(type, popup->popupItem()->window()); - } - - // lookup parent window - QQuickWindow *window = qobject_cast(object); - if (window) { - QQuickWindow *parentWindow = qobject_cast(window->parent()); - if (parentWindow) { - QQuickAttachedObject *attached = attachedObject(type, window); - if (attached) - return attached; - } - } - - // fallback to engine (global) - if (object) { - QQmlEngine *engine = qmlEngine(object); - if (engine) { - QByteArray name = QByteArray("_q_") + type->className(); - QQuickAttachedObject *attached = engine->property(name).value(); - if (!attached) { - attached = attachedObject(type, engine, true); - engine->setProperty(name, QVariant::fromValue(attached)); - } - return attached; - } - } - - return nullptr; -} - -static QList findAttachedChildren(const QMetaObject *type, QObject *object) -{ - QList children; - - QQuickItem *item = qobject_cast(object); - if (!item) { - QQuickWindow *window = qobject_cast(object); - if (window) { - item = window->contentItem(); - - const auto windowChildren = window->children(); - for (QObject *child : windowChildren) { - QQuickWindow *childWindow = qobject_cast(child); - if (childWindow) { - QQuickAttachedObject *attached = attachedObject(type, childWindow); - if (attached) - children += attached; - } - } - } - } - - if (item) { - const auto childItems = item->childItems(); - for (QQuickItem *child : childItems) { - QQuickAttachedObject *attached = attachedObject(type, child); - if (attached) - children += attached; - else - children += findAttachedChildren(type, child); - } - } - - return children; -} - -static QQuickItem *findAttachedItem(QObject *parent) -{ - QQuickItem *item = qobject_cast(parent); - if (!item) { - QQuickPopup *popup = qobject_cast(parent); - if (popup) - item = popup->popupItem(); - } - return item; -} - -class QQuickAttachedObjectPrivate : public QObjectPrivate, public QQuickItemChangeListener -{ - Q_DECLARE_PUBLIC(QQuickAttachedObject) - -public: - static QQuickAttachedObjectPrivate *get(QQuickAttachedObject *attachedObject) - { - return attachedObject->d_func(); - } - - void attachTo(QObject *object); - void detachFrom(QObject *object); - - void itemWindowChanged(QQuickWindow *window); - void itemParentChanged(QQuickItem *item, QQuickItem *parent) override; - - QList attachedChildren; - QPointer attachedParent; -}; - -void QQuickAttachedObjectPrivate::attachTo(QObject *object) -{ - QQuickItem *item = findAttachedItem(object); - if (item) { - connect(item, &QQuickItem::windowChanged, this, &QQuickAttachedObjectPrivate::itemWindowChanged); - QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Parent); - } -} - -void QQuickAttachedObjectPrivate::detachFrom(QObject *object) -{ - QQuickItem *item = findAttachedItem(object); - if (item) { - disconnect(item, &QQuickItem::windowChanged, this, &QQuickAttachedObjectPrivate::itemWindowChanged); - QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Parent); - } -} - -void QQuickAttachedObjectPrivate::itemWindowChanged(QQuickWindow *window) -{ - Q_Q(QQuickAttachedObject); - QQuickAttachedObject *attachedParent = nullptr; - QQuickItem *item = qobject_cast(q->sender()); - if (item) - attachedParent = findAttachedParent(q->metaObject(), item); - if (!attachedParent) - attachedParent = attachedObject(q->metaObject(), window); - q->setAttachedParent(attachedParent); -} - -void QQuickAttachedObjectPrivate::itemParentChanged(QQuickItem *item, QQuickItem *parent) -{ - Q_Q(QQuickAttachedObject); - Q_UNUSED(parent); - q->setAttachedParent(findAttachedParent(q->metaObject(), item)); -} - -QQuickAttachedObject::QQuickAttachedObject(QObject *parent) - : QObject(*(new QQuickAttachedObjectPrivate), parent) -{ - Q_D(QQuickAttachedObject); - d->attachTo(parent); -} - -QQuickAttachedObject::~QQuickAttachedObject() -{ - Q_D(QQuickAttachedObject); - d->detachFrom(parent()); - setAttachedParent(nullptr); -} - -QList QQuickAttachedObject::attachedChildren() const -{ - Q_D(const QQuickAttachedObject); - return d->attachedChildren; -} - -QQuickAttachedObject *QQuickAttachedObject::attachedParent() const -{ - Q_D(const QQuickAttachedObject); - return d->attachedParent; -} - -void QQuickAttachedObject::setAttachedParent(QQuickAttachedObject *parent) -{ - Q_D(QQuickAttachedObject); - if (d->attachedParent == parent) - return; - - QQuickAttachedObject *oldParent = d->attachedParent; - if (d->attachedParent) - QQuickAttachedObjectPrivate::get(d->attachedParent)->attachedChildren.removeOne(this); - d->attachedParent = parent; - if (parent) - QQuickAttachedObjectPrivate::get(parent)->attachedChildren.append(this); - attachedParentChange(parent, oldParent); -} - -void QQuickAttachedObject::init() -{ - QQuickAttachedObject *attachedParent = findAttachedParent(metaObject(), parent()); - if (attachedParent) - setAttachedParent(attachedParent); - - const QList attachedChildren = findAttachedChildren(metaObject(), parent()); - for (QQuickAttachedObject *child : attachedChildren) - child->setAttachedParent(this); -} - -void QQuickAttachedObject::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) -{ - Q_UNUSED(newParent); - Q_UNUSED(oldParent); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickattachedobject_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickattachedobject_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickattachedobject_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickattachedobject_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKATTACHEDOBJECT_P_H -#define QQUICKATTACHEDOBJECT_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickAttachedObjectPrivate; - -class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickAttachedObject : public QObject -{ - Q_OBJECT - -public: - explicit QQuickAttachedObject(QObject *parent = nullptr); - ~QQuickAttachedObject(); - - QList attachedChildren() const; - - QQuickAttachedObject *attachedParent() const; - void setAttachedParent(QQuickAttachedObject *parent); - -protected: - void init(); - - virtual void attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent); - -private: - Q_DISABLE_COPY(QQuickAttachedObject) - Q_DECLARE_PRIVATE(QQuickAttachedObject) -}; - -QT_END_NAMESPACE - -#endif // QQUICKATTACHEDOBJECT_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickchecklabel.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickchecklabel.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickchecklabel.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickchecklabel.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickchecklabel_p.h" - -QT_BEGIN_NAMESPACE - -QQuickCheckLabel::QQuickCheckLabel(QQuickItem *parent) : - QQuickText(parent) -{ - setHAlign(AlignLeft); - setVAlign(AlignVCenter); - setElideMode(ElideRight); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickchecklabel_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickchecklabel_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickchecklabel_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickchecklabel_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKCHECKLABEL_P_H -#define QQUICKCHECKLABEL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickCheckLabel : public QQuickText -{ - Q_OBJECT - -public: - explicit QQuickCheckLabel(QQuickItem *parent = nullptr); -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QQuickCheckLabel) - -#endif // QQUICKCHECKLABEL_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickclippedtext.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickclippedtext.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickclippedtext.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickclippedtext.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -41,7 +41,13 @@ QT_BEGIN_NAMESPACE QQuickClippedText::QQuickClippedText(QQuickItem *parent) - : QQuickText(parent) + : QQuickText(parent), + m_hasClipWidth(false), + m_hasClipHeight(false), + m_clipX(0), + m_clipY(0), + m_clipWidth(0), + m_clipHeight(0) { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickclippedtext_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickclippedtext_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickclippedtext_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickclippedtext_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -81,12 +81,12 @@ private: void markClipDirty(); - bool m_hasClipWidth = false; - bool m_hasClipHeight = false; - qreal m_clipX = 0; - qreal m_clipY = 0; - qreal m_clipWidth = 0; - qreal m_clipHeight = 0; + bool m_hasClipWidth; + bool m_hasClipHeight; + qreal m_clipX; + qreal m_clipY; + qreal m_clipWidth; + qreal m_clipHeight; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolor.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolor.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolor.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolor.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickcolor_p.h" - -QT_BEGIN_NAMESPACE - -QQuickColor::QQuickColor(QObject *parent) : - QObject(parent) -{ -} - -QColor QQuickColor::transparent(const QColor &color, qreal opacity) const -{ - return QColor(color.red(), color.green(), color.blue(), - int(qreal(255) * qBound(qreal(0), opacity, qreal(1)))); -} - -QColor QQuickColor::blend(const QColor &a, const QColor &b, qreal factor) const -{ - if (factor <= 0.0) - return a; - if (factor >= 1.0) - return b; - - QColor color; - color.setRedF(a.redF() * (1.0 - factor) + b.redF() * factor); - color.setGreenF(a.greenF() * (1.0 - factor) + b.greenF() * factor); - color.setBlueF(a.blueF() * (1.0 - factor) + b.blueF() * factor); - return color; -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolorimage.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolorimage.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolorimage.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolorimage.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickcolorimage_p.h" - -#include - -QT_BEGIN_NAMESPACE - -QQuickColorImage::QQuickColorImage(QQuickItem *parent) - : QQuickImage(parent) -{ -} - -QColor QQuickColorImage::color() const -{ - return m_color; -} - -void QQuickColorImage::setColor(const QColor &color) -{ - if (m_color == color) - return; - - m_color = color; - if (isComponentComplete()) - load(); - emit colorChanged(); -} - -void QQuickColorImage::resetColor() -{ - setColor(Qt::transparent); -} - -QColor QQuickColorImage::defaultColor() const -{ - return m_defaultColor; -} - -void QQuickColorImage::setDefaultColor(const QColor &color) -{ - if (m_defaultColor == color) - return; - - m_defaultColor = color; - emit defaultColorChanged(); -} - -void QQuickColorImage::resetDefaultColor() -{ - setDefaultColor(Qt::transparent); -} - -void QQuickColorImage::pixmapChange() -{ - QQuickImage::pixmapChange(); - if (m_color.alpha() > 0 && m_color != m_defaultColor) { - QQuickImageBasePrivate *d = static_cast(QQuickItemPrivate::get(this)); - QImage image = d->pix.image(); - if (!image.isNull()) { - QPainter painter(&image); - painter.setCompositionMode(QPainter::CompositionMode_SourceIn); - painter.fillRect(image.rect(), m_color); - d->pix.setImage(image); - } - } -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolorimage_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolorimage_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolorimage_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolorimage_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKCOLORIMAGE_P_H -#define QQUICKCOLORIMAGE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickColorImage : public QQuickImage -{ - Q_OBJECT - Q_PROPERTY(QColor color READ color WRITE setColor RESET resetColor NOTIFY colorChanged FINAL) - Q_PROPERTY(QColor defaultColor READ defaultColor WRITE setDefaultColor RESET resetDefaultColor NOTIFY defaultColorChanged FINAL) - -public: - explicit QQuickColorImage(QQuickItem *parent = nullptr); - - QColor color() const; - void setColor(const QColor &color); - void resetColor(); - - QColor defaultColor() const; - void setDefaultColor(const QColor &color); - void resetDefaultColor(); - -Q_SIGNALS: - void colorChanged(); - void defaultColorChanged(); - -protected: - void pixmapChange() override; - -private: - QColor m_color = Qt::transparent; - QColor m_defaultColor = Qt::transparent; -}; - -QT_END_NAMESPACE - -#endif // QQUICKCOLORIMAGE_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolorimageprovider.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolorimageprovider.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolorimageprovider.cpp 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolorimageprovider.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qquickcolorimageprovider_p.h" + +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +QQuickColorImageProvider::QQuickColorImageProvider(const QString &path) + : QQuickImageProvider(Image), m_path(path) +{ +} + +QImage QQuickColorImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize) +{ + Q_UNUSED(requestedSize); + + int sep = id.indexOf(QLatin1Char('/')); + const QStringRef name = id.leftRef(sep); + qreal dpr = qApp->primaryScreen()->devicePixelRatio(); + QString file = qt_findAtNxFile(m_path + QLatin1Char('/') + name + QLatin1String(".png"), dpr); + + QImage image(file); + if (image.isNull()) { + qWarning() << "QQuickColorImageProvider: unknown id:" << id; + return QImage(); + } + + if (size) + *size = image.size(); + + const QString color = id.mid(sep + 1); + if (!color.isEmpty()) { + QPainter painter(&image); + painter.setCompositionMode(QPainter::CompositionMode_SourceIn); + painter.fillRect(image.rect(), QColor(color)); + } + + return image; +} + +QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolorimageprovider_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolorimageprovider_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolorimageprovider_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolorimageprovider_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKCOLORIMAGEPROVIDER_P_H +#define QQUICKCOLORIMAGEPROVIDER_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include + +QT_BEGIN_NAMESPACE + +class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickColorImageProvider : public QQuickImageProvider +{ +public: + QQuickColorImageProvider(const QString &path); + + QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override; + +private: + QString m_path; +}; + +QT_END_NAMESPACE + +#endif // QQUICKOCOLORIMAGEPROVIDER_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolor_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolor_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickcolor_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickcolor_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKCOLOR_P_H -#define QQUICKCOLOR_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickColor : public QObject -{ - Q_OBJECT - -public: - explicit QQuickColor(QObject *parent = nullptr); - - Q_INVOKABLE QColor transparent(const QColor &color, qreal opacity) const; - Q_INVOKABLE QColor blend(const QColor &a, const QColor &b, qreal factor) const; -}; - -QT_END_NAMESPACE - -#endif // QQUICKCOLOR_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconimage.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconimage.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconimage.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconimage.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,213 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickiconimage_p.h" -#include "qquickiconimage_p_p.h" - -#include -#include - -QT_BEGIN_NAMESPACE - -bool QQuickIconImagePrivate::updateDevicePixelRatio(qreal targetDevicePixelRatio) -{ - if (isThemeIcon) { - devicePixelRatio = calculateDevicePixelRatio(); - return true; - } - - return QQuickImagePrivate::updateDevicePixelRatio(targetDevicePixelRatio); -} - -void QQuickIconImagePrivate::updateIcon() -{ - Q_Q(QQuickIconImage); - // Both geometryChanged() and QQuickImageBase::sourceSizeChanged() - // (which we connect to updateIcon() in the constructor) can be called as a result - // of updateIcon() changing the various sizes, so we must check that we're not recursing. - if (updatingIcon) - return; - - updatingIcon = true; - - QSize size = sourcesize; - // If no size is specified for theme icons, it will use the smallest available size. - if (size.width() <= 0) - size.setWidth(q->width()); - if (size.height() <= 0) - size.setHeight(q->height()); - - const qreal dpr = calculateDevicePixelRatio(); - const QIconLoaderEngineEntry *entry = QIconLoaderEngine::entryForSize(icon, size * dpr, qCeil(dpr)); - - if (entry) { - QQmlContext *context = qmlContext(q); - const QUrl entryUrl = QUrl::fromLocalFile(entry->filename); - url = context ? context->resolvedUrl(entryUrl) : entryUrl; - isThemeIcon = true; - } else { - url = source; - isThemeIcon = false; - } - q->load(); - - updatingIcon = false; -} - -void QQuickIconImagePrivate::updateFillMode() -{ - Q_Q(QQuickIconImage); - // If we start with a sourceSize of 28x28 and then set sourceSize.width to 24, the fillMode - // will change to PreserveAspectFit (because pixmapSize.width() > width()), which causes the - // pixmap to be reloaded at its original size of 28x28, which causes the fillMode to change - // to Pad (because pixmapSize.width() <= width()), and so on. - if (updatingFillMode) - return; - - updatingFillMode = true; - - const QSize pixmapSize = QSize(pix.width(), pix.height()) / calculateDevicePixelRatio(); - if (pixmapSize.width() > q->width() || pixmapSize.height() > q->height()) - q->setFillMode(QQuickImage::PreserveAspectFit); - else - q->setFillMode(QQuickImage::Pad); - - updatingFillMode = false; -} - -qreal QQuickIconImagePrivate::calculateDevicePixelRatio() const -{ - Q_Q(const QQuickIconImage); - return q->window() ? q->window()->effectiveDevicePixelRatio() : qApp->devicePixelRatio(); -} - -QQuickIconImage::QQuickIconImage(QQuickItem *parent) - : QQuickImage(*(new QQuickIconImagePrivate), parent) -{ - setFillMode(Pad); -} - -QString QQuickIconImage::name() const -{ - Q_D(const QQuickIconImage); - return d->icon.iconName; -} - -void QQuickIconImage::setName(const QString &name) -{ - Q_D(QQuickIconImage); - if (d->icon.iconName == name) - return; - - d->icon = QIconLoader::instance()->loadIcon(name); - if (isComponentComplete()) - d->updateIcon(); - emit nameChanged(); -} - -QColor QQuickIconImage::color() const -{ - Q_D(const QQuickIconImage); - return d->color; -} - -void QQuickIconImage::setColor(const QColor &color) -{ - Q_D(QQuickIconImage); - if (d->color == color) - return; - - d->color = color; - if (isComponentComplete()) - d->updateIcon(); - emit colorChanged(); -} - -void QQuickIconImage::setSource(const QUrl &source) -{ - Q_D(QQuickIconImage); - if (d->source == source) - return; - - d->source = source; - if (isComponentComplete()) - d->updateIcon(); - emit sourceChanged(source); -} - -void QQuickIconImage::componentComplete() -{ - Q_D(QQuickIconImage); - QQuickImage::componentComplete(); - d->updateIcon(); - QObjectPrivate::connect(this, &QQuickImageBase::sourceSizeChanged, d, &QQuickIconImagePrivate::updateIcon); -} - -void QQuickIconImage::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) -{ - Q_D(QQuickIconImage); - QQuickImage::geometryChanged(newGeometry, oldGeometry); - if (isComponentComplete() && newGeometry.size() != oldGeometry.size()) - d->updateIcon(); -} - -void QQuickIconImage::itemChange(ItemChange change, const ItemChangeData &value) -{ - Q_D(QQuickIconImage); - if (change == ItemDevicePixelRatioHasChanged) - d->updateIcon(); - QQuickImage::itemChange(change, value); -} - -void QQuickIconImage::pixmapChange() -{ - Q_D(QQuickIconImage); - QQuickImage::pixmapChange(); - d->updateFillMode(); - - // Don't apply the color if we're recursing (updateFillMode() can cause us to recurse). - if (!d->updatingFillMode && d->color.alpha() > 0) { - QImage image = d->pix.image(); - if (!image.isNull()) { - QPainter painter(&image); - painter.setCompositionMode(QPainter::CompositionMode_SourceIn); - painter.fillRect(image.rect(), d->color); - d->pix.setImage(image); - } - } -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconimage_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconimage_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconimage_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconimage_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKICONIMAGE_P_H -#define QQUICKICONIMAGE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickIconImagePrivate; - -class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickIconImage : public QQuickImage -{ - Q_OBJECT - Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged FINAL) - Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL) - -public: - explicit QQuickIconImage(QQuickItem *parent = nullptr); - - QString name() const; - void setName(const QString &name); - - QColor color() const; - void setColor(const QColor &color); - - void setSource(const QUrl &url) override; - -Q_SIGNALS: - void nameChanged(); - void colorChanged(); - -protected: - void componentComplete() override; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; - void itemChange(ItemChange change, const ItemChangeData &value) override; - void pixmapChange() override; - -private: - Q_DISABLE_COPY(QQuickIconImage) - Q_DECLARE_PRIVATE(QQuickIconImage) -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QQuickIconImage) - -#endif // QQUICKICONIMAGE_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconimage_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconimage_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconimage_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconimage_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKICONIMAGE_P_P_H -#define QQUICKICONIMAGE_P_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickIconImagePrivate : public QQuickImagePrivate -{ - Q_DECLARE_PUBLIC(QQuickIconImage) - -public: - void updateIcon(); - void updateFillMode(); - qreal calculateDevicePixelRatio() const; - bool updateDevicePixelRatio(qreal targetDevicePixelRatio) override; - - QUrl source; - QColor color = Qt::transparent; - QThemeIconInfo icon; - bool updatingIcon = false; - bool isThemeIcon = false; - bool updatingFillMode = false; -}; - -QT_END_NAMESPACE - -#endif // QQUICKICONIMAGE_P_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconlabel.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconlabel.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconlabel.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconlabel.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,640 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickiconlabel_p.h" -#include "qquickiconlabel_p_p.h" -#include "qquickiconimage_p.h" -#include "qquickmnemoniclabel_p.h" - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -static void beginClass(QQuickItem *item) -{ - if (QQmlParserStatus *parserStatus = qobject_cast(item)) - parserStatus->classBegin(); -} - -static void completeComponent(QQuickItem *item) -{ - if (QQmlParserStatus *parserStatus = qobject_cast(item)) - parserStatus->componentComplete(); -} - -bool QQuickIconLabelPrivate::hasIcon() const -{ - return display != QQuickIconLabel::TextOnly && !icon.isEmpty(); -} - -bool QQuickIconLabelPrivate::hasText() const -{ - return display != QQuickIconLabel::IconOnly && !text.isEmpty(); -} - -bool QQuickIconLabelPrivate::createImage() -{ - Q_Q(QQuickIconLabel); - if (image) - return false; - - image = new QQuickIconImage(q); - watchChanges(image); - beginClass(image); - image->setObjectName(QStringLiteral("image")); - image->setName(icon.name()); - image->setSource(icon.source()); - image->setSourceSize(QSize(icon.width(), icon.height())); - image->setColor(icon.color()); - QQmlEngine::setContextForObject(image, qmlContext(q)); - if (componentComplete) - completeComponent(image); - return true; -} - -bool QQuickIconLabelPrivate::destroyImage() -{ - if (!image) - return false; - - unwatchChanges(image); - delete image; - image = nullptr; - return true; -} - -bool QQuickIconLabelPrivate::updateImage() -{ - if (!hasIcon()) - return destroyImage(); - return createImage(); -} - -void QQuickIconLabelPrivate::syncImage() -{ - if (!image || icon.isEmpty()) - return; - - image->setName(icon.name()); - image->setSource(icon.source()); - image->setSourceSize(QSize(icon.width(), icon.height())); - image->setColor(icon.color()); - const int valign = alignment & Qt::AlignVertical_Mask; - image->setVerticalAlignment(static_cast(valign)); - const int halign = alignment & Qt::AlignHorizontal_Mask; - image->setHorizontalAlignment(static_cast(halign)); -} - -void QQuickIconLabelPrivate::updateOrSyncImage() -{ - if (updateImage()) { - if (componentComplete) { - updateImplicitSize(); - layout(); - } - } else { - syncImage(); - } -} - -bool QQuickIconLabelPrivate::createLabel() -{ - Q_Q(QQuickIconLabel); - if (label) - return false; - - label = new QQuickMnemonicLabel(q); - watchChanges(label); - beginClass(label); - label->setObjectName(QStringLiteral("label")); - label->setFont(font); - label->setColor(color); - label->setElideMode(QQuickText::ElideRight); - const int valign = alignment & Qt::AlignVertical_Mask; - label->setVAlign(static_cast(valign)); - const int halign = alignment & Qt::AlignHorizontal_Mask; - label->setHAlign(static_cast(halign)); - label->setText(text); - if (componentComplete) - completeComponent(label); - return true; -} - -bool QQuickIconLabelPrivate::destroyLabel() -{ - if (!label) - return false; - - unwatchChanges(label); - delete label; - label = nullptr; - return true; -} - -bool QQuickIconLabelPrivate::updateLabel() -{ - if (!hasText()) - return destroyLabel(); - return createLabel(); -} - -void QQuickIconLabelPrivate::syncLabel() -{ - if (!label) - return; - - label->setText(text); -} - -void QQuickIconLabelPrivate::updateOrSyncLabel() -{ - if (updateLabel()) { - if (componentComplete) { - updateImplicitSize(); - layout(); - } - } else { - syncLabel(); - } -} - -void QQuickIconLabelPrivate::updateImplicitSize() -{ - Q_Q(QQuickIconLabel); - const bool showIcon = image && hasIcon(); - const bool showText = label && hasText(); - const qreal horizontalPadding = leftPadding + rightPadding; - const qreal verticalPadding = topPadding + bottomPadding; - const qreal iconImplicitWidth = showIcon ? image->implicitWidth() : 0; - const qreal iconImplicitHeight = showIcon ? image->implicitHeight() : 0; - const qreal textImplicitWidth = showText ? label->implicitWidth() : 0; - const qreal textImplicitHeight = showText ? label->implicitHeight() : 0; - const qreal effectiveSpacing = showText && showIcon && image->implicitWidth() > 0 ? spacing : 0; - const qreal implicitWidth = display == QQuickIconLabel::TextBesideIcon ? iconImplicitWidth + textImplicitWidth + effectiveSpacing - : qMax(iconImplicitWidth, textImplicitWidth); - const qreal implicitHeight = display == QQuickIconLabel::TextUnderIcon ? iconImplicitHeight + textImplicitHeight + effectiveSpacing - : qMax(iconImplicitHeight, textImplicitHeight); - q->setImplicitSize(implicitWidth + horizontalPadding, implicitHeight + verticalPadding); -} - -// adapted from QStyle::alignedRect() -static QRectF alignedRect(bool mirrored, Qt::Alignment alignment, const QSizeF &size, const QRectF &rectangle) -{ - alignment = QGuiApplicationPrivate::visualAlignment(mirrored ? Qt::RightToLeft : Qt::LeftToRight, alignment); - qreal x = rectangle.x(); - qreal y = rectangle.y(); - const qreal w = size.width(); - const qreal h = size.height(); - if ((alignment & Qt::AlignVCenter) == Qt::AlignVCenter) - y += rectangle.height() / 2 - h / 2; - else if ((alignment & Qt::AlignBottom) == Qt::AlignBottom) - y += rectangle.height() - h; - if ((alignment & Qt::AlignRight) == Qt::AlignRight) - x += rectangle.width() - w; - else if ((alignment & Qt::AlignHCenter) == Qt::AlignHCenter) - x += rectangle.width() / 2 - w / 2; - return QRectF(x, y, w, h); -} - -void QQuickIconLabelPrivate::layout() -{ - Q_Q(QQuickIconLabel); - if (!componentComplete) - return; - - const qreal availableWidth = width - leftPadding - rightPadding; - const qreal availableHeight = height - topPadding - bottomPadding; - - switch (display) { - case QQuickIconLabel::IconOnly: - if (image) { - const QRectF iconRect = alignedRect(mirrored, alignment, - QSizeF(qMin(image->implicitWidth(), availableWidth), - qMin(image->implicitHeight(), availableHeight)), - QRectF(leftPadding, topPadding, availableWidth, availableHeight)); - image->setSize(iconRect.size()); - image->setPosition(iconRect.topLeft()); - } - break; - case QQuickIconLabel::TextOnly: - if (label) { - const QRectF textRect = alignedRect(mirrored, alignment, - QSizeF(qMin(label->implicitWidth(), availableWidth), - qMin(label->implicitHeight(), availableHeight)), - QRectF(leftPadding, topPadding, availableWidth, availableHeight)); - label->setSize(textRect.size()); - label->setPosition(textRect.topLeft()); - } - break; - - case QQuickIconLabel::TextUnderIcon: { - // Work out the sizes first, as the positions depend on them. - QSizeF iconSize; - QSizeF textSize; - if (image) { - iconSize.setWidth(qMin(image->implicitWidth(), availableWidth)); - iconSize.setHeight(qMin(image->implicitHeight(), availableHeight)); - } - qreal effectiveSpacing = 0; - if (label) { - if (!iconSize.isEmpty()) - effectiveSpacing = spacing; - textSize.setWidth(qMin(label->implicitWidth(), availableWidth)); - textSize.setHeight(qMin(label->implicitHeight(), availableHeight - iconSize.height() - effectiveSpacing)); - } - - QRectF combinedRect = alignedRect(mirrored, alignment, - QSizeF(qMax(iconSize.width(), textSize.width()), - iconSize.height() + effectiveSpacing + textSize.height()), - QRectF(leftPadding, topPadding, availableWidth, availableHeight)); - if (image) { - QRectF iconRect = alignedRect(mirrored, Qt::AlignHCenter | Qt::AlignTop, iconSize, combinedRect); - image->setSize(iconRect.size()); - image->setPosition(iconRect.topLeft()); - } - if (label) { - QRectF textRect = alignedRect(mirrored, Qt::AlignHCenter | Qt::AlignBottom, textSize, combinedRect); - label->setSize(textRect.size()); - label->setPosition(textRect.topLeft()); - } - break; - } - - case QQuickIconLabel::TextBesideIcon: - default: - // Work out the sizes first, as the positions depend on them. - QSizeF iconSize(0, 0); - QSizeF textSize(0, 0); - if (image) { - iconSize.setWidth(qMin(image->implicitWidth(), availableWidth)); - iconSize.setHeight(qMin(image->implicitHeight(), availableHeight)); - } - qreal effectiveSpacing = 0; - if (label) { - if (!iconSize.isEmpty()) - effectiveSpacing = spacing; - textSize.setWidth(qMin(label->implicitWidth(), availableWidth - iconSize.width() - effectiveSpacing)); - textSize.setHeight(qMin(label->implicitHeight(), availableHeight)); - } - - const QRectF combinedRect = alignedRect(mirrored, alignment, - QSizeF(iconSize.width() + effectiveSpacing + textSize.width(), - qMax(iconSize.height(), textSize.height())), - QRectF(leftPadding, topPadding, availableWidth, availableHeight)); - if (image) { - const QRectF iconRect = alignedRect(mirrored, Qt::AlignLeft | Qt::AlignVCenter, iconSize, combinedRect); - image->setSize(iconRect.size()); - image->setPosition(iconRect.topLeft()); - } - if (label) { - const QRectF textRect = alignedRect(mirrored, Qt::AlignRight | Qt::AlignVCenter, textSize, combinedRect); - label->setSize(textRect.size()); - label->setPosition(textRect.topLeft()); - } - break; - } - - q->setBaselineOffset(label ? label->y() + label->baselineOffset() : 0); -} - -static const QQuickItemPrivate::ChangeTypes itemChangeTypes = - QQuickItemPrivate::ImplicitWidth - | QQuickItemPrivate::ImplicitHeight - | QQuickItemPrivate::Destroyed; - -void QQuickIconLabelPrivate::watchChanges(QQuickItem *item) -{ - QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); - itemPrivate->addItemChangeListener(this, itemChangeTypes); -} - -void QQuickIconLabelPrivate::unwatchChanges(QQuickItem* item) -{ - QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); - itemPrivate->removeItemChangeListener(this, itemChangeTypes); -} - -void QQuickIconLabelPrivate::itemImplicitWidthChanged(QQuickItem *) -{ - updateImplicitSize(); - layout(); -} - -void QQuickIconLabelPrivate::itemImplicitHeightChanged(QQuickItem *) -{ - updateImplicitSize(); - layout(); -} - -void QQuickIconLabelPrivate::itemDestroyed(QQuickItem *item) -{ - unwatchChanges(item); - if (item == image) - image = nullptr; - else if (item == label) - label = nullptr; -} - -QQuickIconLabel::QQuickIconLabel(QQuickItem *parent) - : QQuickItem(*(new QQuickIconLabelPrivate), parent) -{ -} - -QQuickIconLabel::~QQuickIconLabel() -{ - Q_D(QQuickIconLabel); - if (d->image) - d->unwatchChanges(d->image); - if (d->label) - d->unwatchChanges(d->label); -} - -QQuickIcon QQuickIconLabel::icon() const -{ - Q_D(const QQuickIconLabel); - return d->icon; -} - -void QQuickIconLabel::setIcon(const QQuickIcon &icon) -{ - Q_D(QQuickIconLabel); - if (d->icon == icon) - return; - - d->icon = icon; - d->updateOrSyncImage(); -} - -QString QQuickIconLabel::text() const -{ - Q_D(const QQuickIconLabel); - return d->text; -} - -void QQuickIconLabel::setText(const QString text) -{ - Q_D(QQuickIconLabel); - if (d->text == text) - return; - - d->text = text; - d->updateOrSyncLabel(); -} - -QFont QQuickIconLabel::font() const -{ - Q_D(const QQuickIconLabel); - return d->font; -} - -void QQuickIconLabel::setFont(const QFont &font) -{ - Q_D(QQuickIconLabel); - if (d->font == font) - return; - - d->font = font; - if (d->label) - d->label->setFont(font); -} - -QColor QQuickIconLabel::color() const -{ - Q_D(const QQuickIconLabel); - return d->color; -} - -void QQuickIconLabel::setColor(const QColor &color) -{ - Q_D(QQuickIconLabel); - if (d->color == color) - return; - - d->color = color; - if (d->label) - d->label->setColor(color); -} - -QQuickIconLabel::Display QQuickIconLabel::display() const -{ - Q_D(const QQuickIconLabel); - return d->display; -} - -void QQuickIconLabel::setDisplay(Display display) -{ - Q_D(QQuickIconLabel); - if (d->display == display) - return; - - d->display = display; - d->updateImage(); - d->updateLabel(); - d->updateImplicitSize(); - d->layout(); -} - -qreal QQuickIconLabel::spacing() const -{ - Q_D(const QQuickIconLabel); - return d->spacing; -} - -void QQuickIconLabel::setSpacing(qreal spacing) -{ - Q_D(QQuickIconLabel); - if (qFuzzyCompare(d->spacing, spacing)) - return; - - d->spacing = spacing; - if (d->image && d->label) { - d->updateImplicitSize(); - d->layout(); - } -} - -bool QQuickIconLabel::isMirrored() const -{ - Q_D(const QQuickIconLabel); - return d->mirrored; -} - -void QQuickIconLabel::setMirrored(bool mirrored) -{ - Q_D(QQuickIconLabel); - if (d->mirrored == mirrored) - return; - - d->mirrored = mirrored; - d->layout(); -} - -Qt::Alignment QQuickIconLabel::alignment() const -{ - Q_D(const QQuickIconLabel); - return d->alignment; -} - -void QQuickIconLabel::setAlignment(Qt::Alignment alignment) -{ - Q_D(QQuickIconLabel); - const int valign = alignment & Qt::AlignVertical_Mask; - const int halign = alignment & Qt::AlignHorizontal_Mask; - const uint align = (valign ? valign : Qt::AlignVCenter) | (halign ? halign : Qt::AlignHCenter); - if (d->alignment == align) - return; - - d->alignment = static_cast(align); - if (d->label) { - d->label->setVAlign(static_cast(valign)); - d->label->setHAlign(static_cast(halign)); - } - if (d->image) { - d->image->setVerticalAlignment(static_cast(valign)); - d->image->setHorizontalAlignment(static_cast(halign)); - } - d->layout(); -} - -qreal QQuickIconLabel::topPadding() const -{ - Q_D(const QQuickIconLabel); - return d->topPadding; -} - -void QQuickIconLabel::setTopPadding(qreal padding) -{ - Q_D(QQuickIconLabel); - if (qFuzzyCompare(d->topPadding, padding)) - return; - - d->topPadding = padding; - d->updateImplicitSize(); - d->layout(); -} - -void QQuickIconLabel::resetTopPadding() -{ - setTopPadding(0); -} - -qreal QQuickIconLabel::leftPadding() const -{ - Q_D(const QQuickIconLabel); - return d->leftPadding; -} - -void QQuickIconLabel::setLeftPadding(qreal padding) -{ - Q_D(QQuickIconLabel); - if (qFuzzyCompare(d->leftPadding, padding)) - return; - - d->leftPadding = padding; - d->updateImplicitSize(); - d->layout(); -} - -void QQuickIconLabel::resetLeftPadding() -{ - setLeftPadding(0); -} - -qreal QQuickIconLabel::rightPadding() const -{ - Q_D(const QQuickIconLabel); - return d->rightPadding; -} - -void QQuickIconLabel::setRightPadding(qreal padding) -{ - Q_D(QQuickIconLabel); - if (qFuzzyCompare(d->rightPadding, padding)) - return; - - d->rightPadding = padding; - d->updateImplicitSize(); - d->layout(); -} - -void QQuickIconLabel::resetRightPadding() -{ - setRightPadding(0); -} - -qreal QQuickIconLabel::bottomPadding() const -{ - Q_D(const QQuickIconLabel); - return d->bottomPadding; -} - -void QQuickIconLabel::setBottomPadding(qreal padding) -{ - Q_D(QQuickIconLabel); - if (qFuzzyCompare(d->bottomPadding, padding)) - return; - - d->bottomPadding = padding; - d->updateImplicitSize(); - d->layout(); -} - -void QQuickIconLabel::resetBottomPadding() -{ - setBottomPadding(0); -} - -void QQuickIconLabel::componentComplete() -{ - Q_D(QQuickIconLabel); - if (d->image) - completeComponent(d->image); - if (d->label) - completeComponent(d->label); - QQuickItem::componentComplete(); - d->layout(); -} - -void QQuickIconLabel::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) -{ - Q_D(QQuickIconLabel); - QQuickItem::geometryChanged(newGeometry, oldGeometry); - d->layout(); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconlabel_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconlabel_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconlabel_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconlabel_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKICONLABEL_P_H -#define QQUICKICONLABEL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickIconLabelPrivate; - -class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickIconLabel : public QQuickItem -{ - Q_OBJECT - Q_PROPERTY(QQuickIcon icon READ icon WRITE setIcon FINAL) - Q_PROPERTY(QString text READ text WRITE setText FINAL) - Q_PROPERTY(QFont font READ font WRITE setFont FINAL) - Q_PROPERTY(QColor color READ color WRITE setColor FINAL) - Q_PROPERTY(Display display READ display WRITE setDisplay FINAL) - Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing FINAL) - Q_PROPERTY(bool mirrored READ isMirrored WRITE setMirrored FINAL) - Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment FINAL) - Q_PROPERTY(qreal topPadding READ topPadding WRITE setTopPadding RESET resetTopPadding FINAL) - Q_PROPERTY(qreal leftPadding READ leftPadding WRITE setLeftPadding RESET resetLeftPadding FINAL) - Q_PROPERTY(qreal rightPadding READ rightPadding WRITE setRightPadding RESET resetRightPadding FINAL) - Q_PROPERTY(qreal bottomPadding READ bottomPadding WRITE setBottomPadding RESET resetBottomPadding FINAL) - -public: - enum Display { - IconOnly, - TextOnly, - TextBesideIcon, - TextUnderIcon - }; - Q_ENUM(Display) - - explicit QQuickIconLabel(QQuickItem *parent = nullptr); - ~QQuickIconLabel(); - - QQuickIcon icon() const; - void setIcon(const QQuickIcon &icon); - - QString text() const; - void setText(const QString text); - - QFont font() const; - void setFont(const QFont &font); - - QColor color() const; - void setColor(const QColor &color); - - Display display() const; - void setDisplay(Display display); - - qreal spacing() const; - void setSpacing(qreal spacing); - - bool isMirrored() const; - void setMirrored(bool mirrored); - - Qt::Alignment alignment() const; - void setAlignment(Qt::Alignment alignment); - - qreal topPadding() const; - void setTopPadding(qreal padding); - void resetTopPadding(); - - qreal leftPadding() const; - void setLeftPadding(qreal padding); - void resetLeftPadding(); - - qreal rightPadding() const; - void setRightPadding(qreal padding); - void resetRightPadding(); - - qreal bottomPadding() const; - void setBottomPadding(qreal padding); - void resetBottomPadding(); - -protected: - void componentComplete() override; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; - -private: - Q_DISABLE_COPY(QQuickIconLabel) - Q_DECLARE_PRIVATE(QQuickIconLabel) -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QQuickIconLabel) - -#endif // QQUICKICONLABEL_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconlabel_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconlabel_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickiconlabel_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickiconlabel_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKICONLABEL_P_P_H -#define QQUICKICONLABEL_P_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickIconImage; -class QQuickMnemonicLabel; - -class QQuickIconLabelPrivate : public QQuickItemPrivate, public QQuickItemChangeListener -{ - Q_DECLARE_PUBLIC(QQuickIconLabel) - -public: - bool hasIcon() const; - bool hasText() const; - - bool createImage(); - bool destroyImage(); - bool updateImage(); - void syncImage(); - void updateOrSyncImage(); - - bool createLabel(); - bool destroyLabel(); - bool updateLabel(); - void syncLabel(); - void updateOrSyncLabel(); - - void updateImplicitSize(); - void layout(); - - void watchChanges(QQuickItem *item); - void unwatchChanges(QQuickItem *item); - void setPositioningDirty(); - - bool isLeftToRight() const; - - void itemImplicitWidthChanged(QQuickItem *) override; - void itemImplicitHeightChanged(QQuickItem *) override; - void itemDestroyed(QQuickItem *item) override; - - bool mirrored = false; - QQuickIconLabel::Display display = QQuickIconLabel::TextBesideIcon; - Qt::Alignment alignment = Qt::AlignCenter; - qreal spacing = 0; - qreal topPadding = 0; - qreal leftPadding = 0; - qreal rightPadding = 0; - qreal bottomPadding = 0; - QFont font; - QColor color; - QString text; - QQuickIcon icon; - QQuickIconImage *image = nullptr; - QQuickMnemonicLabel *label = nullptr; -}; - -QT_END_NAMESPACE - -#endif // QQUICKICONLABEL_P_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickmnemoniclabel.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickmnemoniclabel.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickmnemoniclabel.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickmnemoniclabel.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,132 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickmnemoniclabel_p.h" - -#include - -QT_BEGIN_NAMESPACE - -QQuickMnemonicLabel::QQuickMnemonicLabel(QQuickItem *parent) - : QQuickText(parent) -{ -} - -QString QQuickMnemonicLabel::text() const -{ - return m_fullText; -} - -void QQuickMnemonicLabel::setText(const QString &text) -{ - if (m_fullText == text) - return; - - m_fullText = text; - updateMnemonic(); -} - -bool QQuickMnemonicLabel::isMnemonicVisible() const -{ - return m_mnemonicVisible; -} - -void QQuickMnemonicLabel::setMnemonicVisible(bool visible) -{ - if (m_mnemonicVisible == visible) - return; - - m_mnemonicVisible = visible; - updateMnemonic(); - - if (isComponentComplete()) - forceLayout(); -} - -static QTextLayout::FormatRange underlineRange(int start, int length = 1) -{ - QTextLayout::FormatRange range; - range.start = start; - range.length = length; - range.format.setFontUnderline(true); - return range; -} - -// based on QPlatformTheme::removeMnemonics() -void QQuickMnemonicLabel::updateMnemonic() -{ - QString text(m_fullText.size(), 0); - int idx = 0; - int pos = 0; - int len = m_fullText.length(); - QVector formats; - while (len) { - if (m_fullText.at(pos) == QLatin1Char('&') && (len == 1 || m_fullText.at(pos + 1) != QLatin1Char('&'))) { - if (m_mnemonicVisible && (pos == 0 || m_fullText.at(pos - 1) != QLatin1Char('&'))) - formats += underlineRange(pos); - ++pos; - --len; - if (len == 0) - break; - } else if (m_fullText.at(pos) == QLatin1Char('(') && len >= 4 && - m_fullText.at(pos + 1) == QLatin1Char('&') && - m_fullText.at(pos + 2) != QLatin1Char('&') && - m_fullText.at(pos + 3) == QLatin1Char(')')) { - // a mnemonic with format "\s*(&X)" - if (m_mnemonicVisible) { - formats += underlineRange(pos + 1); - } else { - int n = 0; - while (idx > n && text.at(idx - n - 1).isSpace()) - ++n; - idx -= n; - pos += 4; - len -= 4; - continue; - } - } - text[idx] = m_fullText.at(pos); - ++pos; - ++idx; - --len; - } - text.truncate(idx); - - QQuickTextPrivate::get(this)->layout.setFormats(formats); - QQuickText::setText(text); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickmnemoniclabel_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickmnemoniclabel_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickmnemoniclabel_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickmnemoniclabel_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKMNEMONICLABEL_P_H -#define QQUICKMNEMONICLABEL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickMnemonicLabel : public QQuickText -{ - Q_OBJECT - Q_PROPERTY(QString text READ text WRITE setText FINAL) - Q_PROPERTY(bool mnemonicVisible READ isMnemonicVisible WRITE setMnemonicVisible FINAL) - -public: - explicit QQuickMnemonicLabel(QQuickItem *parent = nullptr); - - QString text() const; - void setText(const QString &text); - - bool isMnemonicVisible() const; - void setMnemonicVisible(bool visible); - -private: - void updateMnemonic(); - - bool m_mnemonicVisible = true; - QString m_fullText; -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QQuickMnemonicLabel) - -#endif // QQUICKMNEMONICLABEL_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickpaddedrectangle.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickpaddedrectangle.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickpaddedrectangle.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickpaddedrectangle.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -41,7 +41,9 @@ QT_BEGIN_NAMESPACE QQuickPaddedRectangle::QQuickPaddedRectangle(QQuickItem *parent) : - QQuickRectangle(parent) + QQuickRectangle(parent), m_padding(0), + m_topPadding(0), m_leftPadding(0), m_rightPadding(0), m_bottomPadding(0), + m_hasTopPadding(false), m_hasLeftPadding(false), m_hasRightPadding(false), m_hasBottomPadding(false) { } @@ -198,10 +200,7 @@ m.translate(left, top); transformNode->setMatrix(m); - qreal w = qMax(0.0, width() -left-right); - qreal h = qMax(0.0, height() -top-bottom); - - rectNode->setRect(QRectF(0, 0, w, h)); + rectNode->setRect(boundingRect().adjusted(0, 0, -left-right, -top-bottom)); rectNode->update(); } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickpaddedrectangle_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickpaddedrectangle_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickpaddedrectangle_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickpaddedrectangle_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -101,15 +101,15 @@ void setRightPadding(qreal padding, bool has); void setBottomPadding(qreal padding, bool has); - qreal m_padding = 0; - qreal m_topPadding = 0; - qreal m_leftPadding = 0; - qreal m_rightPadding = 0; - qreal m_bottomPadding = 0; - bool m_hasTopPadding = false; - bool m_hasLeftPadding = false; - bool m_hasRightPadding = false; - bool m_hasBottomPadding = false; + qreal m_padding; + qreal m_topPadding; + qreal m_leftPadding; + qreal m_rightPadding; + qreal m_bottomPadding; + bool m_hasTopPadding; + bool m_hasLeftPadding; + bool m_hasRightPadding; + bool m_hasBottomPadding; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickproxytheme.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickproxytheme.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickproxytheme.cpp 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickproxytheme.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,170 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qquickproxytheme_p.h" + +#include +#include +#include + +QT_BEGIN_NAMESPACE + +QQuickProxyTheme::QQuickProxyTheme(QPlatformTheme *theme) + : m_theme(theme ? theme : QGuiApplicationPrivate::platform_theme) +{ +} + +QQuickProxyTheme::~QQuickProxyTheme() +{ + if (QGuiApplicationPrivate::platform_theme == this) + QGuiApplicationPrivate::platform_theme = m_theme; +} + +QPlatformTheme *QQuickProxyTheme::theme() const +{ + return m_theme; +} + +QPlatformMenuItem *QQuickProxyTheme::createPlatformMenuItem() const +{ + if (m_theme) + return m_theme->createPlatformMenuItem(); + return QPlatformTheme::createPlatformMenuItem(); +} + +QPlatformMenu *QQuickProxyTheme::createPlatformMenu() const +{ + if (m_theme) + return m_theme->createPlatformMenu(); + return QPlatformTheme::createPlatformMenu(); +} + +QPlatformMenuBar *QQuickProxyTheme::createPlatformMenuBar() const +{ + if (m_theme) + return m_theme->createPlatformMenuBar(); + return QPlatformTheme::createPlatformMenuBar(); +} + +void QQuickProxyTheme::showPlatformMenuBar() +{ + if (m_theme) + m_theme->showPlatformMenuBar(); + QPlatformTheme::showPlatformMenuBar(); +} + +bool QQuickProxyTheme::usePlatformNativeDialog(QPlatformTheme::DialogType type) const +{ + if (m_theme) + return m_theme->usePlatformNativeDialog(type); + return QPlatformTheme::usePlatformNativeDialog(type); +} + +QPlatformDialogHelper *QQuickProxyTheme::createPlatformDialogHelper(QPlatformTheme::DialogType type) const +{ + if (m_theme) + return m_theme->createPlatformDialogHelper(type); + return QPlatformTheme::createPlatformDialogHelper(type); +} + +#ifndef QT_NO_SYSTEMTRAYICON +QPlatformSystemTrayIcon *QQuickProxyTheme::createPlatformSystemTrayIcon() const +{ + if (m_theme) + return m_theme->createPlatformSystemTrayIcon(); + return QPlatformTheme::createPlatformSystemTrayIcon(); +} +#endif + +const QPalette *QQuickProxyTheme::palette(QPlatformTheme::Palette type) const +{ + if (m_theme) + return m_theme->palette(type); + return QPlatformTheme::palette(type); +} + +const QFont *QQuickProxyTheme::font(QPlatformTheme::Font type) const +{ + if (m_theme) + return m_theme->font(type); + return QPlatformTheme::font(type); +} + +QVariant QQuickProxyTheme::themeHint(QPlatformTheme::ThemeHint hint) const +{ + if (m_theme) + return m_theme->themeHint(hint); + return QPlatformTheme::themeHint(hint); +} + +QPixmap QQuickProxyTheme::standardPixmap(QPlatformTheme::StandardPixmap sp, const QSizeF &size) const +{ + if (m_theme) + return m_theme->standardPixmap(sp, size); + return QPlatformTheme::standardPixmap(sp, size); +} + +QIcon QQuickProxyTheme::fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions) const +{ + if (m_theme) + return m_theme->fileIcon(fileInfo, iconOptions); + return QPlatformTheme::fileIcon(fileInfo, iconOptions); +} + +QIconEngine *QQuickProxyTheme::createIconEngine(const QString &iconName) const +{ + if (m_theme) + return m_theme->createIconEngine(iconName); + return QPlatformTheme::createIconEngine(iconName); +} + +#if QT_CONFIG(shortcut) +QList QQuickProxyTheme::keyBindings(QKeySequence::StandardKey key) const +{ + if (m_theme) + return m_theme->keyBindings(key); + return QPlatformTheme::keyBindings(key); +} +#endif + +QString QQuickProxyTheme::standardButtonText(int button) const +{ + if (m_theme) + return m_theme->standardButtonText(button); + return QPlatformTheme::standardButtonText(button); +} + +QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickproxytheme_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickproxytheme_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickproxytheme_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickproxytheme_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKPROXYTHEME_P_H +#define QQUICKPROXYTHEME_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include + +QT_BEGIN_NAMESPACE + +class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickProxyTheme : public QPlatformTheme +{ +public: + explicit QQuickProxyTheme(QPlatformTheme *theme = nullptr); + ~QQuickProxyTheme(); + + QPlatformTheme* theme() const; + + QPlatformMenuItem* createPlatformMenuItem() const override; + QPlatformMenu* createPlatformMenu() const override; + QPlatformMenuBar* createPlatformMenuBar() const override; + void showPlatformMenuBar() override; + + bool usePlatformNativeDialog(DialogType type) const override; + QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override; + +#ifndef QT_NO_SYSTEMTRAYICON + QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override; +#endif + + const QPalette *palette(Palette type = SystemPalette) const override; + + const QFont *font(Font type = SystemFont) const override; + + QVariant themeHint(ThemeHint hint) const override; + + QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const override; + QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions = 0) const override; + + QIconEngine *createIconEngine(const QString &iconName) const override; + +#if QT_CONFIG(shortcut) + QList keyBindings(QKeySequence::StandardKey key) const override; +#endif + + QString standardButtonText(int button) const override; + +private: + QPlatformTheme *m_theme; +}; + +QT_END_NAMESPACE + +#endif // QQUICKPROXYTHEME_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleattached.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleattached.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleattached.cpp 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleattached.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,269 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qquickstyleattached_p.h" +#include "qquickstyle_p.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +static bool isDarkSystemTheme() +{ + if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) { + if (const QPalette *systemPalette = theme->palette(QPlatformTheme::SystemPalette)) { + const QColor textColor = systemPalette->color(QPalette::WindowText); + return textColor.red() > 128 && textColor.blue() > 128 && textColor.green() > 128; + } + } + return false; +} + +Q_QUICKCONTROLS2_PRIVATE_EXPORT bool qt_is_dark_system_theme() +{ + static bool dark = isDarkSystemTheme(); + return dark; +} + +static QQuickStyleAttached *attachedStyle(const QMetaObject *type, QObject *object, bool create = false) +{ + if (!object) + return nullptr; + int idx = -1; + return qobject_cast(qmlAttachedPropertiesObject(&idx, object, type, create)); +} + +static QQuickStyleAttached *findParentStyle(const QMetaObject *type, QObject *object) +{ + QQuickItem *item = qobject_cast(object); + if (item) { + // lookup parent items and popups + QQuickItem *parent = item->parentItem(); + while (parent) { + QQuickStyleAttached *style = attachedStyle(type, parent); + if (style) + return style; + + QQuickPopup *popup = qobject_cast(parent->parent()); + if (popup) + return attachedStyle(type, popup); + + parent = parent->parentItem(); + } + + // fallback to item's window + QQuickStyleAttached *style = attachedStyle(type, item->window()); + if (style) + return style; + } else { + // lookup popup's window + QQuickPopup *popup = qobject_cast(object); + if (popup) + return attachedStyle(type, popup->popupItem()->window()); + } + + // lookup parent window + QQuickWindow *window = qobject_cast(object); + if (window) { + QQuickWindow *parentWindow = qobject_cast(window->parent()); + if (parentWindow) { + QQuickStyleAttached *style = attachedStyle(type, window); + if (style) + return style; + } + } + + // fallback to engine (global) + if (object) { + QQmlEngine *engine = qmlEngine(object); + if (engine) { + QByteArray name = QByteArray("_q_") + type->className(); + QQuickStyleAttached *style = engine->property(name).value(); + if (!style) { + style = attachedStyle(type, engine, true); + engine->setProperty(name, QVariant::fromValue(style)); + } + return style; + } + } + + return nullptr; +} + +static QList findChildStyles(const QMetaObject *type, QObject *object) +{ + QList children; + + QQuickItem *item = qobject_cast(object); + if (!item) { + QQuickWindow *window = qobject_cast(object); + if (window) { + item = window->contentItem(); + + const auto windowChildren = window->children(); + for (QObject *child : windowChildren) { + QQuickWindow *childWindow = qobject_cast(child); + if (childWindow) { + QQuickStyleAttached *style = attachedStyle(type, childWindow); + if (style) + children += style; + } + } + } + } + + if (item) { + const auto childItems = item->childItems(); + for (QQuickItem *child : childItems) { + QQuickStyleAttached *style = attachedStyle(type, child); + if (style) + children += style; + else + children += findChildStyles(type, child); + } + } + + return children; +} + +QQuickStyleAttached::QQuickStyleAttached(QObject *parent) : QObject(parent) +{ + QQuickItem *item = qobject_cast(parent); + if (!item) { + QQuickPopup *popup = qobject_cast(parent); + if (popup) + item = popup->popupItem(); + } + + if (item) { + connect(item, &QQuickItem::windowChanged, this, &QQuickStyleAttached::itemWindowChanged); + QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Parent); + } +} + +QQuickStyleAttached::~QQuickStyleAttached() +{ + QQuickItem *item = qobject_cast(parent()); + if (item) { + disconnect(item, &QQuickItem::windowChanged, this, &QQuickStyleAttached::itemWindowChanged); + QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Parent); + } + + setParentStyle(nullptr); +} + +QSharedPointer QQuickStyleAttached::settings(const QString &group) +{ +#ifndef QT_NO_SETTINGS + const QString filePath = QQuickStylePrivate::configFilePath(); + if (QFile::exists(filePath)) { + QFileSelector selector; + QSettings *settings = new QSettings(selector.select(filePath), QSettings::IniFormat); + if (!group.isEmpty()) + settings->beginGroup(group); + return QSharedPointer(settings); + } +#endif // QT_NO_SETTINGS + return QSharedPointer(); +} + +QList QQuickStyleAttached::childStyles() const +{ + return m_childStyles; +} + +QQuickStyleAttached *QQuickStyleAttached::parentStyle() const +{ + return m_parentStyle; +} + +void QQuickStyleAttached::setParentStyle(QQuickStyleAttached *style) +{ + if (m_parentStyle != style) { + QQuickStyleAttached *oldParent = m_parentStyle; + if (m_parentStyle) + m_parentStyle->m_childStyles.removeOne(this); + m_parentStyle = style; + if (style) + style->m_childStyles.append(this); + parentStyleChange(style, oldParent); + } +} + +void QQuickStyleAttached::init() +{ + QQuickStyleAttached *parentStyle = findParentStyle(metaObject(), parent()); + if (parentStyle) + setParentStyle(parentStyle); + + const QList children = findChildStyles(metaObject(), parent()); + for (QQuickStyleAttached *child : children) + child->setParentStyle(this); +} + +void QQuickStyleAttached::parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent) +{ + Q_UNUSED(newParent); + Q_UNUSED(oldParent); +} + +void QQuickStyleAttached::itemWindowChanged(QQuickWindow *window) +{ + QQuickStyleAttached *parentStyle = nullptr; + QQuickItem *item = qobject_cast(sender()); + if (item) + parentStyle = findParentStyle(metaObject(), item); + if (!parentStyle) + parentStyle = attachedStyle(metaObject(), window); + setParentStyle(parentStyle); +} + +void QQuickStyleAttached::itemParentChanged(QQuickItem *item, QQuickItem *parent) +{ + Q_UNUSED(parent); + setParentStyle(findParentStyle(metaObject(), item)); +} + +QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleattached_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleattached_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleattached_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleattached_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,94 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKSTYLEATTACHED_P_H +#define QQUICKSTYLEATTACHED_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class QSettings; +class QQuickWindow; + +class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickStyleAttached : public QObject, public QQuickItemChangeListener +{ + Q_OBJECT + +public: + explicit QQuickStyleAttached(QObject *parent = nullptr); + ~QQuickStyleAttached(); + + static QSharedPointer settings(const QString &group = QString()); + +protected: + void init(); + + QList childStyles() const; + + QQuickStyleAttached *parentStyle() const; + void setParentStyle(QQuickStyleAttached *style); + + virtual void parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent); + + void itemWindowChanged(QQuickWindow *window); + void itemParentChanged(QQuickItem *item, QQuickItem *parent) override; + +private: + QList m_childStyles; + QPointer m_parentStyle; +}; + +QT_END_NAMESPACE + +#endif // QQUICKSTYLEATTACHED_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyle.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyle.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyle.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyle.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -36,25 +36,17 @@ #include "qquickstyle.h" #include "qquickstyle_p.h" +#include "qquickstyleattached_p.h" #include -#include #include #include -#include #include -#include -#include -#include -#include #include -#include #include #include #include -#include - QT_BEGIN_NAMESPACE /*! @@ -105,25 +97,19 @@ \sa {Styling Qt Quick Controls 2} */ -static QStringList envPathList(const QByteArray &var) -{ - QStringList paths; - if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty(var))) { - const QByteArray value = qgetenv(var); - paths += QString::fromLocal8Bit(value).split(QDir::listSeparator(), QString::SkipEmptyParts); - } - return paths; -} - +// TODO: QQmlImportDatabase::defaultImportPathList() static QStringList defaultImportPathList() { QStringList importPaths; importPaths.reserve(3); -#ifndef QT_STATIC importPaths += QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); -#endif - importPaths += envPathList("QML2_IMPORT_PATH"); - importPaths += QStringLiteral(":/qt-project.org/imports"); + + if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { + const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); + importPaths += QString::fromLatin1(envImportPath).split(QDir::listSeparator(), QString::SkipEmptyParts); + } + + importPaths += QStringLiteral("qrc:/qt-project.org/imports"); importPaths += QCoreApplication::applicationDirPath(); return importPaths; } @@ -185,12 +171,12 @@ if (style.isEmpty()) style = QGuiApplicationPrivate::styleOverride; if (style.isEmpty()) - style = QString::fromLocal8Bit(qgetenv("QT_QUICK_CONTROLS_STYLE")); + style = QString::fromLatin1(qgetenv("QT_QUICK_CONTROLS_STYLE")); if (fallbackStyle.isEmpty()) - setFallbackStyle(QString::fromLocal8Bit(qgetenv("QT_QUICK_CONTROLS_FALLBACK_STYLE")), "QT_QUICK_CONTROLS_FALLBACK_STYLE"); + setFallbackStyle(QString::fromLatin1(qgetenv("QT_QUICK_CONTROLS_FALLBACK_STYLE")), "QT_QUICK_CONTROLS_FALLBACK_STYLE"); #if QT_CONFIG(settings) if (style.isEmpty() || fallbackStyle.isEmpty()) { - QSharedPointer settings = QQuickStylePrivate::settings(QStringLiteral("Controls")); + QSharedPointer settings = QQuickStyleAttached::settings(QStringLiteral("Controls")); if (settings) { if (style.isEmpty()) style = settings->value(QStringLiteral("Style")).toString(); @@ -243,14 +229,13 @@ style.clear(); fallbackStyle.clear(); fallbackMethod.clear(); - configFilePath.clear(); } QString resolveConfigFilePath() { if (configFilePath.isEmpty()) { configFilePath = QFile::decodeName(qgetenv("QT_QUICK_CONTROLS_CONF")); - if (configFilePath.isEmpty() || !QFile::exists(configFilePath)) { + if (!QFile::exists(configFilePath)) { if (!configFilePath.isEmpty()) qWarning("QT_QUICK_CONTROLS_CONF=%s: No such file", qPrintable(configFilePath)); @@ -266,90 +251,19 @@ QString fallbackStyle; QByteArray fallbackMethod; QString configFilePath; - QStringList customStylePaths; }; Q_GLOBAL_STATIC(QQuickStyleSpec, styleSpec) -static QStringList parseStylePathsWithColon(const QString &var) -{ - QStringList paths; - const QChar colon = QLatin1Char(':'); - int currentIndex = 0; - - do { - int nextColonIndex = -1; - QString path; - - if (var.at(currentIndex) == colon) { - // This is either a list separator, or a qrc path. - if (var.at(currentIndex + 1) == colon) { - // It's a double colon (list separator followed by qrc path); - // find the end of the path. - nextColonIndex = var.indexOf(colon, currentIndex + 2); - path = var.mid(currentIndex + 1, - nextColonIndex == -1 ? -1 : nextColonIndex - currentIndex - 1); - } else { - // It's a single colon. - nextColonIndex = var.indexOf(colon, currentIndex + 1); - if (currentIndex == 0) { - // If we're at the start of the string, then it's a qrc path. - path = var.mid(currentIndex, - nextColonIndex == -1 ? -1 : nextColonIndex - currentIndex); - } else { - // Otherwise, it's a separator. - path = var.mid(currentIndex + 1, - nextColonIndex == -1 ? -1 : nextColonIndex - currentIndex - 1); - } - } - } else { - // It's a file path. - nextColonIndex = var.indexOf(colon, currentIndex); - path = var.mid(currentIndex, - nextColonIndex == -1 ? -1 : nextColonIndex - currentIndex); - } - - paths += path; - currentIndex = nextColonIndex; - - // Keep going until we can't find any more colons, - // or we're at the last character. - } while (currentIndex != -1 && currentIndex < var.size() - 1); - - return paths; -} - -QStringList QQuickStylePrivate::stylePaths(bool resolve) +QStringList QQuickStylePrivate::stylePaths() { - // user-requested style path + // system/custom style paths QStringList paths; - if (resolve) { - QString path = styleSpec()->path(); - if (path.endsWith(QLatin1Char('/'))) - path.chop(1); - if (!path.isEmpty()) - paths += path; - } - if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE_PATH"))) { - const QString value = QString::fromLocal8Bit(qgetenv("QT_QUICK_CONTROLS_STYLE_PATH")); - const QChar listSeparator = QDir::listSeparator(); - if (listSeparator == QLatin1Char(':')) { - // Split manually to avoid breaking paths on systems where : is the list separator, - // since it's also used for qrc paths. - paths += parseStylePathsWithColon(value); - } else { - // Fast/simpler path for systems where something other than : is used as - // the list separator (such as ';'). - const QStringList customPaths = value.split(listSeparator, QString::SkipEmptyParts); - paths += customPaths; - } + const QByteArray value = qgetenv("QT_QUICK_CONTROLS_STYLE_PATH"); + paths += QString::fromLatin1(value).split(QDir::listSeparator(), QString::SkipEmptyParts); } - // system/custom style paths - paths += styleSpec()->customStylePaths; - paths += envPathList("QT_QUICK_CONTROLS_STYLE_PATH"); - // built-in import paths const QString targetPath = QStringLiteral("QtQuick/Controls.2"); const QStringList importPaths = defaultImportPathList(); @@ -359,7 +273,6 @@ paths += dir.absolutePath(); } - paths.removeDuplicates(); return paths; } @@ -392,8 +305,7 @@ void QQuickStylePrivate::reset() { - if (styleSpec()) - styleSpec()->reset(); + styleSpec()->reset(); } QString QQuickStylePrivate::configFilePath() @@ -401,113 +313,6 @@ return styleSpec()->resolveConfigFilePath(); } -QSharedPointer QQuickStylePrivate::settings(const QString &group) -{ -#ifndef QT_NO_SETTINGS - const QString filePath = QQuickStylePrivate::configFilePath(); - if (QFile::exists(filePath)) { - QFileSelector selector; - QSettings *settings = new QSettings(selector.select(filePath), QSettings::IniFormat); - if (!group.isEmpty()) - settings->beginGroup(group); - return QSharedPointer(settings); - } -#endif // QT_NO_SETTINGS - return QSharedPointer(); -} - -#if QT_CONFIG(settings) -static void readValue(const QSharedPointer &settings, const QString &name, std::function setValue) -{ - const QVariant var = settings->value(name); - if (var.isValid()) - setValue(var); -} - -template -static Enum toEnumValue(const QVariant &var) -{ - // ### TODO: expose QFont enums to the meta object system using Q_ENUM - //QMetaEnum enumeration = QMetaEnum::fromType(); - //bool ok = false; - //int value = enumeration.keyToValue(var.toByteArray(), &ok); - //if (!ok) - // value = var.toInt(); - //return static_cast(value); - - return static_cast(var.toInt()); -} - -const QFont *QQuickStylePrivate::readFont(const QSharedPointer &settings) -{ - const QVariant var = settings->value(QStringLiteral("Font")); - if (var.isValid()) - return new QFont(var.value()); - - QFont f; - settings->beginGroup(QStringLiteral("Font")); - readValue(settings, QStringLiteral("Family"), [&f](const QVariant &var) { f.setFamily(var.toString()); }); - readValue(settings, QStringLiteral("PointSize"), [&f](const QVariant &var) { f.setPointSizeF(var.toReal()); }); - readValue(settings, QStringLiteral("PixelSize"), [&f](const QVariant &var) { f.setPixelSize(var.toInt()); }); - readValue(settings, QStringLiteral("StyleHint"), [&f](const QVariant &var) { f.setStyleHint(toEnumValue(var.toInt())); }); - readValue(settings, QStringLiteral("Weight"), [&f](const QVariant &var) { f.setWeight(toEnumValue(var)); }); - readValue(settings, QStringLiteral("Style"), [&f](const QVariant &var) { f.setStyle(toEnumValue(var.toInt())); }); - settings->endGroup(); - return new QFont(f); -} - -static void readColorGroup(const QSharedPointer &settings, QPalette::ColorGroup group, QPalette *palette) -{ - const QStringList keys = settings->childKeys(); - if (keys.isEmpty()) - return; - - static const int index = QPalette::staticMetaObject.indexOfEnumerator("ColorRole"); - Q_ASSERT(index != -1); - QMetaEnum metaEnum = QPalette::staticMetaObject.enumerator(index); - - for (const QString &key : keys) { - bool ok = false; - int role = metaEnum.keyToValue(key.toUtf8(), &ok); - if (ok) - palette->setColor(group, static_cast(role), settings->value(key).value()); - } -} - -const QPalette *QQuickStylePrivate::readPalette(const QSharedPointer &settings) -{ - QPalette p; - settings->beginGroup(QStringLiteral("Palette")); - readColorGroup(settings, QPalette::All, &p); - - settings->beginGroup(QStringLiteral("Normal")); - readColorGroup(settings, QPalette::Normal, &p); - settings->endGroup(); - - settings->beginGroup(QStringLiteral("Disabled")); - readColorGroup(settings, QPalette::Disabled, &p); - settings->endGroup(); - return new QPalette(p); -} -#endif // QT_CONFIG(settings) - -static bool qt_is_dark_system_theme() -{ - if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) { - if (const QPalette *systemPalette = theme->palette(QPlatformTheme::SystemPalette)) { - const QColor textColor = systemPalette->color(QPalette::WindowText); - return textColor.red() > 128 && textColor.blue() > 128 && textColor.green() > 128; - } - } - return false; -} - -bool QQuickStylePrivate::isDarkSystemTheme() -{ - static bool dark = qt_is_dark_system_theme(); - return dark; -} - /*! Returns the name of the application style. @@ -577,11 +382,9 @@ /*! \since 5.9 - Returns the names of the available styles. + Returns the names of the available built-in styles. \note The method must be called \b after creating an instance of QGuiApplication. - - \sa stylePathList(), addStylePath() */ QStringList QQuickStyle::availableStyles() { @@ -605,58 +408,4 @@ return styles; } -/*! - \since 5.12 - - Returns the list of directories where Qt Quick Controls 2 searches for available styles. - - By default, the list contains paths specified in the \c QT_QUICK_CONTROLS_STYLE_PATH - environment variable, and any existing \c QtQuick/Controls.2 sub-directories in - \l QQmlEngine::importPathList(). - - \sa addStylePath(), availableStyles() -*/ -QStringList QQuickStyle::stylePathList() -{ - return QQuickStylePrivate::stylePaths(); -} - -/*! - \since 5.12 - - Adds \a path as a directory where Qt Quick Controls 2 searches for available styles. - - The \a path may be any local filesystem directory or \l {The Qt Resource System}{Qt Resource} directory. - For example, the following paths are all valid: - - \list - \li \c {/path/to/styles/} - \li \c {file:///path/to/styles/} - \li \c {:/path/to/styles/} - \li \c {qrc:/path/to/styles/}) - \endlist - - The \a path will be converted into \l {QDir::canonicalPath}{canonical form} before it is added to - the style path list. - - The newly added \a path will be first in the stylePathList(). - - \sa stylePathList(), availableStyles() -*/ -void QQuickStyle::addStylePath(const QString &path) -{ - if (path.isEmpty()) - return; - - const QUrl url = QUrl(path); - if (url.isRelative() || url.scheme() == QLatin1String("file") - || (url.scheme().length() == 1 && QFile::exists(path)) ) { // windows path - styleSpec()->customStylePaths.prepend(QDir(path).canonicalPath()); - } else if (url.scheme() == QLatin1String("qrc")) { - styleSpec()->customStylePaths.prepend(QLatin1Char(':') + url.path()); - } else { - styleSpec()->customStylePaths.prepend(path); - } -} - QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyle.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyle.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyle.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyle.h 2018-03-21 07:59:29.000000000 +0000 @@ -51,8 +51,6 @@ static void setStyle(const QString &style); static void setFallbackStyle(const QString &style); static QStringList availableStyles(); - static QStringList stylePathList(); - static void addStylePath(const QString &path); }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyle_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyle_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyle_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyle_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -49,26 +49,19 @@ // #include -#include #include QT_BEGIN_NAMESPACE -class QSettings; - class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickStylePrivate { public: - static QStringList stylePaths(bool resolve = false); + static QStringList stylePaths(); static QString fallbackStyle(); static bool isCustomStyle(); static void init(const QUrl &baseUrl); static void reset(); static QString configFilePath(); - static QSharedPointer settings(const QString &group = QString()); - static const QFont *readFont(const QSharedPointer &settings); - static const QPalette *readPalette(const QSharedPointer &settings); - static bool isDarkSystemTheme(); }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleplugin.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleplugin.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleplugin.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleplugin.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -35,20 +35,14 @@ ****************************************************************************/ #include "qquickstyleplugin_p.h" +#include "qquickproxytheme_p.h" #include "qquickstyle.h" -#include "qquickstyle_p.h" -#include "qquickstyleselector_p.h" -QT_BEGIN_NAMESPACE +#include -class QQuickStylePluginPrivate -{ -public: - mutable QScopedPointer selector; -}; +QT_BEGIN_NAMESPACE -QQuickStylePlugin::QQuickStylePlugin(QObject *parent) - : QQmlExtensionPlugin(parent), d_ptr(new QQuickStylePluginPrivate) +QQuickStylePlugin::QQuickStylePlugin(QObject *parent) : QQmlExtensionPlugin(parent) { } @@ -56,36 +50,53 @@ { } -QString QQuickStylePlugin::name() const +void QQuickStylePlugin::registerTypes(const char *uri) { - return QString(); + Q_UNUSED(uri); } -void QQuickStylePlugin::initializeTheme(QQuickTheme *theme) +void QQuickStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) { - Q_UNUSED(theme); + Q_UNUSED(engine); + Q_UNUSED(uri); + + // make sure not to re-create the proxy theme if initializeEngine() + // is called multiple times, like in case of qml2puppet (QTBUG-54995) + if (!m_theme.isNull()) + return; + + const QString style = name(); + if (!style.isEmpty() && style.compare(QQuickStyle::name(), Qt::CaseInsensitive) == 0) { + m_theme.reset(createTheme()); + if (m_theme) + QGuiApplicationPrivate::platform_theme = m_theme.data(); + } } -QUrl QQuickStylePlugin::resolvedUrl(const QString &fileName) const +QString QQuickStylePlugin::name() const { - Q_D(const QQuickStylePlugin); - if (!d->selector) { - d->selector.reset(new QQuickStyleSelector); - const QString style = QQuickStyle::name(); - if (!style.isEmpty()) - d->selector->addSelector(style); - - const QString fallback = QQuickStylePrivate::fallbackStyle(); - if (!fallback.isEmpty() && fallback != style) - d->selector->addSelector(fallback); + return QString(); +} - const QString theme = name(); - if (!theme.isEmpty() && theme != style) - d->selector->addSelector(theme); +QQuickProxyTheme *QQuickStylePlugin::createTheme() const +{ + return nullptr; +} - d->selector->setPaths(QQuickStylePrivate::stylePaths(true)); - } - return d->selector->select(fileName); +/* + Returns either a file system path if Qt was built as shared libraries, + or a QRC path if Qt was built statically. +*/ +QUrl QQuickStylePlugin::typeUrl(const QString &name) const +{ +#ifdef QT_STATIC + QString url = QLatin1String("qrc") + baseUrl().path(); +#else + QString url = baseUrl().toString(); +#endif + if (!name.isEmpty()) + url += QLatin1Char('/') + name; + return QUrl(url); } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleplugin_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleplugin_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleplugin_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleplugin_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,13 +48,13 @@ // We mean it. // +#include #include #include QT_BEGIN_NAMESPACE -class QQuickTheme; -class QQuickStylePluginPrivate; +class QQuickProxyTheme; class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickStylePlugin : public QQmlExtensionPlugin { @@ -64,15 +64,16 @@ explicit QQuickStylePlugin(QObject *parent = nullptr); ~QQuickStylePlugin(); + void registerTypes(const char *uri) override; + void initializeEngine(QQmlEngine *engine, const char *uri) override; + virtual QString name() const; - virtual void initializeTheme(QQuickTheme *theme); + virtual QQuickProxyTheme *createTheme() const; - QUrl resolvedUrl(const QString &fileName) const; + QUrl typeUrl(const QString &name = QString()) const; private: - Q_DISABLE_COPY(QQuickStylePlugin) - Q_DECLARE_PRIVATE(QQuickStylePlugin) - QScopedPointer d_ptr; + QScopedPointer m_theme; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleselector.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleselector.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleselector.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleselector.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -40,118 +40,136 @@ #include "qquickstyleselector_p.h" #include "qquickstyleselector_p_p.h" +#include "qquickstyle.h" +#include "qquickstyle_p.h" +#include +#include #include +#include #include -#include +#include + #include +#include QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQtQuickControlsStyle, "qt.quick.controls.style") +static bool isLocalScheme(const QString &scheme) +{ + bool local = scheme == QLatin1String("qrc"); +#ifdef Q_OS_ANDROID + local |= scheme == QLatin1String("assets"); +#endif + return local; +} static QString ensureSlash(const QString &path) { - if (path.isEmpty() || path.endsWith(QLatin1Char('/'))) + if (path.endsWith(QLatin1Char('/'))) return path; return path + QLatin1Char('/'); } -static QStringList prefixedPlatformSelectors(const QChar &prefix) +static QStringList allSelectors(const QString &style = QString()) { - QStringList selectors = QFileSelectorPrivate::platformSelectors(); - for (int i = 0; i < selectors.count(); ++i) - selectors[i].prepend(prefix); - return selectors; -} - -static QStringList allSelectors() -{ - static const QStringList platformSelectors = prefixedPlatformSelectors(QLatin1Char('+')); + static const QStringList platformSelectors = QFileSelectorPrivate::platformSelectors(); QStringList selectors = platformSelectors; const QString locale = QLocale().name(); if (!locale.isEmpty()) - selectors += QLatin1Char('+') + locale; + selectors += locale; + if (!style.isEmpty()) + selectors.prepend(style); return selectors; } -QUrl QQuickStyleSelectorPrivate::select(const QString &filePath) const +QString QQuickStyleSelectorPrivate::select(const QString &filePath) const { QFileInfo fi(filePath); // If file doesn't exist, don't select if (!fi.exists()) - return QUrl(); + return filePath; + + const QString path = fi.path(); + const QString ret = QFileSelectorPrivate::selectionHelper(path.isEmpty() ? QString() : path + QLatin1Char('/'), + fi.fileName(), allSelectors(styleName), QChar()); - const QString selected = QFileSelectorPrivate::selectionHelper(ensureSlash(fi.canonicalPath()), - fi.fileName(), allSelectors(), QChar()); + if (!ret.isEmpty()) + return ret; + return filePath; +} - if (selected.startsWith(QLatin1Char(':'))) - return QUrl(QLatin1String("qrc") + selected); +QString QQuickStyleSelectorPrivate::trySelect(const QString &filePath, const QString &fallback) const +{ + QFileInfo fi(filePath); + if (!fi.exists()) + return fallback; - return QUrl::fromLocalFile(selected.isEmpty() ? filePath : selected); + // the path contains the name of the custom/fallback style, so exclude it from + // the selectors. the rest of the selectors (os, locale) are still valid, though. + const QString path = fi.path(); + const QString selectedPath = QFileSelectorPrivate::selectionHelper(path.isEmpty() ? QString() : path + QLatin1Char('/'), + fi.fileName(), allSelectors(), QChar()); + if (selectedPath.startsWith(QLatin1Char(':'))) + return QLatin1String("qrc") + selectedPath; + return QUrl::fromLocalFile(QFileInfo(selectedPath).absoluteFilePath()).toString(); } QQuickStyleSelector::QQuickStyleSelector() : d_ptr(new QQuickStyleSelectorPrivate) { + Q_D(QQuickStyleSelector); + d->styleName = QQuickStyle::name(); + d->stylePath = QQuickStyle::path(); } QQuickStyleSelector::~QQuickStyleSelector() { } -QStringList QQuickStyleSelector::selectors() const +QUrl QQuickStyleSelector::baseUrl() const { Q_D(const QQuickStyleSelector); - return d->selectors; + return d->baseUrl; } -void QQuickStyleSelector::addSelector(const QString &selector) +void QQuickStyleSelector::setBaseUrl(const QUrl &url) { Q_D(QQuickStyleSelector); - if (d->selectors.contains(selector)) - return; - - d->selectors += selector; + d->baseUrl = url; + d->basePath = QQmlFile::urlToLocalFileOrQrc(url.toString(QUrl::StripTrailingSlash) + QLatin1Char('/')); } -QStringList QQuickStyleSelector::paths() const +QString QQuickStyleSelector::select(const QString &fileName) const { Q_D(const QQuickStyleSelector); - return d->paths; -} -void QQuickStyleSelector::setPaths(const QStringList &paths) -{ - Q_D(QQuickStyleSelector); - d->paths = paths; -} + // 1) try selecting from a custom style path, for example ":/mystyle" + if (QQuickStylePrivate::isCustomStyle()) { + // NOTE: this path may contain a subset of controls + const QString selectedPath = d->trySelect(ensureSlash(d->stylePath) + d->styleName + QLatin1Char('/') + fileName); + if (!selectedPath.isEmpty()) + return selectedPath; + } -QUrl QQuickStyleSelector::select(const QString &fileName) const -{ - Q_D(const QQuickStyleSelector); - // The lookup order is - // 1) requested style (e.g. "MyStyle", included in d->selectors) - // 2) fallback style (e.g. "Material", included in d->selectors) - // 3) default style (empty selector, not in d->selectors) - qCDebug(lcQtQuickControlsStyle) << "selecting" << fileName << "from" << d->paths << "with selectors" << d->selectors; - - int to = d->selectors.count() - 1; - if (d->selectors.isEmpty() || !d->selectors.first().isEmpty()) - ++to; // lookup #3 unless #1 is also empty (redundant) - - // NOTE: last iteration intentionally out of bounds => empty selector - for (int i = 0; i <= to; ++i) { - const QString selector = d->selectors.value(i); - for (const QString &path : d->paths) { - const QUrl selectedUrl = d->select(ensureSlash(path) + selector + QLatin1Char('/') + fileName); - if (selectedUrl.isValid()) { - qCDebug(lcQtQuickControlsStyle) << "==>" << selectedUrl << "from" << path << "with selector" << selector; - return selectedUrl; - } - } + // 2) try selecting from the fallback style path, for example QT_INSTALL_QML/QtQuick/Controls.2/Material + const QString fallbackStyle = QQuickStylePrivate::fallbackStyle(); + if (!fallbackStyle.isEmpty()) { + // NOTE: this path may also contain a subset of controls + const QString selectedPath = d->trySelect(ensureSlash(d->basePath) + fallbackStyle + QLatin1Char('/') + fileName); + if (!selectedPath.isEmpty()) + return selectedPath; } - return fileName; + // 3) fallback to the default style that is guaranteed to contain all controls + QUrl url(ensureSlash(d->baseUrl.toString()) + fileName); + if (isLocalScheme(url.scheme())) { + QString equivalentPath = QLatin1Char(':') + url.path(); + QString selectedPath = d->select(equivalentPath); + url.setPath(selectedPath.remove(0, 1)); + } else if (url.isLocalFile()) { + url = QUrl::fromLocalFile(d->select(url.toLocalFile())); + } + return url.toString(QUrl::NormalizePathSegments); } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleselector_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleselector_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleselector_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleselector_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -67,13 +67,10 @@ QQuickStyleSelector(); ~QQuickStyleSelector(); - QStringList selectors() const; - void addSelector(const QString &selector); + QUrl baseUrl() const; + void setBaseUrl(const QUrl &url); - QStringList paths() const; - void setPaths(const QStringList &paths); - - QUrl select(const QString &fileName) const; + QString select(const QString &fileName) const; private: Q_DISABLE_COPY(QQuickStyleSelector) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleselector_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleselector_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquickstyleselector_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquickstyleselector_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -59,10 +59,13 @@ class QQuickStyleSelectorPrivate { public: - QUrl select(const QString &filePath) const; + QString select(const QString &filePath) const; + QString trySelect(const QString &filePath, const QString &fallback = QString()) const; - QStringList paths; - QStringList selectors; + QUrl baseUrl; + QString basePath; + QString styleName; + QString stylePath; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquicktumblerview.cpp qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquicktumblerview.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquicktumblerview.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquicktumblerview.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -46,7 +46,12 @@ QT_BEGIN_NAMESPACE QQuickTumblerView::QQuickTumblerView(QQuickItem *parent) : - QQuickItem(parent) + QQuickItem(parent), + m_tumbler(nullptr), + m_delegate(nullptr), + m_pathView(nullptr), + m_listView(nullptr), + m_path(nullptr) { // We don't call createView() here because we don't know what the wrap flag is set to // yet, and we don't want to create a view that might never get used. @@ -221,9 +226,9 @@ // Since QQuickTumbler can't know about QQuickTumblerView, we use its private API to // inform it that it should delay setting wrap. QQuickTumblerPrivate *tumblerPrivate = QQuickTumblerPrivate::get(m_tumbler); - tumblerPrivate->beginSetModel(); + tumblerPrivate->lockWrap(); m_pathView->setModel(m_model); - tumblerPrivate->endSetModel(); + tumblerPrivate->unlockWrap(); // The count-depends-on-wrap behavior could cause wrap to change after // the call above, so we must check that we're still using a PathView. @@ -234,7 +239,7 @@ QQuickTumblerPrivate *tumblerPrivate = QQuickTumblerPrivate::get(m_tumbler); // setModel() causes QQuickTumblerPrivate::_q_onViewCountChanged() to - // be called, which calls QQuickTumbler::setCurrentIndex(), + // be called called, which calls QQuickTumbler::setCurrentIndex(), // which results in QQuickItemViewPrivate::createHighlightItem() being // called. When the highlight item is created, // QQuickTumblerPrivate::itemChildAdded() is notified and diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquicktumblerview_p.h qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquicktumblerview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/qquicktumblerview_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/qquicktumblerview_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -96,12 +96,12 @@ void wrapChange(); - QQuickTumbler *m_tumbler = nullptr; + QQuickTumbler *m_tumbler; QVariant m_model; - QQmlComponent *m_delegate = nullptr; - QQuickPathView *m_pathView = nullptr; - QQuickListView *m_listView = nullptr; - QQuickPath *m_path = nullptr; + QQmlComponent *m_delegate; + QQuickPathView *m_pathView; + QQuickListView *m_listView; + QQuickPath *m_path; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/quickcontrols2.pri qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/quickcontrols2.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/quickcontrols2.pri 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/quickcontrols2.pri 2018-03-21 07:59:29.000000000 +0000 @@ -1,40 +1,30 @@ HEADERS += \ $$PWD/qquickanimatednode_p.h \ - $$PWD/qquickattachedobject_p.h \ - $$PWD/qquickchecklabel_p.h \ $$PWD/qquickclippedtext_p.h \ - $$PWD/qquickcolor_p.h \ - $$PWD/qquickcolorimage_p.h \ - $$PWD/qquickiconimage_p.h \ - $$PWD/qquickiconimage_p_p.h \ - $$PWD/qquickiconlabel_p.h \ - $$PWD/qquickiconlabel_p_p.h \ + $$PWD/qquickcolorimageprovider_p.h \ $$PWD/qquickitemgroup_p.h \ - $$PWD/qquickmnemoniclabel_p.h \ - $$PWD/qquickpaddedrectangle_p.h \ $$PWD/qquickplaceholdertext_p.h \ + $$PWD/qquickproxytheme_p.h \ $$PWD/qquickstyle.h \ $$PWD/qquickstyle_p.h \ + $$PWD/qquickstyleattached_p.h \ $$PWD/qquickstyleplugin_p.h \ $$PWD/qquickstyleselector_p.h \ - $$PWD/qquickstyleselector_p_p.h + $$PWD/qquickstyleselector_p_p.h \ + $$PWD/qquickpaddedrectangle_p.h SOURCES += \ $$PWD/qquickanimatednode.cpp \ - $$PWD/qquickattachedobject.cpp \ - $$PWD/qquickchecklabel.cpp \ $$PWD/qquickclippedtext.cpp \ - $$PWD/qquickcolor.cpp \ - $$PWD/qquickcolorimage.cpp \ - $$PWD/qquickiconimage.cpp \ - $$PWD/qquickiconlabel.cpp \ + $$PWD/qquickcolorimageprovider.cpp \ $$PWD/qquickitemgroup.cpp \ - $$PWD/qquickmnemoniclabel.cpp \ - $$PWD/qquickpaddedrectangle.cpp \ $$PWD/qquickplaceholdertext.cpp \ + $$PWD/qquickproxytheme.cpp \ $$PWD/qquickstyle.cpp \ + $$PWD/qquickstyleattached.cpp \ $$PWD/qquickstyleplugin.cpp \ - $$PWD/qquickstyleselector.cpp + $$PWD/qquickstyleselector.cpp \ + $$PWD/qquickpaddedrectangle.cpp qtConfig(quick-listview):qtConfig(quick-pathview) { HEADERS += \ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/quickcontrols2.pro qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/quickcontrols2.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quickcontrols2/quickcontrols2.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quickcontrols2/quickcontrols2.pro 2018-03-21 07:59:29.000000000 +0000 @@ -7,7 +7,7 @@ DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII HEADERS += \ - $$PWD/qtquickcontrols2global.h \ + $$PWD/qtquickcontrols2global.h $$PWD/qtquickcontrols2global_p.h include(quickcontrols2.pri) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickabstractbutton.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickabstractbutton.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickabstractbutton.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickabstractbutton.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -37,20 +37,19 @@ #include "qquickabstractbutton_p.h" #include "qquickabstractbutton_p_p.h" #include "qquickbuttongroup_p.h" -#include "qquickaction_p.h" -#include "qquickaction_p_p.h" -#include "qquickshortcutcontext_p_p.h" #include "qquickdeferredexecute_p_p.h" #include #include -#include -#include #include #include QT_BEGIN_NAMESPACE +// copied from qabstractbutton.cpp +static const int AUTO_REPEAT_DELAY = 300; +static const int AUTO_REPEAT_INTERVAL = 100; + /*! \qmltype AbstractButton \inherits Control @@ -113,29 +112,30 @@ This signal is emitted when the button is interactively double clicked by the user via touch or mouse. */ -void QQuickAbstractButtonPrivate::setPressPoint(const QPointF &point) +QQuickAbstractButtonPrivate::QQuickAbstractButtonPrivate() + : down(false), + explicitDown(false), + pressed(false), + keepPressed(false), + checked(false), + checkable(false), + autoExclusive(false), + autoRepeat(false), + wasHeld(false), + holdTimer(0), + delayTimer(0), + repeatTimer(0), + pressButtons(Qt::NoButton), + indicator(nullptr), + group(nullptr) { - pressPoint = point; - setMovePoint(point); -} - -void QQuickAbstractButtonPrivate::setMovePoint(const QPointF &point) -{ - Q_Q(QQuickAbstractButton); - bool xChange = !qFuzzyCompare(point.x(), movePoint.x()); - bool yChange = !qFuzzyCompare(point.y(), movePoint.y()); - movePoint = point; - if (xChange) - emit q->pressXChanged(); - if (yChange) - emit q->pressYChanged(); } void QQuickAbstractButtonPrivate::handlePress(const QPointF &point) { Q_Q(QQuickAbstractButton); QQuickControlPrivate::handlePress(point); - setPressPoint(point); + pressPoint = point; q->setPressed(true); emit q->pressed(); @@ -152,7 +152,6 @@ { Q_Q(QQuickAbstractButton); QQuickControlPrivate::handleMove(point); - setMovePoint(point); q->setPressed(keepPressed || q->contains(point)); if (!pressed && autoRepeat) @@ -166,7 +165,6 @@ Q_Q(QQuickAbstractButton); QQuickControlPrivate::handleRelease(point); bool wasPressed = pressed; - setPressPoint(point); q->setPressed(false); pressButtons = Qt::NoButton; @@ -176,7 +174,7 @@ if (wasPressed) { emit q->released(); if (!wasHeld) - trigger(); + emit q->clicked(); } else { emit q->canceled(); } @@ -201,17 +199,10 @@ emit q->canceled(); } -bool QQuickAbstractButtonPrivate::acceptKeyClick(Qt::Key key) const -{ - return key == Qt::Key_Space; -} - bool QQuickAbstractButtonPrivate::isPressAndHoldConnected() { Q_Q(QQuickAbstractButton); - const auto signal = &QQuickAbstractButton::pressAndHold; - const QMetaMethod method = QMetaMethod::fromSignal(signal); - return q->isSignalConnected(method); + IS_SIGNAL_CONNECTED(q, QQuickAbstractButton, pressAndHold, ()); } void QQuickAbstractButtonPrivate::startPressAndHold() @@ -236,14 +227,14 @@ { Q_Q(QQuickAbstractButton); stopPressRepeat(); - delayTimer = q->startTimer(repeatDelay); + delayTimer = q->startTimer(AUTO_REPEAT_DELAY); } void QQuickAbstractButtonPrivate::startPressRepeat() { Q_Q(QQuickAbstractButton); stopPressRepeat(); - repeatTimer = q->startTimer(repeatInterval); + repeatTimer = q->startTimer(AUTO_REPEAT_INTERVAL); } void QQuickAbstractButtonPrivate::stopPressRepeat() @@ -259,83 +250,6 @@ } } -#if QT_CONFIG(shortcut) -void QQuickAbstractButtonPrivate::grabShortcut() -{ - Q_Q(QQuickAbstractButton); - if (shortcut.isEmpty()) - return; - - shortcutId = QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(q, shortcut, Qt::WindowShortcut, QQuickShortcutContext::matcher); - - if (!q->isEnabled()) - QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(false, shortcutId, q); -} - -void QQuickAbstractButtonPrivate::ungrabShortcut() -{ - Q_Q(QQuickAbstractButton); - if (!shortcutId) - return; - - QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(shortcutId, q); - shortcutId = 0; -} -#endif - -void QQuickAbstractButtonPrivate::actionTextChange() -{ - Q_Q(QQuickAbstractButton); - if (explicitText) - return; - - q->buttonChange(QQuickAbstractButton::ButtonTextChange); -} - -void QQuickAbstractButtonPrivate::setText(const QString &newText, bool isExplicit) -{ - Q_Q(QQuickAbstractButton); - const QString oldText = q->text(); - explicitText = isExplicit; - text = newText; - if (oldText == q->text()) - return; - - q->buttonChange(QQuickAbstractButton::ButtonTextChange); -} - -void QQuickAbstractButtonPrivate::updateEffectiveIcon() -{ - Q_Q(QQuickAbstractButton); - // We store effectiveIcon because we need to be able to tell if the icon has actually changed. - // If we only stored our icon and the action's icon, and resolved in the getter, we'd have - // no way of knowing what the old value was here. As an added benefit, we only resolve when - // something has changed, as opposed to doing it unconditionally in the icon() getter. - const QQuickIcon newEffectiveIcon = action ? icon.resolve(action->icon()) : icon; - if (newEffectiveIcon == effectiveIcon) - return; - - effectiveIcon = newEffectiveIcon; - emit q->iconChanged(); -} - -void QQuickAbstractButtonPrivate::click() -{ - Q_Q(QQuickAbstractButton); - if (effectiveEnable) - emit q->clicked(); -} - -void QQuickAbstractButtonPrivate::trigger() -{ - Q_Q(QQuickAbstractButton); - const bool wasEnabled = effectiveEnable; - if (action && action->isEnabled()) - QQuickActionPrivate::get(action)->trigger(q, false); - if (wasEnabled && (!action || !action->isEnabled())) - emit q->clicked(); -} - void QQuickAbstractButtonPrivate::toggle(bool value) { Q_Q(QQuickAbstractButton); @@ -365,22 +279,6 @@ quickCompleteDeferred(q, indicatorName(), indicator); } -void QQuickAbstractButtonPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - Q_Q(QQuickAbstractButton); - QQuickControlPrivate::itemImplicitWidthChanged(item); - if (item == indicator) - emit q->implicitIndicatorWidthChanged(); -} - -void QQuickAbstractButtonPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - Q_Q(QQuickAbstractButton); - QQuickControlPrivate::itemImplicitHeightChanged(item); - if (item == indicator) - emit q->implicitIndicatorHeightChanged(); -} - QQuickAbstractButton *QQuickAbstractButtonPrivate::findCheckedButton() const { Q_Q(const QQuickAbstractButton); @@ -451,12 +349,8 @@ QQuickAbstractButton::~QQuickAbstractButton() { Q_D(QQuickAbstractButton); - d->removeImplicitSizeListener(d->indicator); if (d->group) d->group->removeButton(this); -#if QT_CONFIG(shortcut) - d->ungrabShortcut(); -#endif } /*! @@ -467,24 +361,24 @@ \note The text is used for accessibility purposes, so it makes sense to set a textual description even if the content item is an image. - \sa icon, display, {Control::contentItem}{contentItem} + \sa {Control::contentItem}{contentItem} */ QString QQuickAbstractButton::text() const { Q_D(const QQuickAbstractButton); - return d->explicitText || !d->action ? d->text : d->action->text(); + return d->text; } void QQuickAbstractButton::setText(const QString &text) { Q_D(QQuickAbstractButton); - d->setText(text, true); -} + if (d->text == text) + return; -void QQuickAbstractButton::resetText() -{ - Q_D(QQuickAbstractButton); - d->setText(QString(), false); + d->text = text; + setAccessibleName(text); + buttonChange(ButtonTextChange); + emit textChanged(); } /*! @@ -580,8 +474,6 @@ setCheckable(true); d->checked = checked; - if (d->action) - d->action->setChecked(checked); setAccessibleProperty("checked", checked); buttonChange(ButtonCheckedChange); emit checkedChanged(); @@ -615,8 +507,6 @@ return; d->checkable = checkable; - if (d->action) - d->action->setCheckable(checkable); setAccessibleProperty("checkable", checkable); buttonChange(ButtonCheckableChange); emit checkableChanged(); @@ -652,17 +542,6 @@ emit autoExclusiveChanged(); } -/*! - \qmlproperty bool QtQuick.Controls::AbstractButton::autoRepeat - - This property holds whether the button repeats \l pressed(), \l released() - and \l clicked() signals while the button is pressed and held down. - - The default value is \c false. - - The initial delay and the repetition interval are defined in milliseconds - by \l autoRepeatDelay and \l autoRepeatInterval. -*/ bool QQuickAbstractButton::autoRepeat() const { Q_D(const QQuickAbstractButton); @@ -677,7 +556,7 @@ d->stopPressRepeat(); d->autoRepeat = repeat; - emit autoRepeatChanged(); + buttonChange(ButtonAutoRepeatChange); } /*! @@ -702,296 +581,18 @@ if (!d->indicator.isExecuting()) d->cancelIndicator(); - const qreal oldImplicitIndicatorWidth = implicitIndicatorWidth(); - const qreal oldImplicitIndicatorHeight = implicitIndicatorHeight(); - - d->removeImplicitSizeListener(d->indicator); delete d->indicator; d->indicator = indicator; - if (indicator) { if (!indicator->parentItem()) indicator->setParentItem(this); indicator->setAcceptedMouseButtons(Qt::LeftButton); - d->addImplicitSizeListener(indicator); } - - if (!qFuzzyCompare(oldImplicitIndicatorWidth, implicitIndicatorWidth())) - emit implicitIndicatorWidthChanged(); - if (!qFuzzyCompare(oldImplicitIndicatorHeight, implicitIndicatorHeight())) - emit implicitIndicatorHeightChanged(); if (!d->indicator.isExecuting()) emit indicatorChanged(); } /*! - \qmlpropertygroup QtQuick.Controls::AbstractButton::icon - \qmlproperty string QtQuick.Controls::AbstractButton::icon.name - \qmlproperty url QtQuick.Controls::AbstractButton::icon.source - \qmlproperty int QtQuick.Controls::AbstractButton::icon.width - \qmlproperty int QtQuick.Controls::AbstractButton::icon.height - \qmlproperty color QtQuick.Controls::AbstractButton::icon.color - - This property group was added in QtQuick.Controls 2.3. - - \include qquickicon.qdocinc grouped-properties - - \sa text, display, {Icons in Qt Quick Controls 2} -*/ - -QQuickIcon QQuickAbstractButton::icon() const -{ - Q_D(const QQuickAbstractButton); - return d->effectiveIcon; -} - -void QQuickAbstractButton::setIcon(const QQuickIcon &icon) -{ - Q_D(QQuickAbstractButton); - d->icon = icon; - d->updateEffectiveIcon(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty enumeration QtQuick.Controls::AbstractButton::display - - This property determines how the \l icon and \l text are displayed within - the button. - - \table - \header \li Display \li Result - \row \li \c AbstractButton.IconOnly \li \image qtquickcontrols2-button-icononly.png - \row \li \c AbstractButton.TextOnly \li \image qtquickcontrols2-button-textonly.png - \row \li \c AbstractButton.TextBesideIcon \li \image qtquickcontrols2-button-textbesideicon.png - \row \li \c AbstractButton.TextUnderIcon \li \image qtquickcontrols2-button-textundericon.png - \endtable - - \sa {Control::}{spacing}, {Control::}{padding} -*/ -QQuickAbstractButton::Display QQuickAbstractButton::display() const -{ - Q_D(const QQuickAbstractButton); - return d->display; -} - -void QQuickAbstractButton::setDisplay(Display display) -{ - Q_D(QQuickAbstractButton); - if (display == d->display) - return; - - d->display = display; - emit displayChanged(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty Action QtQuick.Controls::AbstractButton::action - - This property holds the button action. - - \sa Action -*/ -QQuickAction *QQuickAbstractButton::action() const -{ - Q_D(const QQuickAbstractButton); - return d->action; -} - -void QQuickAbstractButton::setAction(QQuickAction *action) -{ - Q_D(QQuickAbstractButton); - if (d->action == action) - return; - - const QString oldText = text(); - - if (QQuickAction *oldAction = d->action.data()) { - QQuickActionPrivate::get(oldAction)->unregisterItem(this); - QObjectPrivate::disconnect(oldAction, &QQuickAction::triggered, d, &QQuickAbstractButtonPrivate::click); - QObjectPrivate::disconnect(oldAction, &QQuickAction::textChanged, d, &QQuickAbstractButtonPrivate::actionTextChange); - - QObjectPrivate::disconnect(oldAction, &QQuickAction::iconChanged, d, &QQuickAbstractButtonPrivate::updateEffectiveIcon); - disconnect(oldAction, &QQuickAction::checkedChanged, this, &QQuickAbstractButton::setChecked); - disconnect(oldAction, &QQuickAction::checkableChanged, this, &QQuickAbstractButton::setCheckable); - disconnect(oldAction, &QQuickAction::enabledChanged, this, &QQuickItem::setEnabled); - } - - if (action) { - QQuickActionPrivate::get(action)->registerItem(this); - QObjectPrivate::connect(action, &QQuickAction::triggered, d, &QQuickAbstractButtonPrivate::click); - QObjectPrivate::connect(action, &QQuickAction::textChanged, d, &QQuickAbstractButtonPrivate::actionTextChange); - - QObjectPrivate::connect(action, &QQuickAction::iconChanged, d, &QQuickAbstractButtonPrivate::updateEffectiveIcon); - connect(action, &QQuickAction::checkedChanged, this, &QQuickAbstractButton::setChecked); - connect(action, &QQuickAction::checkableChanged, this, &QQuickAbstractButton::setCheckable); - connect(action, &QQuickAction::enabledChanged, this, &QQuickItem::setEnabled); - - setChecked(action->isChecked()); - setCheckable(action->isCheckable()); - setEnabled(action->isEnabled()); - } - - d->action = action; - - if (oldText != text()) - buttonChange(ButtonTextChange); - - d->updateEffectiveIcon(); - - emit actionChanged(); -} - -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty int QtQuick.Controls::AbstractButton::autoRepeatDelay - - This property holds the initial delay of auto-repetition in milliseconds. - The default value is \c 300 ms. - - \sa autoRepeat, autoRepeatInterval -*/ -int QQuickAbstractButton::autoRepeatDelay() const -{ - Q_D(const QQuickAbstractButton); - return d->repeatDelay; -} - -void QQuickAbstractButton::setAutoRepeatDelay(int delay) -{ - Q_D(QQuickAbstractButton); - if (d->repeatDelay == delay) - return; - - d->repeatDelay = delay; - emit autoRepeatDelayChanged(); -} - -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty int QtQuick.Controls::AbstractButton::autoRepeatInterval - - This property holds the interval of auto-repetition in milliseconds. - The default value is \c 100 ms. - - \sa autoRepeat, autoRepeatDelay -*/ -int QQuickAbstractButton::autoRepeatInterval() const -{ - Q_D(const QQuickAbstractButton); - return d->repeatInterval; -} - -void QQuickAbstractButton::setAutoRepeatInterval(int interval) -{ - Q_D(QQuickAbstractButton); - if (d->repeatInterval == interval) - return; - - d->repeatInterval = interval; - emit autoRepeatIntervalChanged(); -} - -#if QT_CONFIG(shortcut) -QKeySequence QQuickAbstractButton::shortcut() const -{ - Q_D(const QQuickAbstractButton); - return d->shortcut; -} - -void QQuickAbstractButton::setShortcut(const QKeySequence &shortcut) -{ - Q_D(QQuickAbstractButton); - if (d->shortcut == shortcut) - return; - - d->ungrabShortcut(); - d->shortcut = shortcut; - if (isVisible()) - d->grabShortcut(); -} -#endif - -/*! - \readonly - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty real QtQuick.Controls::AbstractButton::pressX - - This property holds the x-coordinate of the last press. - - \note The value is updated on touch moves, but left intact after touch release. - - \sa pressY -*/ -qreal QQuickAbstractButton::pressX() const -{ - Q_D(const QQuickAbstractButton); - return d->movePoint.x(); -} - -/*! - \readonly - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty real QtQuick.Controls::AbstractButton::pressY - - This property holds the y-coordinate of the last press. - - \note The value is updated on touch moves, but left intact after touch release. - - \sa pressX -*/ -qreal QQuickAbstractButton::pressY() const -{ - Q_D(const QQuickAbstractButton); - return d->movePoint.y(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::AbstractButton::implicitIndicatorWidth - \readonly - - This property holds the implicit indicator width. - - The value is equal to \c {indicator ? indicator.implicitWidth : 0}. - - This is typically used, together with \l {Control::}{implicitContentWidth} and - \l {Control::}{implicitBackgroundWidth}, to calculate the \l {Item::}{implicitWidth}. - - \sa implicitIndicatorHeight -*/ -qreal QQuickAbstractButton::implicitIndicatorWidth() const -{ - Q_D(const QQuickAbstractButton); - if (!d->indicator) - return 0; - return d->indicator->implicitWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::AbstractButton::implicitIndicatorHeight - \readonly - - This property holds the implicit indicator height. - - The value is equal to \c {indicator ? indicator.implicitHeight : 0}. - - This is typically used, together with \l {Control::}{implicitContentHeight} and - \l {Control::}{implicitBackgroundHeight}, to calculate the \l {Item::}{implicitHeight}. - - \sa implicitIndicatorWidth -*/ -qreal QQuickAbstractButton::implicitIndicatorHeight() const -{ - Q_D(const QQuickAbstractButton); - if (!d->indicator) - return 0; - return d->indicator->implicitHeight(); -} - -/*! \qmlmethod void QtQuick.Controls::AbstractButton::toggle() Toggles the checked state of the button. @@ -1009,21 +610,6 @@ QQuickControl::componentComplete(); } -bool QQuickAbstractButton::event(QEvent *event) -{ - Q_D(QQuickAbstractButton); -#if QT_CONFIG(shortcut) - if (event->type() == QEvent::Shortcut) { - QShortcutEvent *se = static_cast(event); - if (se->shortcutId() == d->shortcutId) { - d->trigger(); - return true; - } - } -#endif - return QQuickControl::event(event); -} - void QQuickAbstractButton::focusOutEvent(QFocusEvent *event) { Q_D(QQuickAbstractButton); @@ -1036,8 +622,8 @@ { Q_D(QQuickAbstractButton); QQuickControl::keyPressEvent(event); - if (d->acceptKeyClick(static_cast(event->key()))) { - d->setPressPoint(QPoint(qRound(width() / 2), qRound(height() / 2))); + if (event->key() == Qt::Key_Space) { + d->pressPoint = QPoint(qRound(width() / 2), qRound(height() / 2)); setPressed(true); if (d->autoRepeat) @@ -1052,12 +638,12 @@ { Q_D(QQuickAbstractButton); QQuickControl::keyReleaseEvent(event); - if (d->acceptKeyClick(static_cast(event->key()))) { + if (event->key() == Qt::Key_Space) { setPressed(false); nextCheckState(); emit released(); - d->trigger(); + emit clicked(); if (d->autoRepeat) d->stopPressRepeat(); @@ -1090,25 +676,11 @@ d->startPressRepeat(); } else if (event->timerId() == d->repeatTimer) { emit released(); - d->trigger(); + emit clicked(); emit pressed(); } } -void QQuickAbstractButton::itemChange(ItemChange change, const ItemChangeData &value) -{ - Q_D(QQuickAbstractButton); - QQuickControl::itemChange(change, value); -#if QT_CONFIG(shortcut) - if (change == ItemVisibleHasChanged) { - if (value.boolValue) - d->grabShortcut(); - else - d->ungrabShortcut(); - } -#endif -} - void QQuickAbstractButton::buttonChange(ButtonChange change) { Q_D(QQuickAbstractButton); @@ -1120,15 +692,6 @@ button->setChecked(false); } break; - case ButtonTextChange: { - const QString txt = text(); - setAccessibleName(txt); -#if QT_CONFIG(shortcut) - setShortcut(QKeySequence::mnemonic(txt)); -#endif - emit textChanged(); - break; - } default: break; } @@ -1148,7 +711,7 @@ Q_D(QQuickAbstractButton); if (active) { - setAccessibleName(text()); + setAccessibleName(d->text); setAccessibleProperty("pressed", d->pressed); setAccessibleProperty("checked", d->checked); setAccessibleProperty("checkable", d->checkable); @@ -1157,10 +720,6 @@ QAccessible::Role QQuickAbstractButton::accessibleRole() const { - Q_D(const QQuickAbstractButton); - if (d->checkable) { - return QAccessible::CheckBox; - } return QAccessible::Button; } #endif diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickabstractbutton_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickabstractbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickabstractbutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickabstractbutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -49,36 +49,21 @@ // #include -#include QT_BEGIN_NAMESPACE -class QQuickAction; class QQuickAbstractButtonPrivate; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButton : public QQuickControl { Q_OBJECT - Q_PROPERTY(QString text READ text WRITE setText RESET resetText NOTIFY textChanged FINAL) + Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL) Q_PROPERTY(bool down READ isDown WRITE setDown NOTIFY downChanged RESET resetDown FINAL) Q_PROPERTY(bool pressed READ isPressed NOTIFY pressedChanged FINAL) Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged FINAL) Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL) Q_PROPERTY(bool autoExclusive READ autoExclusive WRITE setAutoExclusive NOTIFY autoExclusiveChanged FINAL) - Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY autoRepeatChanged FINAL) Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL) - // 2.3 (Qt 5.10) - Q_PROPERTY(QQuickIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL REVISION 3) - Q_PROPERTY(Display display READ display WRITE setDisplay NOTIFY displayChanged FINAL REVISION 3) - Q_PROPERTY(QQuickAction *action READ action WRITE setAction NOTIFY actionChanged FINAL REVISION 3) - // 2.4 (Qt 5.11) - Q_PROPERTY(int autoRepeatDelay READ autoRepeatDelay WRITE setAutoRepeatDelay NOTIFY autoRepeatDelayChanged FINAL REVISION 4) - Q_PROPERTY(int autoRepeatInterval READ autoRepeatInterval WRITE setAutoRepeatInterval NOTIFY autoRepeatIntervalChanged FINAL REVISION 4) - Q_PROPERTY(qreal pressX READ pressX NOTIFY pressXChanged FINAL REVISION 4) - Q_PROPERTY(qreal pressY READ pressY NOTIFY pressYChanged FINAL REVISION 4) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal implicitIndicatorWidth READ implicitIndicatorWidth NOTIFY implicitIndicatorWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitIndicatorHeight READ implicitIndicatorHeight NOTIFY implicitIndicatorHeightChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "background,contentItem,indicator") public: @@ -87,7 +72,6 @@ QString text() const; void setText(const QString &text); - void resetText(); bool isDown() const; void setDown(bool down); @@ -111,43 +95,6 @@ QQuickItem *indicator() const; void setIndicator(QQuickItem *indicator); - // 2.3 (Qt 5.10) - QQuickIcon icon() const; - void setIcon(const QQuickIcon &icon); - - enum Display { - IconOnly, - TextOnly, - TextBesideIcon, - TextUnderIcon - }; - Q_ENUM(Display) - - Display display() const; - void setDisplay(Display display); - - QQuickAction *action() const; - void setAction(QQuickAction *action); - -#if QT_CONFIG(shortcut) - QKeySequence shortcut() const; - void setShortcut(const QKeySequence &shortcut); -#endif - - // 2.4 (Qt 5.11) - int autoRepeatDelay() const; - void setAutoRepeatDelay(int delay); - - int autoRepeatInterval() const; - void setAutoRepeatInterval(int interval); - - qreal pressX() const; - qreal pressY() const; - - // 2.5 (Qt 5.12) - qreal implicitIndicatorWidth() const; - qreal implicitIndicatorHeight() const; - public Q_SLOTS: void toggle(); @@ -164,29 +111,15 @@ void checkedChanged(); void checkableChanged(); void autoExclusiveChanged(); - void autoRepeatChanged(); void indicatorChanged(); // 2.2 (Qt 5.9) Q_REVISION(2) void toggled(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void iconChanged(); - Q_REVISION(3) void displayChanged(); - Q_REVISION(3) void actionChanged(); - // 2.4 (Qt 5.11) - Q_REVISION(4) void autoRepeatDelayChanged(); - Q_REVISION(4) void autoRepeatIntervalChanged(); - Q_REVISION(4) void pressXChanged(); - Q_REVISION(4) void pressYChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void implicitIndicatorWidthChanged(); - Q_REVISION(5) void implicitIndicatorHeightChanged(); protected: QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQuickItem *parent); void componentComplete() override; - bool event(QEvent *event) override; void focusOutEvent(QFocusEvent *event) override; void keyPressEvent(QKeyEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override; @@ -194,9 +127,8 @@ void mouseDoubleClickEvent(QMouseEvent *event) override; void timerEvent(QTimerEvent *event) override; - void itemChange(ItemChange change, const ItemChangeData &value) override; - enum ButtonChange { + ButtonAutoRepeatChange, ButtonCheckedChange, ButtonCheckableChange, ButtonPressedChanged, diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickabstractbutton_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickabstractbutton_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickabstractbutton_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickabstractbutton_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -50,11 +50,9 @@ #include #include -#include QT_BEGIN_NAMESPACE -class QQuickAction; class QQuickButtonGroup; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButtonPrivate : public QQuickControlPrivate @@ -62,21 +60,18 @@ Q_DECLARE_PUBLIC(QQuickAbstractButton) public: + QQuickAbstractButtonPrivate(); + static QQuickAbstractButtonPrivate *get(QQuickAbstractButton *button) { return button->d_func(); } - void setPressPoint(const QPointF &point); - void setMovePoint(const QPointF &point); - void handlePress(const QPointF &point) override; void handleMove(const QPointF &point) override; void handleRelease(const QPointF &point) override; void handleUngrab() override; - virtual bool acceptKeyClick(Qt::Key key) const; - bool isPressAndHoldConnected(); void startPressAndHold(); void stopPressAndHold(); @@ -85,62 +80,31 @@ void startPressRepeat(); void stopPressRepeat(); -#if QT_CONFIG(shortcut) - void grabShortcut(); - void ungrabShortcut(); -#endif - QQuickAbstractButton *findCheckedButton() const; QList findExclusiveButtons() const; - void actionTextChange(); - void setText(const QString &text, bool isExplicit); - - void updateEffectiveIcon(); - - void click(); - void trigger(); void toggle(bool value); void cancelIndicator(); void executeIndicator(bool complete = false); - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - - // copied from qabstractbutton.cpp - static const int AUTO_REPEAT_DELAY = 300; - static const int AUTO_REPEAT_INTERVAL = 100; - - bool explicitText = false; - bool down = false; - bool explicitDown = false; - bool pressed = false; - bool keepPressed = false; - bool checked = false; - bool checkable = false; - bool autoExclusive = false; - bool autoRepeat = false; - bool wasHeld = false; - int holdTimer = 0; - int delayTimer = 0; - int repeatTimer = 0; - int repeatDelay = AUTO_REPEAT_DELAY; - int repeatInterval = AUTO_REPEAT_INTERVAL; -#if QT_CONFIG(shortcut) - int shortcutId = 0; - QKeySequence shortcut; -#endif QString text; - QQuickIcon icon; - QQuickIcon effectiveIcon; + bool down; + bool explicitDown; + bool pressed; + bool keepPressed; + bool checked; + bool checkable; + bool autoExclusive; + bool autoRepeat; + bool wasHeld; + int holdTimer; + int delayTimer; + int repeatTimer; QPointF pressPoint; - QPointF movePoint; - Qt::MouseButtons pressButtons = Qt::NoButton; - QQuickAbstractButton::Display display = QQuickAbstractButton::TextBesideIcon; + Qt::MouseButtons pressButtons; QQuickDeferredPointer indicator; - QQuickButtonGroup *group = nullptr; - QPointer action; + QQuickButtonGroup *group; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickaction.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickaction.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickaction.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickaction.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,577 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickaction_p.h" -#include "qquickaction_p_p.h" -#include "qquickactiongroup_p.h" -#include "qquickshortcutcontext_p_p.h" - -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -/*! - \qmltype Action - \inherits QtObject - \instantiates QQuickAction - \inqmlmodule QtQuick.Controls - \since 5.10 - \ingroup utilities - \brief Abstract user interface action. - - Action represents an abstract user interface action that can have shortcuts - and can be assigned to menu items and toolbar buttons. - - Actions may contain \l text, an \l icon, and a \l shortcut. Actions are normally - \l triggered by the user via menu items, toolbar buttons, or keyboard shortcuts. - A \l checkable Action toggles its \l checked state when triggered. - - \snippet qtquickcontrols2-action.qml action - - Action is commonly used to implement application commands that can be invoked - via menu items, toolbar buttons, and keyboard shortcuts. Since the user expects - the commands to be performed in the same way, regardless of the user interface - used, it is useful to represent the commands as shareable actions. - - Action can be also used to separate the logic and the visual presentation. For - example, when declaring buttons and menu items in \c .ui.qml files, actions can - be declared elsewhere and assigned from the outside. - - \snippet qtquickcontrols2-action.qml toolbutton - - When an action is paired with buttons and menu items, the \c enabled, \c checkable, - and \c checked states are synced automatically. For example, in a word processor, - if the user clicks a "Bold" toolbar button, the "Bold" menu item will automatically - be checked. Buttons and menu items get their \c text and \c icon from the action by - default. An action-specific \c text or \c icon can be overridden for a specific - control by specifying \c text or \c icon directly on the control. - - \snippet qtquickcontrols2-action.qml menuitem - - Since Action presents a user interface action, it is intended to be assigned to - a \l MenuItem, \l ToolButton, or any other control that inherits \l AbstractButton. - For keyboard shortcuts, the simpler \l Shortcut type is more appropriate. - - \sa MenuItem, ToolButton, Shortcut -*/ - -/*! - \qmlsignal QtQuick.Controls::Action::toggled(QtObject source) - - This signal is emitted when the action is toggled. The \a source argument - identifies the object that toggled the action. - - For example, if the action is assigned to a menu item and a toolbar button, the - action is toggled when the control is toggled, the shortcut is activated, or - when \l toggle() is called directly. -*/ - -/*! - \qmlsignal QtQuick.Controls::Action::triggered(QtObject source) - - This signal is emitted when the action is triggered. The \a source argument - identifies the object that triggered the action. - - For example, if the action is assigned to a menu item and a toolbar button, the - action is triggered when the control is clicked, the shortcut is activated, or - when \l trigger() is called directly. -*/ - -#if QT_CONFIG(shortcut) -static QKeySequence variantToKeySequence(const QVariant &var) -{ - if (var.type() == QVariant::Int) - return QKeySequence(static_cast(var.toInt())); - return QKeySequence::fromString(var.toString()); -} - -QQuickActionPrivate::ShortcutEntry::ShortcutEntry(QObject *target) - : m_target(target) -{ -} - -QQuickActionPrivate::ShortcutEntry::~ShortcutEntry() -{ - ungrab(); -} - -QObject *QQuickActionPrivate::ShortcutEntry::target() const -{ - return m_target; -} - -int QQuickActionPrivate::ShortcutEntry::shortcutId() const -{ - return m_shortcutId; -} - -void QQuickActionPrivate::ShortcutEntry::grab(const QKeySequence &shortcut, bool enabled) -{ - if (shortcut.isEmpty()) - return; - - Qt::ShortcutContext context = Qt::WindowShortcut; // TODO - m_shortcutId = QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(m_target, shortcut, context, QQuickShortcutContext::matcher); - - if (!enabled) - QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(false, m_shortcutId, m_target); -} - -void QQuickActionPrivate::ShortcutEntry::ungrab() -{ - if (!m_shortcutId) - return; - - QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(m_shortcutId, m_target); - m_shortcutId = 0; -} - -void QQuickActionPrivate::ShortcutEntry::setEnabled(bool enabled) -{ - if (!m_shortcutId) - return; - - QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(enabled, m_shortcutId, m_target); -} - -QVariant QQuickActionPrivate::shortcut() const -{ - return vshortcut; -} - -void QQuickActionPrivate::setShortcut(const QVariant &var) -{ - Q_Q(QQuickAction); - if (vshortcut == var) - return; - - defaultShortcutEntry->ungrab(); - for (QQuickActionPrivate::ShortcutEntry *entry : qAsConst(shortcutEntries)) - entry->ungrab(); - - vshortcut = var; - keySequence = variantToKeySequence(var); - - defaultShortcutEntry->grab(keySequence, enabled); - for (QQuickActionPrivate::ShortcutEntry *entry : qAsConst(shortcutEntries)) - entry->grab(keySequence, enabled); - - emit q->shortcutChanged(keySequence); -} -#endif // QT_CONFIG(shortcut) - -void QQuickActionPrivate::setEnabled(bool enable) -{ - Q_Q(QQuickAction); - if (enabled == enable) - return; - - enabled = enable; - -#if QT_CONFIG(shortcut) - defaultShortcutEntry->setEnabled(enable); - for (QQuickActionPrivate::ShortcutEntry *entry : qAsConst(shortcutEntries)) - entry->setEnabled(enable); -#endif - - emit q->enabledChanged(enable); -} - -bool QQuickActionPrivate::watchItem(QQuickItem *item) -{ - Q_Q(QQuickAction); - if (!item) - return false; - - item->installEventFilter(q); - QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Visibility | QQuickItemPrivate::Destroyed); - return true; -} - -bool QQuickActionPrivate::unwatchItem(QQuickItem *item) -{ - Q_Q(QQuickAction); - if (!item) - return false; - - item->removeEventFilter(q); - QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Visibility | QQuickItemPrivate::Destroyed); - return true; -} - -void QQuickActionPrivate::registerItem(QQuickItem *item) -{ - if (!watchItem(item)) - return; - -#if QT_CONFIG(shortcut) - QQuickActionPrivate::ShortcutEntry *entry = new QQuickActionPrivate::ShortcutEntry(item); - if (item->isVisible()) - entry->grab(keySequence, enabled); - shortcutEntries += entry; - - updateDefaultShortcutEntry(); -#endif -} - -void QQuickActionPrivate::unregisterItem(QQuickItem *item) -{ -#if QT_CONFIG(shortcut) - QQuickActionPrivate::ShortcutEntry *entry = findShortcutEntry(item); - if (!entry || !unwatchItem(item)) - return; - - shortcutEntries.removeOne(entry); - delete entry; - - updateDefaultShortcutEntry(); -#endif -} - -void QQuickActionPrivate::itemVisibilityChanged(QQuickItem *item) -{ -#if QT_CONFIG(shortcut) - QQuickActionPrivate::ShortcutEntry *entry = findShortcutEntry(item); - if (!entry) - return; - - if (item->isVisible()) - entry->grab(keySequence, enabled); - else - entry->ungrab(); - - updateDefaultShortcutEntry(); -#endif -} - -void QQuickActionPrivate::itemDestroyed(QQuickItem *item) -{ - unregisterItem(item); -} - -#if QT_CONFIG(shortcut) -bool QQuickActionPrivate::handleShortcutEvent(QObject *object, QShortcutEvent *event) -{ - Q_Q(QQuickAction); - if (event->key() != keySequence) - return false; - - QQuickActionPrivate::ShortcutEntry *entry = findShortcutEntry(object); - if (!entry || event->shortcutId() != entry->shortcutId()) - return false; - - q->trigger(entry->target()); - return true; -} - -QQuickActionPrivate::ShortcutEntry *QQuickActionPrivate::findShortcutEntry(QObject *target) const -{ - Q_Q(const QQuickAction); - if (target == q) - return defaultShortcutEntry; - for (QQuickActionPrivate::ShortcutEntry *entry : shortcutEntries) { - if (entry->target() == target) - return entry; - } - return nullptr; -} - -void QQuickActionPrivate::updateDefaultShortcutEntry() -{ - bool hasActiveShortcutEntries = false; - for (QQuickActionPrivate::ShortcutEntry *entry : qAsConst(shortcutEntries)) { - if (entry->shortcutId()) { - hasActiveShortcutEntries = true; - break; - } - } - - if (hasActiveShortcutEntries) - defaultShortcutEntry->ungrab(); - else if (!defaultShortcutEntry->shortcutId()) - defaultShortcutEntry->grab(keySequence, enabled); -} -#endif // QT_CONFIG(shortcut) - -QQuickAction::QQuickAction(QObject *parent) - : QObject(*(new QQuickActionPrivate), parent) -{ - Q_D(QQuickAction); -#if QT_CONFIG(shortcut) - d->defaultShortcutEntry = new QQuickActionPrivate::ShortcutEntry(this); -#endif -} - -QQuickAction::~QQuickAction() -{ - Q_D(QQuickAction); - if (d->group) - d->group->removeAction(this); - -#if QT_CONFIG(shortcut) - for (QQuickActionPrivate::ShortcutEntry *entry : qAsConst(d->shortcutEntries)) - d->unwatchItem(qobject_cast(entry->target())); - - qDeleteAll(d->shortcutEntries); - delete d->defaultShortcutEntry; -#endif -} - -/*! - \qmlproperty string QtQuick.Controls::Action::text - - This property holds a textual description of the action. -*/ -QString QQuickAction::text() const -{ - Q_D(const QQuickAction); - return d->text; -} - -void QQuickAction::setText(const QString &text) -{ - Q_D(QQuickAction); - if (d->text == text) - return; - - d->text = text; - emit textChanged(text); -} - -/*! - \qmlpropertygroup QtQuick.Controls::Action::icon - \qmlproperty string QtQuick.Controls::Action::icon.name - \qmlproperty url QtQuick.Controls::Action::icon.source - \qmlproperty int QtQuick.Controls::Action::icon.width - \qmlproperty int QtQuick.Controls::Action::icon.height - \qmlproperty color QtQuick.Controls::Action::icon.color - - \include qquickicon.qdocinc grouped-properties -*/ -QQuickIcon QQuickAction::icon() const -{ - Q_D(const QQuickAction); - return d->icon; -} - -void QQuickAction::setIcon(const QQuickIcon &icon) -{ - Q_D(QQuickAction); - if (d->icon == icon) - return; - - d->icon = icon; - emit iconChanged(icon); -} - -/*! - \qmlproperty bool QtQuick.Controls::Action::enabled - - This property holds whether the action is enabled. The default value is \c true. -*/ -bool QQuickAction::isEnabled() const -{ - Q_D(const QQuickAction); - return d->enabled && (!d->group || d->group->isEnabled()); -} - -void QQuickAction::setEnabled(bool enabled) -{ - Q_D(QQuickAction); - d->explicitEnabled = true; - d->setEnabled(enabled); -} - -void QQuickAction::resetEnabled() -{ - Q_D(QQuickAction); - if (!d->explicitEnabled) - return; - - d->explicitEnabled = false; - d->setEnabled(true); -} - -/*! - \qmlproperty bool QtQuick.Controls::Action::checked - - This property holds whether the action is checked. - - \sa checkable -*/ -bool QQuickAction::isChecked() const -{ - Q_D(const QQuickAction); - return d->checked; -} - -void QQuickAction::setChecked(bool checked) -{ - Q_D(QQuickAction); - if (d->checked == checked) - return; - - d->checked = checked; - emit checkedChanged(checked); -} - -/*! - \qmlproperty bool QtQuick.Controls::Action::checkable - - This property holds whether the action is checkable. The default value is \c false. - - A checkable action toggles between checked (on) and unchecked (off) when triggered. - - \sa checked -*/ -bool QQuickAction::isCheckable() const -{ - Q_D(const QQuickAction); - return d->checkable; -} - -void QQuickAction::setCheckable(bool checkable) -{ - Q_D(QQuickAction); - if (d->checkable == checkable) - return; - - d->checkable = checkable; - emit checkableChanged(checkable); -} - -#if QT_CONFIG(shortcut) -/*! - \qmlproperty keysequence QtQuick.Controls::Action::shortcut - - This property holds the action's shortcut. The key sequence can be set - to one of the \l{QKeySequence::StandardKey}{standard keyboard shortcuts}, - or it can be described with a string containing a sequence of up to four - key presses that are needed to trigger the shortcut. - - \code - Action { - shortcut: "Ctrl+E,Ctrl+W" - onTriggered: edit.wrapMode = TextEdit.Wrap - } - \endcode -*/ -QKeySequence QQuickAction::shortcut() const -{ - Q_D(const QQuickAction); - return d->keySequence; -} - -void QQuickAction::setShortcut(const QKeySequence &shortcut) -{ - Q_D(QQuickAction); - d->setShortcut(shortcut.toString()); -} -#endif // QT_CONFIG(shortcut) - -/*! - \qmlmethod void QtQuick.Controls::Action::toggle(QtObject source = null) - - Toggles the action and emits \l toggled() if enabled, with an optional \a source object defined. -*/ -void QQuickAction::toggle(QObject *source) -{ - Q_D(QQuickAction); - if (!d->enabled) - return; - - if (d->checkable) - setChecked(!d->checked); - - emit toggled(source); -} - -/*! - \qmlmethod void QtQuick.Controls::Action::trigger(QtObject source = null) - - Triggers the action and emits \l triggered() if enabled, with an optional \a source object defined. -*/ -void QQuickAction::trigger(QObject *source) -{ - Q_D(QQuickAction); - d->trigger(source, true); -} - -void QQuickActionPrivate::trigger(QObject* source, bool doToggle) -{ - Q_Q(QQuickAction); - if (!enabled) - return; - - QPointer guard = q; - // the checked action of an exclusive group cannot be unchecked - if (checkable && (!checked || !group || !group->isExclusive() || group->checkedAction() != q)) { - if (doToggle) - q->toggle(source); - else - emit q->toggled(source); - } - - if (!guard.isNull()) - emit q->triggered(source); -} - -bool QQuickAction::event(QEvent *event) -{ - Q_D(QQuickAction); -#if QT_CONFIG(shortcut) - if (event->type() == QEvent::Shortcut) - return d->handleShortcutEvent(this, static_cast(event)); -#endif - return QObject::event(event); -} - -bool QQuickAction::eventFilter(QObject *object, QEvent *event) -{ - Q_D(QQuickAction); -#if QT_CONFIG(shortcut) - if (event->type() == QEvent::Shortcut) - return d->handleShortcutEvent(object, static_cast(event)); -#endif - return false; -} - -QT_END_NAMESPACE - -#include "moc_qquickaction_p.cpp" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickactiongroup.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickactiongroup.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickactiongroup.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickactiongroup.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,471 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickactiongroup_p.h" - -#include -#include -#include -#include - -#include "qquickaction_p.h" -#include "qquickaction_p_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \qmltype ActionGroup - \inherits QtObject - \instantiates QQuickActionGroup - \inqmlmodule QtQuick.Controls - \since 5.10 - \ingroup utilities - \brief Groups actions together. - - ActionGroup is a non-visual group of actions. A mutually \l exclusive - action group is used with actions where only one of the options can be - selected at a time. - - The most straight-forward way to use ActionGroup is to declare actions - as children of the group. - - \code - ActionGroup { - id: alignmentGroup - - Action { - checked: true - checkable: true - text: qsTr("Left") - } - - Action { - checkable: true - text: qsTr("Center") - } - - Action { - checkable: true - text: qsTr("Right") - } - } - \endcode - - Alternatively, the \l group attached property allows declaring the actions - elsewhere and assigning them to a specific group. - - \code - ActionGroup { id: alignmentGroup } - - Action { - checked: true - checkable: true - text: qsTr("Left") - ActionGroup.group: alignmentGroup - } - - Action { - checkable: true - text: qsTr("Center") - ActionGroup.group: alignmentGroup - } - - Action { - checkable: true - text: qsTr("Right") - ActionGroup.group: alignmentGroup - } - \endcode - - More advanced use cases can be handled using the \c addAction() and - \c removeAction() methods. - - \sa Action, ButtonGroup -*/ - -/*! - \qmlsignal QtQuick.Controls::ActionGroup::triggered(Action action) - - This signal is emitted when an \a action in the group has been triggered. - - This signal is convenient for implementing a common signal handler for - all actions in the same group. - - \code - ActionGroup { - onTriggered: console.log("triggered:", action.text) - - Action { text: "First" } - Action { text: "Second" } - Action { text: "Third" } - } - \endcode - - \sa Action::triggered() -*/ - -class QQuickActionGroupPrivate : public QObjectPrivate -{ - Q_DECLARE_PUBLIC(QQuickActionGroup) - -public: - void clear(); - void actionTriggered(); - void _q_updateCurrent(); - - static bool changeEnabled(QQuickAction *action, bool enabled); - - static void actions_append(QQmlListProperty *prop, QQuickAction *obj); - static int actions_count(QQmlListProperty *prop); - static QQuickAction *actions_at(QQmlListProperty *prop, int index); - static void actions_clear(QQmlListProperty *prop); - - bool enabled = true; - bool exclusive = true; - QPointer checkedAction; - QVector actions; -}; - -void QQuickActionGroupPrivate::clear() -{ - for (QQuickAction *action : qAsConst(actions)) { - QQuickActionPrivate::get(action)->group = nullptr; - QObjectPrivate::disconnect(action, &QQuickAction::triggered, this, &QQuickActionGroupPrivate::actionTriggered); - QObjectPrivate::disconnect(action, &QQuickAction::checkedChanged, this, &QQuickActionGroupPrivate::_q_updateCurrent); - } - actions.clear(); -} - -void QQuickActionGroupPrivate::actionTriggered() -{ - Q_Q(QQuickActionGroup); - QQuickAction *action = qobject_cast(q->sender()); - if (action) - emit q->triggered(action); -} - -void QQuickActionGroupPrivate::_q_updateCurrent() -{ - Q_Q(QQuickActionGroup); - if (!exclusive) - return; - QQuickAction *action = qobject_cast(q->sender()); - if (action && action->isChecked()) - q->setCheckedAction(action); - else if (!actions.contains(checkedAction)) - q->setCheckedAction(nullptr); -} - -bool QQuickActionGroupPrivate::changeEnabled(QQuickAction *action, bool enabled) -{ - return action->isEnabled() != enabled && (!enabled || !QQuickActionPrivate::get(action)->explicitEnabled); -} - -void QQuickActionGroupPrivate::actions_append(QQmlListProperty *prop, QQuickAction *obj) -{ - QQuickActionGroup *q = static_cast(prop->object); - q->addAction(obj); -} - -int QQuickActionGroupPrivate::actions_count(QQmlListProperty *prop) -{ - QQuickActionGroupPrivate *p = static_cast(prop->data); - return p->actions.count(); -} - -QQuickAction *QQuickActionGroupPrivate::actions_at(QQmlListProperty *prop, int index) -{ - QQuickActionGroupPrivate *p = static_cast(prop->data); - return p->actions.value(index); -} - -void QQuickActionGroupPrivate::actions_clear(QQmlListProperty *prop) -{ - QQuickActionGroupPrivate *p = static_cast(prop->data); - if (!p->actions.isEmpty()) { - p->clear(); - QQuickActionGroup *q = static_cast(prop->object); - // QTBUG-52358: don't clear the checked action immediately - QMetaObject::invokeMethod(q, "_q_updateCurrent", Qt::QueuedConnection); - emit q->actionsChanged(); - } -} - -QQuickActionGroup::QQuickActionGroup(QObject *parent) - : QObject(*(new QQuickActionGroupPrivate), parent) -{ -} - -QQuickActionGroup::~QQuickActionGroup() -{ - Q_D(QQuickActionGroup); - d->clear(); -} - -QQuickActionGroupAttached *QQuickActionGroup::qmlAttachedProperties(QObject *object) -{ - return new QQuickActionGroupAttached(object); -} - -/*! - \qmlproperty Action QtQuick.Controls::ActionGroup::checkedAction - - This property holds the currently selected action in an exclusive group, - or \c null if there is none or the group is non-exclusive. - - By default, it is the first checked action added to an exclusive action group. - - \sa exclusive -*/ -QQuickAction *QQuickActionGroup::checkedAction() const -{ - Q_D(const QQuickActionGroup); - return d->checkedAction; -} - -void QQuickActionGroup::setCheckedAction(QQuickAction *checkedAction) -{ - Q_D(QQuickActionGroup); - if (d->checkedAction == checkedAction) - return; - - if (d->checkedAction) - d->checkedAction->setChecked(false); - d->checkedAction = checkedAction; - if (checkedAction) - checkedAction->setChecked(true); - emit checkedActionChanged(); -} - -/*! - \qmlproperty list QtQuick.Controls::ActionGroup::actions - \default - - This property holds the list of actions in the group. - - \sa group -*/ -QQmlListProperty QQuickActionGroup::actions() -{ - Q_D(QQuickActionGroup); - return QQmlListProperty(this, d, - QQuickActionGroupPrivate::actions_append, - QQuickActionGroupPrivate::actions_count, - QQuickActionGroupPrivate::actions_at, - QQuickActionGroupPrivate::actions_clear); -} - -/*! - \qmlproperty bool QtQuick.Controls::ActionGroup::exclusive - - This property holds whether the action group is exclusive. The default value is \c true. - - If this property is \c true, then only one action in the group can be checked at any given time. - The user can trigger any action to check it, and that action will replace the existing one as - the checked action in the group. - - In an exclusive group, the user cannot uncheck the currently checked action by triggering it; - instead, another action in the group must be triggered to set the new checked action for that - group. - - In a non-exclusive group, checking and unchecking actions does not affect the other actions in - the group. Furthermore, the value of the \l checkedAction property is \c null. -*/ -bool QQuickActionGroup::isExclusive() const -{ - Q_D(const QQuickActionGroup); - return d->exclusive; -} - -void QQuickActionGroup::setExclusive(bool exclusive) -{ - Q_D(QQuickActionGroup); - if (d->exclusive == exclusive) - return; - - d->exclusive = exclusive; - emit exclusiveChanged(); -} - -/*! - \qmlproperty bool QtQuick.Controls::ActionGroup::enabled - - This property holds whether the action group is enabled. The default value is \c true. - - If this property is \c false, then all actions in the group are disabled. If this property - is \c true, all actions in the group are enabled, unless explicitly disabled. -*/ -bool QQuickActionGroup::isEnabled() const -{ - Q_D(const QQuickActionGroup); - return d->enabled; -} - -void QQuickActionGroup::setEnabled(bool enabled) -{ - Q_D(QQuickActionGroup); - if (d->enabled == enabled) - return; - - for (QQuickAction *action : qAsConst(d->actions)) { - if (d->changeEnabled(action, enabled)) - emit action->enabledChanged(enabled); - } - - d->enabled = enabled; - emit enabledChanged(); -} - -/*! - \qmlmethod void QtQuick.Controls::ActionGroup::addAction(Action action) - - Adds an \a action to the action group. - - \note Manually adding objects to a action group is typically unnecessary. - The \l actions property and the \l group attached property provide a - convenient and declarative syntax. - - \sa actions, group -*/ -void QQuickActionGroup::addAction(QQuickAction *action) -{ - Q_D(QQuickActionGroup); - if (!action || d->actions.contains(action)) - return; - - const bool enabledChange = d->changeEnabled(action, d->enabled); - - QQuickActionPrivate::get(action)->group = this; - QObjectPrivate::connect(action, &QQuickAction::triggered, d, &QQuickActionGroupPrivate::actionTriggered); - QObjectPrivate::connect(action, &QQuickAction::checkedChanged, d, &QQuickActionGroupPrivate::_q_updateCurrent); - - if (d->exclusive && action->isChecked()) - setCheckedAction(action); - if (enabledChange) - emit action->enabledChanged(action->isEnabled()); - - d->actions.append(action); - emit actionsChanged(); -} - -/*! - \qmlmethod void QtQuick.Controls::ActionGroup::removeAction(Action action) - - Removes an \a action from the action group. - - \note Manually removing objects from a action group is typically unnecessary. - The \l actions property and the \l group attached property provide a - convenient and declarative syntax. - - \sa actions, group -*/ -void QQuickActionGroup::removeAction(QQuickAction *action) -{ - Q_D(QQuickActionGroup); - if (!action || !d->actions.contains(action)) - return; - - const bool enabledChange = d->changeEnabled(action, d->enabled); - - QQuickActionPrivate::get(action)->group = nullptr; - QObjectPrivate::disconnect(action, &QQuickAction::triggered, d, &QQuickActionGroupPrivate::actionTriggered); - QObjectPrivate::disconnect(action, &QQuickAction::checkedChanged, d, &QQuickActionGroupPrivate::_q_updateCurrent); - - if (d->checkedAction == action) - setCheckedAction(nullptr); - if (enabledChange) - emit action->enabledChanged(action->isEnabled()); - - d->actions.removeOne(action); - emit actionsChanged(); -} - -class QQuickActionGroupAttachedPrivate : public QObjectPrivate -{ -public: - QQuickActionGroup *group = nullptr; -}; - -QQuickActionGroupAttached::QQuickActionGroupAttached(QObject *parent) - : QObject(*(new QQuickActionGroupAttachedPrivate), parent) -{ -} - -/*! - \qmlattachedproperty ActionGroup QtQuick.Controls::ActionGroup::group - - This property attaches an action to an action group. - - \code - ActionGroup { id: group } - - Action { - checked: true - text: qsTr("Option A") - ActionGroup.group: group - } - - Action { - text: qsTr("Option B") - ActionGroup.group: group - } - \endcode - - \sa actions -*/ -QQuickActionGroup *QQuickActionGroupAttached::group() const -{ - Q_D(const QQuickActionGroupAttached); - return d->group; -} - -void QQuickActionGroupAttached::setGroup(QQuickActionGroup *group) -{ - Q_D(QQuickActionGroupAttached); - if (d->group == group) - return; - - if (d->group) - d->group->removeAction(qobject_cast(parent())); - d->group = group; - if (group) - group->addAction(qobject_cast(parent())); - emit groupChanged(); -} - -QT_END_NAMESPACE - -#include "moc_qquickactiongroup_p.cpp" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickactiongroup_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickactiongroup_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickactiongroup_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickactiongroup_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKACTIONGROUP_P_H -#define QQUICKACTIONGROUP_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickAction; -class QQuickActionGroupPrivate; -class QQuickActionGroupAttached; -class QQuickActionGroupAttachedPrivate; - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickActionGroup : public QObject -{ - Q_OBJECT - Q_PROPERTY(QQuickAction *checkedAction READ checkedAction WRITE setCheckedAction NOTIFY checkedActionChanged FINAL) - Q_PROPERTY(QQmlListProperty actions READ actions NOTIFY actionsChanged FINAL) - Q_PROPERTY(bool exclusive READ isExclusive WRITE setExclusive NOTIFY exclusiveChanged FINAL) - Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL) - Q_CLASSINFO("DefaultProperty", "actions") - -public: - explicit QQuickActionGroup(QObject *parent = nullptr); - ~QQuickActionGroup(); - - static QQuickActionGroupAttached *qmlAttachedProperties(QObject *object); - - QQuickAction *checkedAction() const; - void setCheckedAction(QQuickAction *checkedAction); - - QQmlListProperty actions(); - - bool isExclusive() const; - void setExclusive(bool exclusive); - - bool isEnabled() const; - void setEnabled(bool enabled); - -public Q_SLOTS: - void addAction(QQuickAction *action); - void removeAction(QQuickAction *action); - -Q_SIGNALS: - void checkedActionChanged(); - void actionsChanged(); - void exclusiveChanged(); - void enabledChanged(); - void triggered(QQuickAction *action); - -private: - Q_DISABLE_COPY(QQuickActionGroup) - Q_DECLARE_PRIVATE(QQuickActionGroup) - - Q_PRIVATE_SLOT(d_func(), void _q_updateCurrent()) -}; - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickActionGroupAttached : public QObject -{ - Q_OBJECT - Q_PROPERTY(QQuickActionGroup *group READ group WRITE setGroup NOTIFY groupChanged FINAL) - -public: - explicit QQuickActionGroupAttached(QObject *parent = nullptr); - - QQuickActionGroup *group() const; - void setGroup(QQuickActionGroup *group); - -Q_SIGNALS: - void groupChanged(); - -private: - Q_DISABLE_COPY(QQuickActionGroupAttached) - Q_DECLARE_PRIVATE(QQuickActionGroupAttached) -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QQuickActionGroup) -QML_DECLARE_TYPEINFO(QQuickActionGroup, QML_HAS_ATTACHED_PROPERTIES) - -#endif // QQUICKACTIONGROUP_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickaction_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickaction_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickaction_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickaction_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,128 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKACTION_P_H -#define QQUICKACTION_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickIcon; -class QQuickActionPrivate; - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAction : public QObject -{ - Q_OBJECT - Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL) - Q_PROPERTY(QQuickIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL) - Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged RESET resetEnabled FINAL) - Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged FINAL) - Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL) -#if QT_CONFIG(shortcut) - Q_PRIVATE_PROPERTY(QQuickAction::d_func(), QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged FINAL) -#endif - -public: - explicit QQuickAction(QObject *parent = nullptr); - ~QQuickAction(); - - QString text() const; - void setText(const QString &text); - - QQuickIcon icon() const; - void setIcon(const QQuickIcon &icon); - - bool isEnabled() const; - void setEnabled(bool enabled); - void resetEnabled(); - - bool isChecked() const; - void setChecked(bool checked); - - bool isCheckable() const; - void setCheckable(bool checkable); - -#if QT_CONFIG(shortcut) - QKeySequence shortcut() const; - void setShortcut(const QKeySequence &shortcut); -#endif - -public Q_SLOTS: - void toggle(QObject *source = nullptr); - void trigger(QObject *source = nullptr); - -Q_SIGNALS: - void textChanged(const QString &text); - void iconChanged(const QQuickIcon &icon); - void enabledChanged(bool enabled); - void checkedChanged(bool checked); - void checkableChanged(bool checkable); -#if QT_CONFIG(shortcut) - void shortcutChanged(const QKeySequence &shortcut); -#endif - - void toggled(QObject *source = nullptr); - void triggered(QObject *source = nullptr); - -protected: - bool event(QEvent *event) override; - bool eventFilter(QObject *object, QEvent *event) override; - -private: - Q_DISABLE_COPY(QQuickAction) - Q_DECLARE_PRIVATE(QQuickAction) -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QQuickAction) - -#endif // QQUICKACTION_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickaction_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickaction_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickaction_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickaction_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,133 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKACTION_P_P_H -#define QQUICKACTION_P_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QShortcutEvent; -class QQuickActionGroup; - -class QQuickActionPrivate : public QObjectPrivate, public QQuickItemChangeListener -{ - Q_DECLARE_PUBLIC(QQuickAction) - -public: - static QQuickActionPrivate *get(QQuickAction *action) - { - return action->d_func(); - } - -#if QT_CONFIG(shortcut) - QVariant shortcut() const; - void setShortcut(const QVariant &shortcut); -#endif - - void setEnabled(bool enable); - - bool watchItem(QQuickItem *item); - bool unwatchItem(QQuickItem *item); - - void registerItem(QQuickItem *item); - void unregisterItem(QQuickItem *item); - - void itemVisibilityChanged(QQuickItem *item) override; - void itemDestroyed(QQuickItem *item) override; - - bool handleShortcutEvent(QObject *object, QShortcutEvent *event); - - void trigger(QObject*, bool doToggle); - -#if QT_CONFIG(shortcut) - class ShortcutEntry - { - public: - explicit ShortcutEntry(QObject *target); - ~ShortcutEntry(); - - QObject *target() const; - int shortcutId() const; - - void grab(const QKeySequence &vshortcut, bool enabled); - void ungrab(); - - void setEnabled(bool enabled); - - private: - int m_shortcutId = 0; - QObject *m_target = nullptr; - }; - - ShortcutEntry *findShortcutEntry(QObject *target) const; - void updateDefaultShortcutEntry(); -#endif // QT_CONFIG(shortcut) - - bool explicitEnabled = false; - bool enabled = true; - bool checked = false; - bool checkable = false; - QString text; - QQuickIcon icon; - QKeySequence keySequence; -#if QT_CONFIG(shortcut) - QVariant vshortcut; - ShortcutEntry *defaultShortcutEntry = nullptr; - QVector shortcutEntries; -#endif - QQuickActionGroup *group = nullptr; -}; - -QT_END_NAMESPACE - -#endif // QQUICKACTION_P_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickapplicationwindow.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickapplicationwindow.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickapplicationwindow.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickapplicationwindow.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -35,7 +35,6 @@ ****************************************************************************/ #include "qquickapplicationwindow_p.h" -#include "qquickcontentitem_p.h" #include "qquickoverlay_p.h" #include "qquickpopup_p_p.h" #include "qquickcontrol_p_p.h" @@ -60,11 +59,10 @@ \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes \brief Styled top-level window with support for a header and footer. ApplicationWindow is a \l Window which makes it convenient to add - a \l {menuBar}{menu bar}, \l header and \l footer item to the window. + a \l header and \l footer item to the window. You can declare ApplicationWindow as the root item of your application, and run it by using \l QQmlApplicationEngine. In this way you can control @@ -73,15 +71,11 @@ \image qtquickcontrols2-applicationwindow-wireframe.png \qml - import QtQuick.Controls 2.12 + import QtQuick.Controls 2.1 ApplicationWindow { visible: true - menuBar: MenuBar { - // ... - } - header: ToolBar { // ... } @@ -96,6 +90,11 @@ } \endqml + ApplicationWindow supports popups via its \l overlay property, which + ensures that popups are displayed above other content and that the + background is dimmed when a \l {Popup::}{modal} or \l {Popup::dim} + {dimmed} popup is visible. + \note By default, an ApplicationWindow is not visible. \section2 Attached ApplicationWindow Properties @@ -110,27 +109,52 @@ to access the window and its building blocks from places where no direct access to the window is available, without creating a dependency to a certain window \c id. A QML component that uses the ApplicationWindow - attached properties works in any window regardless of its \c id. + attached properties works in any window regardless of its \c id. The + following example uses the attached \c overlay property to position the + popup to the center of the window, despite the position of the button + that opens the popup. - \sa {Customizing ApplicationWindow}, Overlay, Page, {Container Controls}, - {Focus Management in Qt Quick Controls 2} -*/ + \code + Button { + onClicked: popup.open() -static const QQuickItemPrivate::ChangeTypes ItemChanges = QQuickItemPrivate::Visibility - | QQuickItemPrivate::Geometry | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight; + Popup { + id: popup + + parent: ApplicationWindow.overlay + + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 100 + height: 100 + } + } + \endcode + + \sa {Customizing ApplicationWindow}, Page, {Container Controls} +*/ class QQuickApplicationWindowPrivate : public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickApplicationWindow) public: + QQuickApplicationWindowPrivate() + : complete(true), + background(nullptr), + contentItem(nullptr), + header(nullptr), + footer(nullptr), + overlay(nullptr), + activeFocusControl(nullptr) + { + } + static QQuickApplicationWindowPrivate *get(QQuickApplicationWindow *window) { return window->d_func(); } - QQmlListProperty contentData(); - void relayout(); void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) override; @@ -146,14 +170,6 @@ } void resolveFont(); - void updatePalette(const QPalette &p); - inline void setPalette_helper(const QPalette &p) { - if (palette.resolve() == p.resolve() && palette == p) - return; - updatePalette(p); - } - void resolvePalette(); - void _q_updateActiveFocus(); void setActiveFocusControl(QQuickItem *item); @@ -162,51 +178,46 @@ void cancelBackground(); void executeBackground(bool complete = false); - bool complete = true; + bool complete; QQuickDeferredPointer background; - QQuickItem *contentItem = nullptr; - QQuickItem *menuBar = nullptr; - QQuickItem *header = nullptr; - QQuickItem *footer = nullptr; - QQuickOverlay *overlay = nullptr; + QQuickItem *contentItem; + QQuickItem *header; + QQuickItem *footer; + QQuickOverlay *overlay; QFont font; QLocale locale; - QPalette palette; - QQuickItem *activeFocusControl = nullptr; - QQuickApplicationWindow *q_ptr = nullptr; + QQuickItem *activeFocusControl; + QQuickApplicationWindow *q_ptr; }; -static void layoutItem(QQuickItem *item, qreal y, qreal width) -{ - if (!item) - return; - - item->setY(y); - QQuickItemPrivate *p = QQuickItemPrivate::get(item); - if (!p->widthValid) { - item->setWidth(width); - p->widthValid = false; - } -} - void QQuickApplicationWindowPrivate::relayout() { Q_Q(QQuickApplicationWindow); - if (!complete) - return; - QQuickItem *content = q->contentItem(); qreal hh = header && header->isVisible() ? header->height() : 0; qreal fh = footer && footer->isVisible() ? footer->height() : 0; - qreal mbh = menuBar && menuBar->isVisible() ? menuBar->height() : 0; - content->setY(mbh + hh); + content->setY(hh); content->setWidth(q->width()); - content->setHeight(q->height() - mbh - hh - fh); + content->setHeight(q->height() - hh - fh); + + if (header) { + header->setY(-hh); + QQuickItemPrivate *p = QQuickItemPrivate::get(header); + if (!p->widthValid) { + header->setWidth(q->width()); + p->widthValid = false; + } + } - layoutItem(menuBar, -mbh - hh, q->width()); - layoutItem(header, -hh, q->width()); - layoutItem(footer, content->height(), q->width()); + if (footer) { + footer->setY(content->height()); + QQuickItemPrivate *p = QQuickItemPrivate::get(footer); + if (!p->widthValid) { + footer->setWidth(q->width()); + p->widthValid = false; + } + } if (background) { QQuickItemPrivate *p = QQuickItemPrivate::get(background); @@ -247,65 +258,28 @@ relayout(); } -void QQuickApplicationWindowPrivate::updateFont(const QFont &f) -{ - Q_Q(QQuickApplicationWindow); - const bool changed = font != f; - font = f; - - QQuickControlPrivate::updateFontRecur(q->QQuickWindow::contentItem(), f); - - const QList popups = q->findChildren(); - for (QQuickPopup *popup : popups) - QQuickControlPrivate::get(static_cast(popup->popupItem()))->inheritFont(f); - - if (changed) - emit q->fontChanged(); -} - -void QQuickApplicationWindowPrivate::resolveFont() -{ - QFont resolvedFont = font.resolve(QQuickTheme::font(QQuickTheme::System)); - setFont_helper(resolvedFont); -} - -void QQuickApplicationWindowPrivate::updatePalette(const QPalette &p) +void QQuickApplicationWindowPrivate::_q_updateActiveFocus() { Q_Q(QQuickApplicationWindow); - const bool changed = palette != p; - palette = p; - - QQuickControlPrivate::updatePaletteRecur(q->QQuickWindow::contentItem(), p); - - const QList popups = q->findChildren(); - for (QQuickPopup *popup : popups) - QQuickControlPrivate::get(static_cast(popup->popupItem()))->inheritPalette(p); - - if (changed) - emit q->paletteChanged(); -} - -void QQuickApplicationWindowPrivate::resolvePalette() -{ - QPalette resolvedPalette = palette.resolve(QQuickTheme::palette(QQuickTheme::System)); - setPalette_helper(resolvedPalette); -} - -static QQuickItem *findActiveFocusControl(QQuickWindow *window) -{ - QQuickItem *item = window->activeFocusItem(); + QQuickItem *item = q->activeFocusItem(); while (item) { - if (qobject_cast(item) || qobject_cast(item) || qobject_cast(item)) - return item; + QQuickControl *control = qobject_cast(item); + if (control) { + setActiveFocusControl(control); + break; + } + QQuickTextField *textField = qobject_cast(item); + if (textField) { + setActiveFocusControl(textField); + break; + } + QQuickTextArea *textArea = qobject_cast(item); + if (textArea) { + setActiveFocusControl(textArea); + break; + } item = item->parentItem(); } - return item; -} - -void QQuickApplicationWindowPrivate::_q_updateActiveFocus() -{ - Q_Q(QQuickApplicationWindow); - setActiveFocusControl(findActiveFocusControl(q)); } void QQuickApplicationWindowPrivate::setActiveFocusControl(QQuickItem *control) @@ -358,20 +332,15 @@ Q_D(QQuickApplicationWindow); d->setActiveFocusControl(nullptr); disconnect(this, SIGNAL(activeFocusItemChanged()), this, SLOT(_q_updateActiveFocus())); - if (d->menuBar) - QQuickItemPrivate::get(d->menuBar)->removeItemChangeListener(d, ItemChanges); if (d->header) - QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, ItemChanges); + QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | + QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); if (d->footer) - QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, ItemChanges); + QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | + QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); d_ptr.reset(); // QTBUG-52731 } -QQuickApplicationWindowAttached *QQuickApplicationWindow::qmlAttachedProperties(QObject *object) -{ - return new QQuickApplicationWindowAttached(object); -} - /*! \qmlproperty Item QtQuick.Controls::ApplicationWindow::background @@ -388,7 +357,7 @@ follows the control's size. In most cases, there is no need to specify width or height for a background item. - \sa {Customizing ApplicationWindow}, contentItem, header, footer + \sa {Customizing ApplicationWindow}, contentItem, header, footer, overlay */ QQuickItem *QQuickApplicationWindow::background() const { @@ -423,9 +392,8 @@ /*! \qmlproperty Item QtQuick.Controls::ApplicationWindow::header - This property holds the window header item. The header item is positioned at the - top of the window, below the menu bar, and resized to the width of the window. - The default value is \c null. + This property holds the window header item. The header item is positioned to + the top, and resized to the width of the window. The default value is \c null. \code ApplicationWindow { @@ -439,7 +407,7 @@ automatically sets the respective \l ToolBar::position, \l TabBar::position, or \l DialogButtonBox::position property to \c Header. - \sa menuBar, footer, Page::header + \sa footer, Page::header */ QQuickItem *QQuickApplicationWindow::header() const { @@ -454,14 +422,16 @@ return; if (d->header) { - QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, ItemChanges); + QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | + QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); d->header->setParentItem(nullptr); } d->header = header; if (header) { header->setParentItem(contentItem()); QQuickItemPrivate *p = QQuickItemPrivate::get(header); - p->addItemChangeListener(d, ItemChanges); + p->addItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | + QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); if (qFuzzyIsNull(header->z())) header->setZ(1); if (QQuickToolBar *toolBar = qobject_cast(header)) @@ -494,7 +464,7 @@ automatically sets the respective \l ToolBar::position, \l TabBar::position, or \l DialogButtonBox::position property to \c Footer. - \sa menuBar, header, Page::footer + \sa header, Page::footer */ QQuickItem *QQuickApplicationWindow::footer() const { @@ -509,14 +479,16 @@ return; if (d->footer) { - QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, ItemChanges); + QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | + QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); d->footer->setParentItem(nullptr); } d->footer = footer; if (footer) { footer->setParentItem(contentItem()); QQuickItemPrivate *p = QQuickItemPrivate::get(footer); - p->addItemChangeListener(d, ItemChanges); + p->addItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | + QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); if (qFuzzyIsNull(footer->z())) footer->setZ(1); if (QQuickToolBar *toolBar = qobject_cast(footer)) @@ -551,10 +523,9 @@ \sa contentItem */ -QQmlListProperty QQuickApplicationWindowPrivate::contentData() +QQmlListProperty QQuickApplicationWindow::contentData() { - Q_Q(QQuickApplicationWindow); - return QQmlListProperty(q->contentItem(), q, + return QQmlListProperty(contentItem(), this, QQuickApplicationWindowPrivate::contentData_append, QQuickItemPrivate::data_count, QQuickItemPrivate::data_at, @@ -568,15 +539,15 @@ This property holds the window content item. The content item is stacked above the \l background item, and under the - \l menuBar, \l header, and \l footer items. + \l header, \l footer, and \l overlay items. - \sa background, menuBar, header, footer + \sa background, header, footer, overlay */ QQuickItem *QQuickApplicationWindow::contentItem() const { QQuickApplicationWindowPrivate *d = const_cast(d_func()); if (!d->contentItem) { - d->contentItem = new QQuickContentItem(this, QQuickWindow::contentItem()); + d->contentItem = new QQuickItem(QQuickWindow::contentItem()); d->contentItem->setFlag(QQuickItem::ItemIsFocusScope); d->contentItem->setFocus(true); d->relayout(); @@ -605,14 +576,11 @@ } /*! - \deprecated \qmlpropertygroup QtQuick.Controls::ApplicationWindow::overlay \qmlproperty Item QtQuick.Controls::ApplicationWindow::overlay \qmlproperty Component QtQuick.Controls::ApplicationWindow::overlay.modal \qmlproperty Component QtQuick.Controls::ApplicationWindow::overlay.modeless - Use the \l Overlay attached properties and signals instead. - This property holds the window overlay item. Popups are automatically reparented to the overlay. @@ -683,7 +651,7 @@ if (d->font.resolve() == font.resolve() && d->font == font) return; - QFont resolvedFont = font.resolve(QQuickTheme::font(QQuickTheme::System)); + QFont resolvedFont = font.resolve(QQuickControlPrivate::themeFont(QPlatformTheme::SystemFont)); d->setFont_helper(resolvedFont); } @@ -692,6 +660,28 @@ setFont(QFont()); } +void QQuickApplicationWindowPrivate::resolveFont() +{ + QFont resolvedFont = font.resolve(QQuickControlPrivate::themeFont(QPlatformTheme::SystemFont)); + setFont_helper(resolvedFont); +} + +void QQuickApplicationWindowPrivate::updateFont(const QFont &f) +{ + Q_Q(QQuickApplicationWindow); + const bool changed = font != f; + font = f; + + QQuickControlPrivate::updateFontRecur(q->QQuickWindow::contentItem(), f); + + const QList popups = q->findChildren(); + for (QQuickPopup *popup : popups) + QQuickControlPrivate::get(static_cast(popup->popupItem()))->inheritFont(f); + + if (changed) + emit q->fontChanged(); +} + /*! \qmlproperty Locale QtQuick.Controls::ApplicationWindow::locale @@ -734,88 +724,9 @@ setLocale(QLocale()); } -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty palette QtQuick.Controls::ApplicationWindow::palette - - This property holds the palette currently set for the window. - - The default palette depends on the system environment. QGuiApplication maintains a system/theme - palette which serves as a default for all application windows. You can also set the default palette - for windows by passing a custom palette to QGuiApplication::setPalette(), before loading any QML. - - ApplicationWindow propagates explicit palette properties to child controls. If you change a specific - property on the window's palette, that property propagates to all child controls in the window, - overriding any system defaults for that property. - - \sa Control::palette, Popup::palette, {qtquickcontrols2-palette}{palette QML Basic Type} -*/ -QPalette QQuickApplicationWindow::palette() const -{ - Q_D(const QQuickApplicationWindow); - return d->palette; -} - -void QQuickApplicationWindow::setPalette(const QPalette &palette) -{ - Q_D(QQuickApplicationWindow); - if (d->palette.resolve() == palette.resolve() && d->palette == palette) - return; - - QPalette resolvedPalette = palette.resolve(QQuickTheme::palette(QQuickTheme::System)); - d->setPalette_helper(resolvedPalette); -} - -void QQuickApplicationWindow::resetPalette() -{ - setPalette(QPalette()); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty Item QtQuick.Controls::ApplicationWindow::menuBar - - This property holds the window menu bar. The menu bar is positioned at the - top of the window, above the header, and resized to the width of the window. - The default value is \c null. - - \code - ApplicationWindow { - menuBar: MenuBar { - // ... - } - } - \endcode - - \sa header, footer, MenuBar -*/ -QQuickItem *QQuickApplicationWindow::menuBar() const -{ - Q_D(const QQuickApplicationWindow); - return d->menuBar; -} - -void QQuickApplicationWindow::setMenuBar(QQuickItem *menuBar) +QQuickApplicationWindowAttached *QQuickApplicationWindow::qmlAttachedProperties(QObject *object) { - Q_D(QQuickApplicationWindow); - if (d->menuBar == menuBar) - return; - - if (d->menuBar) { - QQuickItemPrivate::get(d->menuBar)->removeItemChangeListener(d, ItemChanges); - d->menuBar->setParentItem(nullptr); - } - d->menuBar = menuBar; - if (menuBar) { - menuBar->setParentItem(contentItem()); - QQuickItemPrivate *p = QQuickItemPrivate::get(menuBar); - p->addItemChangeListener(d, ItemChanges); - if (qFuzzyIsNull(menuBar->z())) - menuBar->setZ(2); - } - if (isComponentComplete()) - d->relayout(); - emit menuBarChanged(); + return new QQuickApplicationWindowAttached(object); } bool QQuickApplicationWindow::isComponentComplete() const @@ -830,7 +741,6 @@ d->complete = false; QQuickWindowQmlImpl::classBegin(); d->resolveFont(); - d->resolvePalette(); } void QQuickApplicationWindow::componentComplete() @@ -839,7 +749,6 @@ d->complete = true; d->executeBackground(true); QQuickWindowQmlImpl::componentComplete(); - d->relayout(); } void QQuickApplicationWindow::resizeEvent(QResizeEvent *event) @@ -854,11 +763,11 @@ Q_DECLARE_PUBLIC(QQuickApplicationWindowAttached) public: + QQuickApplicationWindowAttachedPrivate() : window(nullptr) { } + void windowChange(QQuickWindow *wnd); - void activeFocusChange(); - QQuickWindow *window = nullptr; - QQuickItem *activeFocusControl = nullptr; + QQuickWindow *window; }; void QQuickApplicationWindowAttachedPrivate::windowChange(QQuickWindow *wnd) @@ -872,32 +781,22 @@ oldWindow = nullptr; // being deleted (QTBUG-52731) if (oldWindow) { - disconnect(oldWindow, &QQuickApplicationWindow::activeFocusControlChanged, - this, &QQuickApplicationWindowAttachedPrivate::activeFocusChange); - QObject::disconnect(oldWindow, &QQuickApplicationWindow::menuBarChanged, - q, &QQuickApplicationWindowAttached::menuBarChanged); + QObject::disconnect(oldWindow, &QQuickApplicationWindow::activeFocusControlChanged, + q, &QQuickApplicationWindowAttached::activeFocusControlChanged); QObject::disconnect(oldWindow, &QQuickApplicationWindow::headerChanged, q, &QQuickApplicationWindowAttached::headerChanged); QObject::disconnect(oldWindow, &QQuickApplicationWindow::footerChanged, q, &QQuickApplicationWindowAttached::footerChanged); - } else if (window) { - disconnect(window, &QQuickWindow::activeFocusItemChanged, - this, &QQuickApplicationWindowAttachedPrivate::activeFocusChange); } QQuickApplicationWindow *newWindow = qobject_cast(wnd); if (newWindow) { - connect(newWindow, &QQuickApplicationWindow::activeFocusControlChanged, - this, &QQuickApplicationWindowAttachedPrivate::activeFocusChange); - QObject::connect(newWindow, &QQuickApplicationWindow::menuBarChanged, - q, &QQuickApplicationWindowAttached::menuBarChanged); + QObject::connect(newWindow, &QQuickApplicationWindow::activeFocusControlChanged, + q, &QQuickApplicationWindowAttached::activeFocusControlChanged); QObject::connect(newWindow, &QQuickApplicationWindow::headerChanged, q, &QQuickApplicationWindowAttached::headerChanged); QObject::connect(newWindow, &QQuickApplicationWindow::footerChanged, q, &QQuickApplicationWindowAttached::footerChanged); - } else if (wnd) { - connect(wnd, &QQuickWindow::activeFocusItemChanged, - this, &QQuickApplicationWindowAttachedPrivate::activeFocusChange); } window = wnd; @@ -905,30 +804,14 @@ emit q->contentItemChanged(); emit q->overlayChanged(); - activeFocusChange(); - if ((oldWindow && oldWindow->menuBar()) || (newWindow && newWindow->menuBar())) - emit q->menuBarChanged(); + if ((oldWindow && oldWindow->activeFocusControl()) || (newWindow && newWindow->activeFocusControl())) + emit q->activeFocusControlChanged(); if ((oldWindow && oldWindow->header()) || (newWindow && newWindow->header())) emit q->headerChanged(); if ((oldWindow && oldWindow->footer()) || (newWindow && newWindow->footer())) emit q->footerChanged(); } -void QQuickApplicationWindowAttachedPrivate::activeFocusChange() -{ - Q_Q(QQuickApplicationWindowAttached); - QQuickItem *control = nullptr; - if (QQuickApplicationWindow *appWindow = qobject_cast(window)) - control = appWindow->activeFocusControl(); - else if (window) - control = findActiveFocusControl(window); - if (activeFocusControl == control) - return; - - activeFocusControl = control; - emit q->activeFocusControlChanged(); -} - QQuickApplicationWindowAttached::QQuickApplicationWindowAttached(QObject *parent) : QObject(*(new QQuickApplicationWindowAttachedPrivate), parent) { @@ -990,14 +873,17 @@ This attached property holds the control that currently has active focus, or \c null if there is no control with active focus. The property can be attached to any item. - The value is \c null if the item is not in a window, or the window has no active focus. + The value is \c null if the item is not in an ApplicationWindow, or the window has + no active focus. \sa Window::activeFocusItem, {Attached ApplicationWindow Properties} */ QQuickItem *QQuickApplicationWindowAttached::activeFocusControl() const { Q_D(const QQuickApplicationWindowAttached); - return d->activeFocusControl; + if (QQuickApplicationWindow *window = qobject_cast(d->window)) + return window->activeFocusControl(); + return nullptr; } /*! @@ -1037,12 +923,9 @@ } /*! - \deprecated \qmlattachedproperty Item QtQuick.Controls::ApplicationWindow::overlay \readonly - Use the \l Overlay::overlay attached property instead. - This attached property holds the window overlay item. The property can be attached to any item. The value is \c null if the item is not in an ApplicationWindow. @@ -1054,25 +937,6 @@ return QQuickOverlay::overlay(d->window); } -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlattachedproperty Item QtQuick.Controls::ApplicationWindow::menuBar - \readonly - - This attached property holds the window menu bar. The property can be attached - to any item. The value is \c null if the item is not in an ApplicationWindow, or - the window has no menu bar. - - \sa {Attached ApplicationWindow Properties} -*/ -QQuickItem *QQuickApplicationWindowAttached::menuBar() const -{ - Q_D(const QQuickApplicationWindowAttached); - if (QQuickApplicationWindow *window = qobject_cast(d->window)) - return window->menuBar(); - return nullptr; -} - QT_END_NAMESPACE #include "moc_qquickapplicationwindow_p.cpp" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickapplicationwindow_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickapplicationwindow_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickapplicationwindow_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickapplicationwindow_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -51,7 +51,6 @@ #include #include #include -#include #include QT_BEGIN_NAMESPACE @@ -66,16 +65,13 @@ Q_OBJECT Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QQuickItem *contentItem READ contentItem CONSTANT FINAL) - Q_PRIVATE_PROPERTY(QQuickApplicationWindow::d_func(), QQmlListProperty contentData READ contentData FINAL) + Q_PROPERTY(QQmlListProperty contentData READ contentData FINAL) Q_PROPERTY(QQuickItem *activeFocusControl READ activeFocusControl NOTIFY activeFocusControlChanged FINAL) Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) Q_PROPERTY(QQuickOverlay *overlay READ overlay CONSTANT FINAL) Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL) Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL) - // 2.3 (Qt 5.10) - Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) - Q_PROPERTY(QQuickItem *menuBar READ menuBar WRITE setMenuBar NOTIFY menuBarChanged FINAL REVISION 3) Q_CLASSINFO("DeferredPropertyNames", "background") Q_CLASSINFO("DefaultProperty", "contentData") @@ -83,12 +79,11 @@ explicit QQuickApplicationWindow(QWindow *parent = nullptr); ~QQuickApplicationWindow(); - static QQuickApplicationWindowAttached *qmlAttachedProperties(QObject *object); - QQuickItem *background() const; void setBackground(QQuickItem *background); QQuickItem *contentItem() const; + QQmlListProperty contentData(); QQuickItem *activeFocusControl() const; @@ -108,13 +103,7 @@ void setLocale(const QLocale &locale); void resetLocale(); - // 2.3 (Qt 5.10) - QPalette palette() const; - void setPalette(const QPalette &palette); - void resetPalette(); - - QQuickItem *menuBar() const; - void setMenuBar(QQuickItem *menuBar); + static QQuickApplicationWindowAttached *qmlAttachedProperties(QObject *object); Q_SIGNALS: void backgroundChanged(); @@ -123,8 +112,6 @@ void footerChanged(); void fontChanged(); void localeChanged(); - Q_REVISION(3) void paletteChanged(); - Q_REVISION(3) void menuBarChanged(); protected: bool isComponentComplete() const; @@ -148,7 +135,6 @@ Q_PROPERTY(QQuickItem *header READ header NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer NOTIFY footerChanged FINAL) Q_PROPERTY(QQuickOverlay *overlay READ overlay NOTIFY overlayChanged FINAL) - Q_PROPERTY(QQuickItem *menuBar READ menuBar NOTIFY menuBarChanged FINAL) // REVISION 3 public: explicit QQuickApplicationWindowAttached(QObject *parent = nullptr); @@ -159,7 +145,6 @@ QQuickItem *header() const; QQuickItem *footer() const; QQuickOverlay *overlay() const; - QQuickItem *menuBar() const; Q_SIGNALS: void windowChanged(); @@ -168,8 +153,6 @@ void headerChanged(); void footerChanged(); void overlayChanged(); - // 2.3 (Qt 5.10) - /*Q_REVISION(3)*/ void menuBarChanged(); private: Q_DISABLE_COPY(QQuickApplicationWindowAttached) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbusyindicator.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbusyindicator.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbusyindicator.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbusyindicator.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -79,7 +79,9 @@ class QQuickBusyIndicatorPrivate : public QQuickControlPrivate { public: - bool running = true; + QQuickBusyIndicatorPrivate() : running(true) { } + + bool running; }; QQuickBusyIndicator::QQuickBusyIndicator(QQuickItem *parent) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbutton.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbutton.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbutton.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbutton.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -57,10 +57,6 @@ a question. Typical buttons are \e OK, \e Apply, \e Cancel, \e Close, \e Yes, \e No, and \e Help. - Button inherits its API from AbstractButton. For instance, you can set - \l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls 2}{icon}, - and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API. - A button emits the signal \l {AbstractButton::}{clicked()} when it is activated by the user. Connect to this signal to perform the button's action. Buttons also provide the signals \l {AbstractButton::}{canceled()}, \l {AbstractButton::}{doubleClicked()}, \l {AbstractButton::}{pressed()}, @@ -84,6 +80,12 @@ \sa {Customizing Button}, {Button Controls} */ +QQuickButtonPrivate::QQuickButtonPrivate() + : flat(false), + highlighted(false) +{ +} + QQuickButton::QQuickButton(QQuickItem *parent) : QQuickAbstractButton(*(new QQuickButtonPrivate), parent) { @@ -94,14 +96,27 @@ { } -QFont QQuickButton::defaultFont() const +/*! + \qmlproperty bool QtQuick.Controls::Button::autoRepeat + + This property holds whether the button repeats + \l {AbstractButton::}{pressed()}, \l {AbstractButton::}{released()} + and \l {AbstractButton::}{clicked()} signals while the button is pressed + and held down. + + The default value is \c false. +*/ + +void QQuickButton::buttonChange(ButtonChange change) { - return QQuickTheme::font(QQuickTheme::Button); + QQuickAbstractButton::buttonChange(change); + if (change == ButtonAutoRepeatChange) + emit autoRepeatChanged(); } -QPalette QQuickButton::defaultPalette() const +QFont QQuickButton::defaultFont() const { - return QQuickTheme::palette(QQuickTheme::Button); + return QQuickControlPrivate::themeFont(QPlatformTheme::PushButtonFont); } /*! diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbuttongroup.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbuttongroup.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbuttongroup.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbuttongroup.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -157,18 +157,12 @@ void clear(); void buttonClicked(); void _q_updateCurrent(); - void updateCheckState(); - void setCheckState(Qt::CheckState state); static void buttons_append(QQmlListProperty *prop, QQuickAbstractButton *obj); static int buttons_count(QQmlListProperty *prop); static QQuickAbstractButton *buttons_at(QQmlListProperty *prop, int index); static void buttons_clear(QQmlListProperty *prop); - bool complete = true; - bool exclusive = true; - bool settingCheckState = false; - Qt::CheckState checkState = Qt::Unchecked; QPointer checkedButton; QVector buttons; }; @@ -194,39 +188,11 @@ void QQuickButtonGroupPrivate::_q_updateCurrent() { Q_Q(QQuickButtonGroup); - if (exclusive) { - QQuickAbstractButton *button = qobject_cast(q->sender()); - if (button && button->isChecked()) - q->setCheckedButton(button); - else if (!buttons.contains(checkedButton)) - q->setCheckedButton(nullptr); - } - updateCheckState(); -} - -void QQuickButtonGroupPrivate::updateCheckState() -{ - if (!complete || settingCheckState) - return; - - bool anyChecked = false; - bool allChecked = !buttons.isEmpty(); - for (QQuickAbstractButton *button : qAsConst(buttons)) { - const bool isChecked = button->isChecked(); - anyChecked |= isChecked; - allChecked &= isChecked; - } - setCheckState(Qt::CheckState(anyChecked + allChecked)); -} - -void QQuickButtonGroupPrivate::setCheckState(Qt::CheckState state) -{ - Q_Q(QQuickButtonGroup); - if (checkState == state) - return; - - checkState = state; - emit q->checkStateChanged(); + QQuickAbstractButton *button = qobject_cast(q->sender()); + if (button && button->isChecked()) + q->setCheckedButton(button); + else if (!buttons.contains(checkedButton)) + q->setCheckedButton(nullptr); } void QQuickButtonGroupPrivate::buttons_append(QQmlListProperty *prop, QQuickAbstractButton *obj) @@ -278,12 +244,9 @@ /*! \qmlproperty AbstractButton QtQuick.Controls::ButtonGroup::checkedButton - This property holds the currently selected button in an exclusive group, - or \c null if there is none or the group is non-exclusive. - - By default, it is the first checked button added to an exclusive button group. + This property holds the currently selected button, or \c null if there is none. - \sa exclusive + By default, it is the first checked button added to the button group. */ QQuickAbstractButton *QQuickButtonGroup::checkedButton() const { @@ -343,81 +306,6 @@ } /*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::ButtonGroup::exclusive - - This property holds whether the button group is exclusive. The default value is \c true. - - If this property is \c true, then only one button in the group can be checked at any given time. - The user can click on any button to check it, and that button will replace the existing one as - the checked button in the group. - - In an exclusive group, the user cannot uncheck the currently checked button by clicking on it; - instead, another button in the group must be clicked to set the new checked button for that group. - - In a non-exclusive group, checking and unchecking buttons does not affect the other buttons in - the group. Furthermore, the value of the \l checkedButton property is \c null. -*/ -bool QQuickButtonGroup::isExclusive() const -{ - Q_D(const QQuickButtonGroup); - return d->exclusive; -} - -void QQuickButtonGroup::setExclusive(bool exclusive) -{ - Q_D(QQuickButtonGroup); - if (d->exclusive == exclusive) - return; - - d->exclusive = exclusive; - emit exclusiveChanged(); -} - -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty enumeration QtQuick.Controls::ButtonGroup::checkState - - This property holds the combined check state of the button group. - - Available states: - \value Qt.Unchecked None of the buttons are checked. - \value Qt.PartiallyChecked Some of the buttons are checked. - \value Qt.Checked All of the buttons are checked. - - Setting the check state of a non-exclusive button group to \c Qt.Unchecked - or \c Qt.Checked unchecks or checks all buttons in the group, respectively. - \c Qt.PartiallyChecked is ignored. - - Setting the check state of an exclusive button group to \c Qt.Unchecked - unchecks the \l checkedButton. \c Qt.Checked and \c Qt.PartiallyChecked - are ignored. -*/ -Qt::CheckState QQuickButtonGroup::checkState() const -{ - Q_D(const QQuickButtonGroup); - return d->checkState; -} - -void QQuickButtonGroup::setCheckState(Qt::CheckState state) -{ - Q_D(QQuickButtonGroup); - if (d->checkState == state || state == Qt::PartiallyChecked) - return; - - d->settingCheckState = true; - if (d->exclusive) { - if (d->checkedButton && state == Qt::Unchecked) - setCheckedButton(nullptr); - } else { - for (QQuickAbstractButton *button : qAsConst(d->buttons)) - button->setChecked(state == Qt::Checked); - } - d->settingCheckState = false; - d->setCheckState(state); -} - -/*! \qmlmethod void QtQuick.Controls::ButtonGroup::addButton(AbstractButton button) Adds a \a button to the button group. @@ -438,11 +326,10 @@ QObjectPrivate::connect(button, &QQuickAbstractButton::clicked, d, &QQuickButtonGroupPrivate::buttonClicked); QObjectPrivate::connect(button, &QQuickAbstractButton::checkedChanged, d, &QQuickButtonGroupPrivate::_q_updateCurrent); - if (d->exclusive && button->isChecked()) + if (button->isChecked()) setCheckedButton(button); d->buttons.append(button); - d->updateCheckState(); emit buttonsChanged(); } @@ -471,28 +358,15 @@ setCheckedButton(nullptr); d->buttons.removeOne(button); - d->updateCheckState(); emit buttonsChanged(); } -void QQuickButtonGroup::classBegin() -{ - Q_D(QQuickButtonGroup); - d->complete = false; -} - -void QQuickButtonGroup::componentComplete() -{ - Q_D(QQuickButtonGroup); - d->complete = true; - if (!d->buttons.isEmpty()) - d->updateCheckState(); -} - class QQuickButtonGroupAttachedPrivate : public QObjectPrivate { public: - QQuickButtonGroup *group = nullptr; + QQuickButtonGroupAttachedPrivate() : group(nullptr) { } + + QQuickButtonGroup *group; }; QQuickButtonGroupAttached::QQuickButtonGroupAttached(QObject *parent) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbuttongroup_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbuttongroup_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbuttongroup_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbuttongroup_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -51,7 +51,6 @@ #include #include #include -#include QT_BEGIN_NAMESPACE @@ -60,16 +59,11 @@ class QQuickButtonGroupAttached; class QQuickButtonGroupAttachedPrivate; -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButtonGroup : public QObject, public QQmlParserStatus +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButtonGroup : public QObject { Q_OBJECT - Q_PROPERTY(QQuickAbstractButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged FINAL) + Q_PROPERTY(QQuickAbstractButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged) Q_PROPERTY(QQmlListProperty buttons READ buttons NOTIFY buttonsChanged FINAL) - // 2.3 (Qt 5.10) - Q_PROPERTY(bool exclusive READ isExclusive WRITE setExclusive NOTIFY exclusiveChanged FINAL REVISION 3) - // 2.4 (Qt 5.11) - Q_PROPERTY(Qt::CheckState checkState READ checkState WRITE setCheckState NOTIFY checkStateChanged FINAL REVISION 4) - Q_INTERFACES(QQmlParserStatus) public: explicit QQuickButtonGroup(QObject *parent = nullptr); @@ -82,13 +76,6 @@ QQmlListProperty buttons(); - bool isExclusive() const; - void setExclusive(bool exclusive); - - // 2.4 (Qt 5.11) - Qt::CheckState checkState() const; - void setCheckState(Qt::CheckState state); - public Q_SLOTS: void addButton(QQuickAbstractButton *button); void removeButton(QQuickAbstractButton *button); @@ -98,14 +85,6 @@ void buttonsChanged(); // 2.1 (Qt 5.8) Q_REVISION(1) void clicked(QQuickAbstractButton *button); - // 2.3 (Qt 5.10) - Q_REVISION(3) void exclusiveChanged(); - // 2.4 (Qt 5.11) - Q_REVISION(4) void checkStateChanged(); - -protected: - void classBegin() override; - void componentComplete() override; private: Q_DISABLE_COPY(QQuickButtonGroup) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbutton_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -57,6 +57,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButton : public QQuickAbstractButton { Q_OBJECT + Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY autoRepeatChanged FINAL) Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted NOTIFY highlightedChanged FINAL) Q_PROPERTY(bool flat READ isFlat WRITE setFlat NOTIFY flatChanged FINAL) @@ -70,14 +71,16 @@ void setFlat(bool flat); Q_SIGNALS: + void autoRepeatChanged(); void highlightedChanged(); void flatChanged(); protected: QQuickButton(QQuickButtonPrivate &dd, QQuickItem *parent); + void buttonChange(ButtonChange change) override; + QFont defaultFont() const override; - QPalette defaultPalette() const override; private: Q_DISABLE_COPY(QQuickButton) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbutton_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbutton_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickbutton_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickbutton_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -57,8 +57,10 @@ Q_DECLARE_PUBLIC(QQuickButton) public: - bool flat = false; - bool highlighted = false; + QQuickButtonPrivate(); + + bool flat; + bool highlighted; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcheckbox.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcheckbox.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcheckbox.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcheckbox.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -38,7 +38,6 @@ #include "qquickabstractbutton_p_p.h" #include -#include QT_BEGIN_NAMESPACE @@ -84,17 +83,7 @@ } \endcode - Hierarchical checkbox groups can be managed with a non-exclusive - \l ButtonGroup. - - \image qtquickcontrols2-checkbox-group.png - - The following example illustrates how the combined check state of - children can be bound to the check state of the parent checkbox: - - \snippet qtquickcontrols2-checkbox-group.qml 1 - - \sa {Customizing CheckBox}, ButtonGroup, {Button Controls} + \sa {Customizing CheckBox}, {Button Controls} */ class QQuickCheckBoxPrivate : public QQuickAbstractButtonPrivate @@ -102,20 +91,16 @@ Q_DECLARE_PUBLIC(QQuickCheckBox) public: - void setNextCheckState(const QJSValue &callback); + QQuickCheckBoxPrivate() + : tristate(false), + checkState(Qt::Unchecked) + { + } - bool tristate = false; - Qt::CheckState checkState = Qt::Unchecked; - QJSValue nextCheckState; + bool tristate; + Qt::CheckState checkState; }; -void QQuickCheckBoxPrivate::setNextCheckState(const QJSValue &callback) -{ - Q_Q(QQuickCheckBox); - nextCheckState = callback; - emit q->nextCheckStateChanged(); -} - QQuickCheckBox::QQuickCheckBox(QQuickItem *parent) : QQuickAbstractButton(*(new QQuickCheckBoxPrivate), parent) { @@ -173,8 +158,11 @@ if (d->checkState == state) return; + if (!d->tristate && state == Qt::PartiallyChecked) + setTristate(true); + bool wasChecked = isChecked(); - d->checked = state == Qt::Checked; + d->checked = state != Qt::Unchecked; d->checkState = state; emit checkStateChanged(); if (d->checked != wasChecked) @@ -183,12 +171,7 @@ QFont QQuickCheckBox::defaultFont() const { - return QQuickTheme::font(QQuickTheme::CheckBox); -} - -QPalette QQuickCheckBox::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::CheckBox); + return QQuickControlPrivate::themeFont(QPlatformTheme::CheckBoxFont); } void QQuickCheckBox::buttonChange(ButtonChange change) @@ -199,50 +182,20 @@ QQuickAbstractButton::buttonChange(change); } -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty function QtQuick.Controls::CheckBox::nextCheckState - - This property holds a callback function that is called to determine - the next check state whenever the checkbox is interactively toggled - by the user via touch, mouse, or keyboard. - - By default, a normal checkbox cycles between \c Qt.Unchecked and - \c Qt.Checked states, and a tri-state checkbox cycles between - \c Qt.Unchecked, \c Qt.PartiallyChecked, and \c Qt.Checked states. - - The \c nextCheckState callback function can override the default behavior. - The following example implements a tri-state checkbox that can present - a partially checked state depending on external conditions, but never - cycles to the partially checked state when interactively toggled by - the user. - - \code - CheckBox { - tristate: true - checkState: allChildrenChecked ? Qt.Checked : - anyChildChecked ? Qt.PartiallyChecked : Qt.Unchecked - - nextCheckState: function() { - if (checkState === Qt.Checked) - return Qt.Unchecked - else - return Qt.Checked - } - } - \endcode -*/ void QQuickCheckBox::nextCheckState() { Q_D(QQuickCheckBox); - if (d->nextCheckState.isCallable()) - setCheckState(static_cast(d->nextCheckState.call().toInt())); - else if (d->tristate) + if (d->tristate) setCheckState(static_cast((d->checkState + 1) % 3)); else QQuickAbstractButton::nextCheckState(); } -QT_END_NAMESPACE +#if QT_CONFIG(accessibility) +QAccessible::Role QQuickCheckBox::accessibleRole() const +{ + return QAccessible::CheckBox; +} +#endif -#include "moc_qquickcheckbox_p.cpp" +QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcheckbox_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcheckbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcheckbox_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcheckbox_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -59,8 +59,6 @@ Q_OBJECT Q_PROPERTY(bool tristate READ isTristate WRITE setTristate NOTIFY tristateChanged FINAL) Q_PROPERTY(Qt::CheckState checkState READ checkState WRITE setCheckState NOTIFY checkStateChanged FINAL) - // 2.4 (Qt 5.11) - Q_PRIVATE_PROPERTY(QQuickCheckBox::d_func(), QJSValue nextCheckState MEMBER nextCheckState WRITE setNextCheckState NOTIFY nextCheckStateChanged FINAL REVISION 4) public: explicit QQuickCheckBox(QQuickItem *parent = nullptr); @@ -74,16 +72,17 @@ Q_SIGNALS: void tristateChanged(); void checkStateChanged(); - // 2.4 (Qt 5.11) - Q_REVISION(4) void nextCheckStateChanged(); protected: QFont defaultFont() const override; - QPalette defaultPalette() const override; void buttonChange(ButtonChange change) override; void nextCheckState() override; +#if QT_CONFIG(accessibility) + QAccessible::Role accessibleRole() const override; +#endif + private: Q_DISABLE_COPY(QQuickCheckBox) Q_DECLARE_PRIVATE(QQuickCheckBox) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcheckdelegate.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcheckdelegate.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcheckdelegate.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcheckdelegate.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -38,7 +38,6 @@ #include "qquickitemdelegate_p_p.h" #include -#include QT_BEGIN_NAMESPACE @@ -89,20 +88,16 @@ Q_DECLARE_PUBLIC(QQuickCheckDelegate) public: - void setNextCheckState(const QJSValue &callback); + QQuickCheckDelegatePrivate() + : tristate(false), + checkState(Qt::Unchecked) + { + } - bool tristate = false; - Qt::CheckState checkState = Qt::Unchecked; - QJSValue nextCheckState; + bool tristate; + Qt::CheckState checkState; }; -void QQuickCheckDelegatePrivate::setNextCheckState(const QJSValue &callback) -{ - Q_Q(QQuickCheckDelegate); - nextCheckState = callback; - emit q->nextCheckStateChanged(); -} - QQuickCheckDelegate::QQuickCheckDelegate(QQuickItem *parent) : QQuickItemDelegate(*(new QQuickCheckDelegatePrivate), parent) { @@ -160,8 +155,11 @@ if (d->checkState == state) return; + if (!d->tristate && state == Qt::PartiallyChecked) + setTristate(true); + bool wasChecked = isChecked(); - d->checked = state == Qt::Checked; + d->checked = state != Qt::Unchecked; d->checkState = state; emit checkStateChanged(); if (d->checked != wasChecked) @@ -170,12 +168,7 @@ QFont QQuickCheckDelegate::defaultFont() const { - return QQuickTheme::font(QQuickTheme::ListView); -} - -QPalette QQuickCheckDelegate::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ListView); + return QQuickControlPrivate::themeFont(QPlatformTheme::ListViewFont); } void QQuickCheckDelegate::buttonChange(ButtonChange change) @@ -186,45 +179,10 @@ QQuickAbstractButton::buttonChange(change); } -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty function QtQuick.Controls::CheckDelegate::nextCheckState - - This property holds a callback function that is called to determine - the next check state whenever the check delegate is interactively toggled - by the user via touch, mouse, or keyboard. - - By default, a normal check delegate cycles between \c Qt.Unchecked and - \c Qt.Checked states, and a tri-state check delegate cycles between - \c Qt.Unchecked, \c Qt.PartiallyChecked, and \c Qt.Checked states. - - The \c nextCheckState callback function can override the default behavior. - The following example implements a tri-state check delegate that can present - a partially checked state depending on external conditions, but never - cycles to the partially checked state when interactively toggled by - the user. - - \code - CheckDelegate { - tristate: true - checkState: allChildrenChecked ? Qt.Checked : - anyChildChecked ? Qt.PartiallyChecked : Qt.Unchecked - - nextCheckState: function() { - if (checkState === Qt.Checked) - return Qt.Unchecked - else - return Qt.Checked - } - } - \endcode -*/ void QQuickCheckDelegate::nextCheckState() { Q_D(QQuickCheckDelegate); - if (d->nextCheckState.isCallable()) - setCheckState(static_cast(d->nextCheckState.call().toInt())); - else if (d->tristate) + if (d->tristate) setCheckState(static_cast((d->checkState + 1) % 3)); else QQuickItemDelegate::nextCheckState(); @@ -238,5 +196,3 @@ #endif QT_END_NAMESPACE - -#include "moc_qquickcheckdelegate_p.cpp" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcheckdelegate_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcheckdelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcheckdelegate_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcheckdelegate_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -59,8 +59,6 @@ Q_OBJECT Q_PROPERTY(bool tristate READ isTristate WRITE setTristate NOTIFY tristateChanged FINAL) Q_PROPERTY(Qt::CheckState checkState READ checkState WRITE setCheckState NOTIFY checkStateChanged FINAL) - // 2.4 (Qt 5.11) - Q_PRIVATE_PROPERTY(QQuickCheckDelegate::d_func(), QJSValue nextCheckState MEMBER nextCheckState WRITE setNextCheckState NOTIFY nextCheckStateChanged FINAL REVISION 4) public: explicit QQuickCheckDelegate(QQuickItem *parent = nullptr); @@ -74,12 +72,9 @@ Q_SIGNALS: void tristateChanged(); void checkStateChanged(); - // 2.4 (Qt 5.11) - Q_REVISION(4) void nextCheckStateChanged(); protected: QFont defaultFont() const override; - QPalette defaultPalette() const override; void buttonChange(ButtonChange change) override; void nextCheckState() override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcombobox.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcombobox.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcombobox.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcombobox.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -37,11 +37,10 @@ #include "qquickcombobox_p.h" #include "qquickcontrol_p_p.h" #include "qquickabstractbutton_p.h" -#include "qquickabstractbutton_p_p.h" #include "qquickpopup_p_p.h" #include "qquickdeferredexecute_p_p.h" -#include +#include #include #include #include @@ -52,7 +51,6 @@ #include #include #include -#include QT_BEGIN_NAMESPACE @@ -63,7 +61,6 @@ \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-input - \ingroup qtquickcontrols2-focusscopes \brief Combined button and popup list for selecting options. \image qtquickcontrols2-combobox.gif @@ -134,7 +131,7 @@ \l textRole is not defined, ComboBox is unable to visualize it and throws a \c {ReferenceError: modelData is not defined}. - \sa {Customizing ComboBox}, {Input Controls}, {Focus Management in Qt Quick Controls 2} + \sa {Customizing ComboBox}, {Input Controls} */ /*! @@ -168,7 +165,7 @@ This signal is emitted when the \uicontrol Return or \uicontrol Enter key is pressed on an \l editable combo box. If the confirmed string is not currently in the model, - the \l currentIndex will be set to \c -1 and the \l currentText will be updated + the \l currentIndex will be set to \c -1 and the \c currentText will be updated accordingly. \note If there is a \l validator set on the combo box, the signal will only be @@ -187,7 +184,7 @@ QString stringValue(int index, const QString &role) override; private: - QQuickComboBox *combo = nullptr; + QQuickComboBox *combo; }; QQuickComboBoxDelegateModel::QQuickComboBoxDelegateModel(QQuickComboBox *combo) @@ -220,6 +217,8 @@ Q_DECLARE_PUBLIC(QQuickComboBox) public: + QQuickComboBoxPrivate(); + bool isPopupVisible() const; void showPopup(); void hidePopup(bool accept); @@ -227,7 +226,6 @@ void popupVisibleChanged(); void itemClicked(); - void itemHovered(); void createdItem(int index, QObject *object); void modelUpdated(); @@ -261,40 +259,60 @@ void cancelPopup(); void executePopup(bool complete = false); - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - - bool flat = false; - bool down = false; - bool hasDown = false; - bool pressed = false; - bool ownModel = false; - bool keyNavigating = false; - bool hasDisplayText = false; - bool hasCurrentIndex = false; - int highlightedIndex = -1; - int currentIndex = -1; + bool flat; + bool down; + bool hasDown; + bool pressed; + bool ownModel; + bool hasDisplayText; + bool hasCurrentIndex; + int highlightedIndex; + int currentIndex; QVariant model; QString textRole; QString currentText; QString displayText; - QQuickItem *pressedItem = nullptr; - QQmlInstanceModel *delegateModel = nullptr; - QQmlComponent *delegate = nullptr; + QQuickItem *pressedItem; + QQmlInstanceModel *delegateModel; + QQmlComponent *delegate; QQuickDeferredPointer indicator; QQuickDeferredPointer popup; struct ExtraData { - bool editable = false; - bool accepting = false; - bool allowComplete = false; - Qt::InputMethodHints inputMethodHints = Qt::ImhNone; + ExtraData() + : editable(false), + accepting(false), + allowComplete(false), + inputMethodHints(Qt::ImhNone), + validator(nullptr) { } + + bool editable; + bool accepting; + bool allowComplete; + Qt::InputMethodHints inputMethodHints; QString editText; - QValidator *validator = nullptr; + QValidator *validator; }; QLazilyAllocated extra; }; +QQuickComboBoxPrivate::QQuickComboBoxPrivate() + : flat(false), + down(false), + hasDown(false), + pressed(false), + ownModel(false), + hasDisplayText(false), + hasCurrentIndex(false), + highlightedIndex(-1), + currentIndex(-1), + delegateModel(nullptr), + delegate(nullptr), + indicator(nullptr), + popup(nullptr) +{ +} + bool QQuickComboBoxPrivate::isPopupVisible() const { return popup && popup->isVisible(); @@ -334,15 +352,7 @@ if (isPopupVisible()) QGuiApplication::inputMethod()->reset(); - QQuickItemView *itemView = popup->findChild(); - if (itemView) - itemView->setHighlightRangeMode(QQuickItemView::NoHighlightRange); - updateHighlightedIndex(); - - if (itemView) - itemView->positionViewAtIndex(highlightedIndex, QQuickItemView::Beginning); - if (!hasDown) { q->setDown(pressed || isPopupVisible()); hasDown = false; @@ -359,25 +369,6 @@ } } -void QQuickComboBoxPrivate::itemHovered() -{ - Q_Q(QQuickComboBox); - if (keyNavigating) - return; - - QQuickAbstractButton *button = qobject_cast(q->sender()); - if (!button || !button->isHovered() || QQuickAbstractButtonPrivate::get(button)->touchId != -1) - return; - - int index = delegateModel->indexOf(button, nullptr); - if (index != -1) { - setHighlightedIndex(index, Highlight); - - if (QQuickItemView *itemView = popup->findChild()) - itemView->positionViewAtIndex(index, QQuickItemView::Contain); - } -} - void QQuickComboBoxPrivate::createdItem(int index, QObject *object) { Q_Q(QQuickComboBox); @@ -394,7 +385,6 @@ if (button) { button->setFocusPolicy(Qt::NoFocus); connect(button, &QQuickAbstractButton::clicked, this, &QQuickComboBoxPrivate::itemClicked); - connect(button, &QQuickAbstractButton::hoveredChanged, this, &QQuickComboBoxPrivate::itemHovered); } if (index == currentIndex && !q->isEditable()) @@ -557,14 +547,9 @@ void QQuickComboBoxPrivate::keySearch(const QString &text) { - const int startIndex = isPopupVisible() ? highlightedIndex : currentIndex; - const int index = match(startIndex + 1, text, Qt::MatchStartsWith | Qt::MatchWrap); - if (index != -1) { - if (isPopupVisible()) - setHighlightedIndex(index, Highlight); - else - setCurrentIndex(index, Activate); - } + int index = match(currentIndex + 1, text, Qt::MatchStartsWith | Qt::MatchWrap); + if (index != -1) + setCurrentIndex(index, Activate); } int QQuickComboBoxPrivate::match(int start, const QString &text, Qt::MatchFlags flags) const @@ -573,8 +558,6 @@ uint matchType = flags & 0x0F; bool wrap = flags & Qt::MatchWrap; Qt::CaseSensitivity cs = flags & Qt::MatchCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive; - QRegularExpression::PatternOptions options = flags & Qt::MatchCaseSensitive ? QRegularExpression::NoPatternOption - : QRegularExpression::CaseInsensitiveOption; int from = start; int to = q->count(); @@ -587,19 +570,14 @@ if (t == text) return idx; break; - case Qt::MatchRegExp: { - QRegularExpression rx(QRegularExpression::anchoredPattern(text), options); - if (rx.match(t).hasMatch()) + case Qt::MatchRegExp: + if (QRegExp(text, cs).exactMatch(t)) return idx; break; - } - case Qt::MatchWildcard: { - QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(text), - options); - if (rx.match(t).hasMatch()) + case Qt::MatchWildcard: + if (QRegExp(text, cs, QRegExp::Wildcard).exactMatch(t)) return idx; break; - } case Qt::MatchStartsWith: if (t.startsWith(text, cs)) return idx; @@ -734,22 +712,6 @@ quickCompleteDeferred(q, popupName(), popup); } -void QQuickComboBoxPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - Q_Q(QQuickComboBox); - QQuickControlPrivate::itemImplicitWidthChanged(item); - if (item == indicator) - emit q->implicitIndicatorWidthChanged(); -} - -void QQuickComboBoxPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - Q_Q(QQuickComboBox); - QQuickControlPrivate::itemImplicitHeightChanged(item); - if (item == indicator) - emit q->implicitIndicatorHeightChanged(); -} - QQuickComboBox::QQuickComboBox(QQuickItem *parent) : QQuickControl(*(new QQuickComboBoxPrivate), parent) { @@ -765,7 +727,6 @@ QQuickComboBox::~QQuickComboBox() { Q_D(QQuickComboBox); - d->removeImplicitSizeListener(d->indicator); if (d->popup) { // Disconnect visibleChanged() to avoid a spurious highlightedIndexChanged() signal // emission during the destruction of the (visible) popup. (QTBUG-57650) @@ -900,8 +861,6 @@ This property holds the index of the current item in the combo box. - The default value is \c -1 when \l count is \c 0, and \c 0 otherwise. - \sa activated(), currentText, highlightedIndex */ int QQuickComboBox::currentIndex() const @@ -923,7 +882,7 @@ This property holds the text of the current item in the combo box. - \sa currentIndex, displayText, textRole, editText + \sa currentIndex, displayText, textRole */ QString QQuickComboBox::currentText() const { @@ -1074,22 +1033,12 @@ if (!d->indicator.isExecuting()) d->cancelIndicator(); - const qreal oldImplicitIndicatorWidth = implicitIndicatorWidth(); - const qreal oldImplicitIndicatorHeight = implicitIndicatorHeight(); - - d->removeImplicitSizeListener(d->indicator); delete d->indicator; d->indicator = indicator; if (indicator) { if (!indicator->parentItem()) indicator->setParentItem(this); - d->addImplicitSizeListener(indicator); } - - if (!qFuzzyCompare(oldImplicitIndicatorWidth, implicitIndicatorWidth())) - emit implicitIndicatorWidthChanged(); - if (!qFuzzyCompare(oldImplicitIndicatorHeight, implicitIndicatorHeight())) - emit implicitIndicatorHeightChanged(); if (!d->indicator.isExecuting()) emit indicatorChanged(); } @@ -1132,9 +1081,6 @@ QQuickPopupPrivate::get(popup)->allowVerticalFlip = true; popup->setClosePolicy(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutsideParent); QObjectPrivate::connect(popup, &QQuickPopup::visibleChanged, d, &QQuickComboBoxPrivate::popupVisibleChanged); - - if (QQuickItemView *itemView = popup->findChild()) - itemView->setHighlightRangeMode(QQuickItemView::NoHighlightRange); } d->popup = popup; if (!d->popup.isExecuting()) @@ -1266,7 +1212,7 @@ This property holds the text in the text field of an editable combo box. - \sa editable, currentText, displayText + \sa editable */ QString QQuickComboBox::editText() const { @@ -1401,50 +1347,6 @@ } /*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::ComboBox::implicitIndicatorWidth - \readonly - - This property holds the implicit indicator width. - - The value is equal to \c {indicator ? indicator.implicitWidth : 0}. - - This is typically used, together with \l {Control::}{implicitContentWidth} and - \l {Control::}{implicitBackgroundWidth}, to calculate the \l {Item::}{implicitWidth}. - - \sa implicitIndicatorHeight -*/ -qreal QQuickComboBox::implicitIndicatorWidth() const -{ - Q_D(const QQuickComboBox); - if (!d->indicator) - return 0; - return d->indicator->implicitWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::ComboBox::implicitIndicatorHeight - \readonly - - This property holds the implicit indicator height. - - The value is equal to \c {indicator ? indicator.implicitHeight : 0}. - - This is typically used, together with \l {Control::}{implicitContentHeight} and - \l {Control::}{implicitBackgroundHeight}, to calculate the \l {Item::}{implicitHeight}. - - \sa implicitIndicatorWidth -*/ -qreal QQuickComboBox::implicitIndicatorHeight() const -{ - Q_D(const QQuickComboBox); - if (!d->indicator) - return 0; - return d->indicator->implicitHeight(); -} - -/*! \qmlmethod string QtQuick.Controls::ComboBox::textAt(int index) Returns the text for the specified \a index, or an empty string @@ -1547,22 +1449,14 @@ d->hidePopup(false); break; case QEvent::KeyPress: { - QKeyEvent *ke = static_cast(event); - if (d->filterKeyEvent(ke, false)) - return true; - event->accept(); + const int key = static_cast(event)->key(); if (d->extra.isAllocated()) - d->extra->allowComplete = ke->key() != Qt::Key_Backspace && ke->key() != Qt::Key_Delete; + d->extra->allowComplete = key != Qt::Key_Backspace && key != Qt::Key_Delete; break; } case QEvent::FocusOut: - if (qGuiApp->focusObject() != this && (!d->popup || !d->popup->hasActiveFocus())) { - // Only close the popup if focus was transferred somewhere else - // than to the popup or the popup button (which normally means that - // the user clicked on the popup button to open it, not close it). - d->hidePopup(false); - setPressed(false); - } + d->hidePopup(false); + setPressed(false); break; #if QT_CONFIG(im) case QEvent::InputMethod: @@ -1588,14 +1482,8 @@ { Q_D(QQuickComboBox); QQuickControl::focusOutEvent(event); - - if (qGuiApp->focusObject() != d->contentItem && (!d->popup || !d->popup->hasActiveFocus())) { - // Only close the popup if focus was transferred - // somewhere else than to the popup or the inner line edit (which is - // normally done from QQuickComboBox::focusInEvent). - d->hidePopup(false); - setPressed(false); - } + d->hidePopup(false); + setPressed(false); } #if QT_CONFIG(im) @@ -1633,17 +1521,14 @@ event->accept(); break; case Qt::Key_Up: - d->keyNavigating = true; d->decrementCurrentIndex(); event->accept(); break; case Qt::Key_Down: - d->keyNavigating = true; d->incrementCurrentIndex(); event->accept(); break; case Qt::Key_Home: - d->keyNavigating = true; if (d->isPopupVisible()) d->setHighlightedIndex(0, Highlight); else @@ -1651,7 +1536,6 @@ event->accept(); break; case Qt::Key_End: - d->keyNavigating = true; if (d->isPopupVisible()) d->setHighlightedIndex(count() - 1, Highlight); else @@ -1671,7 +1555,6 @@ { Q_D(QQuickComboBox); QQuickControl::keyReleaseEvent(event); - d->keyNavigating = false; if (event->isAutoRepeat()) return; @@ -1691,11 +1574,9 @@ break; case Qt::Key_Escape: case Qt::Key_Back: - if (d->isPopupVisible()) { - d->hidePopup(false); - setPressed(false); - event->accept(); - } + d->hidePopup(false); + setPressed(false); + event->accept(); break; default: break; @@ -1708,10 +1589,12 @@ Q_D(QQuickComboBox); QQuickControl::wheelEvent(event); if (d->wheelEnabled && !d->isPopupVisible()) { + const int oldIndex = d->currentIndex; if (event->angleDelta().y() > 0) d->decrementCurrentIndex(); else d->incrementCurrentIndex(); + event->setAccepted(d->currentIndex != oldIndex); } } #endif @@ -1735,16 +1618,6 @@ } } -void QQuickComboBox::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value) -{ - Q_D(QQuickComboBox); - QQuickControl::itemChange(change, value); - if (change == ItemVisibleHasChanged && !value.boolValue) { - d->hidePopup(false); - setPressed(false); - } -} - void QQuickComboBox::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) { Q_D(QQuickComboBox); @@ -1782,12 +1655,7 @@ QFont QQuickComboBox::defaultFont() const { - return QQuickTheme::font(QQuickTheme::ComboBox); -} - -QPalette QQuickComboBox::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ComboBox); + return QQuickControlPrivate::themeFont(QPlatformTheme::ComboMenuItemFont); } #if QT_CONFIG(accessibility) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcombobox_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcombobox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcombobox_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcombobox_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -82,9 +82,6 @@ Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints NOTIFY inputMethodHintsChanged FINAL REVISION 2) Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged FINAL REVISION 2) Q_PROPERTY(bool acceptableInput READ hasAcceptableInput NOTIFY acceptableInputChanged FINAL REVISION 2) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal implicitIndicatorWidth READ implicitIndicatorWidth NOTIFY implicitIndicatorWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitIndicatorHeight READ implicitIndicatorHeight NOTIFY implicitIndicatorHeightChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "background,contentItem,indicator,popup") public: @@ -151,10 +148,6 @@ bool isInputMethodComposing() const; bool hasAcceptableInput() const; - // 2.5 (Qt 5.12) - qreal implicitIndicatorWidth() const; - qreal implicitIndicatorHeight() const; - public Q_SLOTS: void incrementCurrentIndex(); void decrementCurrentIndex(); @@ -186,9 +179,6 @@ Q_REVISION(2) void inputMethodHintsChanged(); Q_REVISION(2) void inputMethodComposingChanged(); Q_REVISION(2) void acceptableInputChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void implicitIndicatorWidthChanged(); - Q_REVISION(5) void implicitIndicatorHeightChanged(); protected: bool eventFilter(QObject *object, QEvent *event) override; @@ -204,12 +194,10 @@ #endif void componentComplete() override; - void itemChange(ItemChange change, const ItemChangeData &value) override; void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override; QFont defaultFont() const override; - QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontainer.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontainer.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontainer.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontainer.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -192,14 +192,20 @@ return item; } +QQuickContainerPrivate::QQuickContainerPrivate() + : contentModel(nullptr), + currentIndex(-1), + updatingCurrent(false), + changeTypes(Destroyed | Parent | SiblingOrder) +{ +} + void QQuickContainerPrivate::init() { Q_Q(QQuickContainer); contentModel = new QQmlObjectModel(q); QObject::connect(contentModel, &QQmlObjectModel::countChanged, q, &QQuickContainer::countChanged); QObject::connect(contentModel, &QQmlObjectModel::childrenChanged, q, &QQuickContainer::contentChildrenChanged); - connect(q, &QQuickControl::implicitContentWidthChanged, this, &QQuickContainerPrivate::updateContentWidth); - connect(q, &QQuickControl::implicitContentHeightChanged, this, &QQuickContainerPrivate::updateContentHeight); } void QQuickContainerPrivate::cleanup() @@ -241,23 +247,19 @@ updatingCurrent = true; - item->setParentItem(effectiveContentItem(getContentItem())); + item->setParentItem(effectiveContentItem(contentItem)); QQuickItemPrivate::get(item)->addItemChangeListener(this, changeTypes); contentModel->insert(index, item); q->itemAdded(index, item); - int count = contentModel->count(); - for (int i = index + 1; i < count; ++i) - q->itemMoved(i, itemAt(i)); - - if (count == 1 && currentIndex == -1) + if (contentModel->count() == 1 && currentIndex == -1) q->setCurrentIndex(index); updatingCurrent = false; } -void QQuickContainerPrivate::moveItem(int from, int to, QQuickItem *item) +void QQuickContainerPrivate::moveItem(int from, int to) { Q_Q(QQuickContainer); int oldCurrent = currentIndex; @@ -265,16 +267,6 @@ updatingCurrent = true; - q->itemMoved(to, item); - - if (from < to) { - for (int i = from; i < to; ++i) - q->itemMoved(i, itemAt(i)); - } else { - for (int i = from; i > to; --i) - q->itemMoved(i, itemAt(i)); - } - if (from == oldCurrent) q->setCurrentIndex(to); else if (from < oldCurrent && to >= oldCurrent) @@ -294,9 +286,8 @@ updatingCurrent = true; - int count = contentModel->count(); bool currentChanged = false; - if (index == currentIndex && (index != 0 || count == 1)) { + if (index == currentIndex) { q->setCurrentIndex(currentIndex - 1); } else if (index < currentIndex) { --currentIndex; @@ -306,13 +297,9 @@ QQuickItemPrivate::get(item)->removeItemChangeListener(this, changeTypes); item->setParentItem(nullptr); contentModel->remove(index); - --count; q->itemRemoved(index, item); - for (int i = index; i < count; ++i) - q->itemMoved(i, itemAt(i)); - if (currentChanged) emit q->currentIndexChanged(); @@ -372,14 +359,12 @@ int index = contentModel->indexOf(item, nullptr); if (index != -1) removeItem(index, item); - else - QQuickControlPrivate::itemDestroyed(item); } void QQuickContainerPrivate::contentData_append(QQmlListProperty *prop, QObject *obj) { + QQuickContainerPrivate *p = static_cast(prop->data); QQuickContainer *q = static_cast(prop->object); - QQuickContainerPrivate *p = QQuickContainerPrivate::get(q); QQuickItem *item = qobject_cast(obj); if (item) { if (QQuickItemPrivate::get(item)->isTransparentForPositioner()) @@ -393,20 +378,20 @@ int QQuickContainerPrivate::contentData_count(QQmlListProperty *prop) { - QQuickContainer *q = static_cast(prop->object); - return QQuickContainerPrivate::get(q)->contentData.count(); + QQuickContainerPrivate *p = static_cast(prop->data); + return p->contentData.count(); } QObject *QQuickContainerPrivate::contentData_at(QQmlListProperty *prop, int index) { - QQuickContainer *q = static_cast(prop->object); - return QQuickContainerPrivate::get(q)->contentData.value(index); + QQuickContainerPrivate *p = static_cast(prop->data); + return p->contentData.value(index); } void QQuickContainerPrivate::contentData_clear(QQmlListProperty *prop) { - QQuickContainer *q = static_cast(prop->object); - return QQuickContainerPrivate::get(q)->contentData.clear(); + QQuickContainerPrivate *p = static_cast(prop->data); + p->contentData.clear(); } void QQuickContainerPrivate::contentChildren_append(QQmlListProperty *prop, QQuickItem *item) @@ -417,8 +402,8 @@ int QQuickContainerPrivate::contentChildren_count(QQmlListProperty *prop) { - QQuickContainer *q = static_cast(prop->object); - return QQuickContainerPrivate::get(q)->contentModel->count(); + QQuickContainerPrivate *p = static_cast(prop->data); + return p->contentModel->count(); } QQuickItem *QQuickContainerPrivate::contentChildren_at(QQmlListProperty *prop, int index) @@ -429,28 +414,8 @@ void QQuickContainerPrivate::contentChildren_clear(QQmlListProperty *prop) { - QQuickContainer *q = static_cast(prop->object); - return QQuickContainerPrivate::get(q)->contentModel->clear(); -} - -void QQuickContainerPrivate::updateContentWidth() -{ - Q_Q(QQuickContainer); - if (hasContentWidth || qFuzzyCompare(contentWidth, implicitContentWidth)) - return; - - contentWidth = implicitContentWidth; - emit q->contentWidthChanged(); -} - -void QQuickContainerPrivate::updateContentHeight() -{ - Q_Q(QQuickContainer); - if (hasContentHeight || qFuzzyCompare(contentHeight, implicitContentHeight)) - return; - - contentHeight = implicitContentHeight; - emit q->contentHeightChanged(); + QQuickContainerPrivate *p = static_cast(prop->data); + p->contentModel->clear(); } QQuickContainer::QQuickContainer(QQuickItem *parent) @@ -526,7 +491,7 @@ if (oldIndex < index) --index; if (oldIndex != index) - d->moveItem(oldIndex, index, item); + d->moveItem(oldIndex, index); } else { d->insertItem(index, item); } @@ -547,65 +512,26 @@ to = count - 1; if (from != to) - d->moveItem(from, to, d->itemAt(from)); + d->moveItem(from, to); } /*! - \deprecated \qmlmethod void QtQuick.Controls::Container::removeItem(int index) - Use Container::removeItem(Item) or Container::takeItem(int) instead. -*/ -void QQuickContainer::removeItem(const QVariant &var) -{ - if (var.userType() == QMetaType::Nullptr) - return; - - if (QQuickItem *item = var.value()) - removeItem(item); - else - takeItem(var.toInt()); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Container::removeItem(Item item) - - Removes and destroys the specified \a item. -*/ -void QQuickContainer::removeItem(QQuickItem *item) -{ - Q_D(QQuickContainer); - if (!item) - return; - - const int index = d->contentModel->indexOf(item, nullptr); - if (index == -1) - return; - - d->removeItem(index, item); - item->deleteLater(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod Item QtQuick.Controls::Container::takeItem(int index) - - Removes and returns the item at \a index. + Removes an item at \a index. \note The ownership of the item is transferred to the caller. */ -QQuickItem *QQuickContainer::takeItem(int index) +void QQuickContainer::removeItem(int index) { Q_D(QQuickContainer); const int count = d->contentModel->count(); if (index < 0 || index >= count) - return nullptr; + return; QQuickItem *item = itemAt(index); if (item) d->removeItem(index, item); - return item; } /*! @@ -654,7 +580,7 @@ Q_D(QQuickContainer); if (!d->contentItem) d->executeContentItem(); - return QQmlListProperty(this, nullptr, + return QQmlListProperty(this, d, QQuickContainerPrivate::contentData_append, QQuickContainerPrivate::contentData_count, QQuickContainerPrivate::contentData_at, @@ -677,7 +603,8 @@ */ QQmlListProperty QQuickContainer::contentChildren() { - return QQmlListProperty(this, nullptr, + Q_D(QQuickContainer); + return QQmlListProperty(this, d, QQuickContainerPrivate::contentChildren_append, QQuickContainerPrivate::contentChildren_count, QQuickContainerPrivate::contentChildren_at, @@ -768,86 +695,6 @@ return itemAt(d->currentIndex); } -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Container::contentWidth - - This property holds the content width. It is used for calculating the total - implicit width of the container. - - Unless explicitly overridden, the content width is automatically calculated - based on the implicit width of the items in the container. - - \sa contentHeight -*/ -qreal QQuickContainer::contentWidth() const -{ - Q_D(const QQuickContainer); - return d->contentWidth; -} - -void QQuickContainer::setContentWidth(qreal width) -{ - Q_D(QQuickContainer); - d->hasContentWidth = true; - if (qFuzzyCompare(d->contentWidth, width)) - return; - - d->contentWidth = width; - d->resizeContent(); - emit contentWidthChanged(); -} - -void QQuickContainer::resetContentWidth() -{ - Q_D(QQuickContainer); - if (!d->hasContentWidth) - return; - - d->hasContentWidth = false; - d->updateContentWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Container::contentHeight - - This property holds the content height. It is used for calculating the total - implicit height of the container. - - Unless explicitly overridden, the content height is automatically calculated - based on the implicit height of the items in the container. - - \sa contentWidth -*/ -qreal QQuickContainer::contentHeight() const -{ - Q_D(const QQuickContainer); - return d->contentHeight; -} - -void QQuickContainer::setContentHeight(qreal height) -{ - Q_D(QQuickContainer); - d->hasContentHeight = true; - if (qFuzzyCompare(d->contentHeight, height)) - return; - - d->contentHeight = height; - d->resizeContent(); - emit contentHeightChanged(); -} - -void QQuickContainer::resetContentHeight() -{ - Q_D(QQuickContainer); - if (!d->hasContentHeight) - return; - - d->hasContentHeight = false; - d->updateContentHeight(); -} - void QQuickContainer::componentComplete() { Q_D(QQuickContainer); @@ -873,7 +720,7 @@ static const int slotIndex = metaObject()->indexOfSlot("_q_currentIndexChanged()"); if (oldItem) { - QQuickItemPrivate::get(oldItem)->removeItemChangeListener(d, QQuickItemPrivate::Children | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); + QQuickItemPrivate::get(oldItem)->removeItemChangeListener(d, QQuickItemPrivate::Children); QQuickItem *oldContentItem = effectiveContentItem(oldItem); if (oldContentItem != oldItem) QQuickItemPrivate::get(oldContentItem)->removeItemChangeListener(d, QQuickItemPrivate::Children); @@ -884,7 +731,7 @@ } if (newItem) { - QQuickItemPrivate::get(newItem)->addItemChangeListener(d, QQuickItemPrivate::Children | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); + QQuickItemPrivate::get(newItem)->addItemChangeListener(d, QQuickItemPrivate::Children); QQuickItem *newContentItem = effectiveContentItem(newItem); if (newContentItem != newItem) QQuickItemPrivate::get(newContentItem)->addItemChangeListener(d, QQuickItemPrivate::Children); @@ -910,12 +757,6 @@ { Q_UNUSED(index); Q_UNUSED(item); -} - -void QQuickContainer::itemMoved(int index, QQuickItem *item) -{ - Q_UNUSED(index); - Q_UNUSED(item); } void QQuickContainer::itemRemoved(int index, QQuickItem *item) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontainer_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontainer_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontainer_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontainer_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -64,9 +64,6 @@ Q_PROPERTY(QQmlListProperty contentChildren READ contentChildren NOTIFY contentChildrenChanged FINAL) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL) Q_PROPERTY(QQuickItem *currentItem READ currentItem NOTIFY currentItemChanged FINAL) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth RESET resetContentWidth NOTIFY contentWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight RESET resetContentHeight NOTIFY contentHeightChanged FINAL REVISION 5) Q_CLASSINFO("DefaultProperty", "contentData") public: @@ -78,10 +75,7 @@ Q_INVOKABLE void addItem(QQuickItem *item); Q_INVOKABLE void insertItem(int index, QQuickItem *item); Q_INVOKABLE void moveItem(int from, int to); - Q_INVOKABLE void removeItem(const QVariant &item); // ### Qt 6: remove - void removeItem(QQuickItem *item); // ### Qt 6: Q_INVOKABLE - // 2.3 (Qt 5.10) - Q_REVISION(3) Q_INVOKABLE QQuickItem *takeItem(int index); + Q_INVOKABLE void removeItem(int index); QVariant contentModel() const; QQmlListProperty contentData(); @@ -90,15 +84,6 @@ int currentIndex() const; QQuickItem *currentItem() const; - // 2.5 (Qt 5.12) - qreal contentWidth() const; - void setContentWidth(qreal width); - void resetContentWidth(); - - qreal contentHeight() const; - void setContentHeight(qreal height); - void resetContentHeight(); - public Q_SLOTS: void setCurrentIndex(int index); // 2.1 (Qt 5.8) @@ -110,9 +95,6 @@ void contentChildrenChanged(); void currentIndexChanged(); void currentItemChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void contentWidthChanged(); - Q_REVISION(5) void contentHeightChanged(); protected: QQuickContainer(QQuickContainerPrivate &dd, QQuickItem *parent); @@ -124,7 +106,6 @@ virtual bool isContent(QQuickItem *item) const; virtual void itemAdded(int index, QQuickItem *item); - virtual void itemMoved(int index, QQuickItem *item); virtual void itemRemoved(int index, QQuickItem *item); private: diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontainer_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontainer_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontainer_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontainer_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,28 +48,25 @@ // We mean it. // -#include #include +#include #include QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickContainerPrivate : public QQuickControlPrivate +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickContainerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickContainer) public: - static QQuickContainerPrivate *get(QQuickContainer *container) - { - return container->d_func(); - } + QQuickContainerPrivate(); void init(); void cleanup(); QQuickItem *itemAt(int index) const; void insertItem(int index, QQuickItem *item); - void moveItem(int from, int to, QQuickItem *item); + void moveItem(int from, int to); void removeItem(int index, QQuickItem *item); void reorderItems(); @@ -90,18 +87,11 @@ static QQuickItem *contentChildren_at(QQmlListProperty *prop, int index); static void contentChildren_clear(QQmlListProperty *prop); - void updateContentWidth(); - void updateContentHeight(); - - bool hasContentWidth = false; - bool hasContentHeight = false; - qreal contentWidth = 0; - qreal contentHeight = 0; QObjectList contentData; - QQmlObjectModel *contentModel = nullptr; - int currentIndex = -1; - bool updatingCurrent = false; - QQuickItemPrivate::ChangeTypes changeTypes = Destroyed | Parent | SiblingOrder; + QQmlObjectModel *contentModel; + int currentIndex; + bool updatingCurrent; + QQuickItemPrivate::ChangeTypes changeTypes; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontentitem.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontentitem.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontentitem.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontentitem.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickcontentitem_p.h" - -#include - -QT_BEGIN_NAMESPACE - -/*! - \internal - - Helper class that aids debugging by producing more useful debugging output. -*/ - -QQuickContentItem::QQuickContentItem(QQuickItem *parent) - : QQuickItem(parent) -{ - setObjectName(QQmlMetaType::prettyTypeName(parent)); -} - -QQuickContentItem::QQuickContentItem(const QObject *scope, QQuickItem *parent) - : QQuickItem(parent) -{ - setObjectName(QQmlMetaType::prettyTypeName(scope)); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontentitem_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontentitem_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontentitem_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontentitem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKCONTENTITEM_P_H -#define QQUICKCONTENTITEM_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickContentItem : public QQuickItem -{ - Q_OBJECT - -public: - explicit QQuickContentItem(QQuickItem *parent = nullptr); - explicit QQuickContentItem(const QObject *scope, QQuickItem *parent); - -private: - Q_DISABLE_COPY(QQuickContentItem) -}; - -QT_END_NAMESPACE - -#endif // QQUICKCONTENTITEM_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontrol.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontrol.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontrol.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontrol.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -50,6 +50,9 @@ #include "qquickapplicationwindow_p.h" #include "qquickdeferredexecute_p_p.h" +#include +#include + #if QT_CONFIG(accessibility) #include #endif @@ -76,78 +79,59 @@ The \l {Item::}{implicitWidth} and \l {Item::}{implicitHeight} of a control are typically based on the implicit sizes of the background and the content - item plus any insets and paddings. These properties determine how large + item plus any \l {Control::}{padding}. These properties determine how large the control will be when no explicit \l {Item::}{width} or \l {Item::}{height} is specified. - The geometry of the \l {Control::}{contentItem} is determined by the padding. - The following example reserves 10px padding between the boundaries of the - control and its content: - - \code - Control { - padding: 10 - - contentItem: Text { - text: "Content" - } - } - \endcode - The \l {Control::}{background} item fills the entire width and height of the - control, unless insets or an explicit size have been given for it. Background - insets are useful for extending the touchable/interactive area of a control - without affecting its visual size. This is often used on touch devices to - ensure that a control is not too small to be interacted with by the user. - Insets affect the size of the control, and hence will affect how much space - they take up in a layout, for example. - - Negative insets can be used to make the background larger than the control. - The following example uses negative insets to place a shadow outside the - control's boundaries: + control, unless an explicit size has been given for it. - \code - Control { - topInset: -2 - leftInset: -2 - rightInset: -6 - bottomInset: -6 - - background: BorderImage { - source: ":/images/shadowed-background.png" - } - } - \endcode + The geometry of the \l {Control::}{contentItem} is determined by the + padding. \section1 Event Handling All controls, except non-interactive indicators, do not let clicks and - touches through to items below them. For example, the \c console.log() - call in the example below will never be executed when clicking on the - Pane, because the \l MouseArea is below it in the scene: - - \code - MouseArea { - anchors.fill: parent - onClicked: console.log("MouseArea was clicked") - - Pane { - anchors.fill: parent - } - } - \endcode + touches through to items below them. For example, if \l Pane is used as the + \l {ApplicationWindow::}{header} or \l {ApplicationWindow::}{footer} of + \l ApplicationWindow, items underneath it will not get mouse or touch + events. \sa ApplicationWindow, Container */ -const QQuickItemPrivate::ChangeTypes QQuickControlPrivate::ImplicitSizeChanges = QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight | QQuickItemPrivate::Destroyed; - static bool isKeyFocusReason(Qt::FocusReason reason) { return reason == Qt::TabFocusReason || reason == Qt::BacktabFocusReason || reason == Qt::ShortcutFocusReason; } +QQuickControlPrivate::ExtraData::ExtraData() +{ +} + QQuickControlPrivate::QQuickControlPrivate() + : hasTopPadding(false), + hasLeftPadding(false), + hasRightPadding(false), + hasBottomPadding(false), + hasLocale(false), + wheelEnabled(false), +#if QT_CONFIG(quicktemplates2_hover) + hovered(false), + explicitHoverEnabled(false), +#endif + touchId(-1), + padding(0), + topPadding(0), + leftPadding(0), + rightPadding(0), + bottomPadding(0), + spacing(0), + focusPolicy(Qt::NoFocus), + focusReason(Qt::OtherFocusReason), + background(nullptr), + contentItem(nullptr), + accessibleAttached(nullptr) { #if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); @@ -161,12 +145,6 @@ #endif } -void QQuickControlPrivate::init() -{ - Q_Q(QQuickControl); - QObject::connect(q, &QQuickItem::baselineOffsetChanged, q, &QQuickControl::baselineOffsetChanged); -} - #if QT_CONFIG(quicktemplates2_multitouch) bool QQuickControlPrivate::acceptTouch(const QTouchEvent::TouchPoint &point) { @@ -230,161 +208,73 @@ void QQuickControlPrivate::setTopPadding(qreal value, bool reset) { Q_Q(QQuickControl); - const QMarginsF oldPadding = getPadding(); - extra.value().topPadding = value; - extra.value().hasTopPadding = !reset; - if ((!reset && !qFuzzyCompare(oldPadding.top(), value)) || (reset && !qFuzzyCompare(oldPadding.top(), getVerticalPadding()))) { + qreal oldPadding = q->topPadding(); + topPadding = value; + hasTopPadding = !reset; + if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) { emit q->topPaddingChanged(); emit q->availableHeightChanged(); - q->paddingChange(getPadding(), oldPadding); + q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding), + QMarginsF(leftPadding, oldPadding, rightPadding, bottomPadding)); } } void QQuickControlPrivate::setLeftPadding(qreal value, bool reset) { Q_Q(QQuickControl); - const QMarginsF oldPadding = getPadding(); - extra.value().leftPadding = value; - extra.value().hasLeftPadding = !reset; - if ((!reset && !qFuzzyCompare(oldPadding.left(), value)) || (reset && !qFuzzyCompare(oldPadding.left(), getHorizontalPadding()))) { + qreal oldPadding = q->leftPadding(); + leftPadding = value; + hasLeftPadding = !reset; + if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) { emit q->leftPaddingChanged(); emit q->availableWidthChanged(); - q->paddingChange(getPadding(), oldPadding); + q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding), + QMarginsF(oldPadding, topPadding, rightPadding, bottomPadding)); } } void QQuickControlPrivate::setRightPadding(qreal value, bool reset) { Q_Q(QQuickControl); - const QMarginsF oldPadding = getPadding(); - extra.value().rightPadding = value; - extra.value().hasRightPadding = !reset; - if ((!reset && !qFuzzyCompare(oldPadding.right(), value)) || (reset && !qFuzzyCompare(oldPadding.right(), getHorizontalPadding()))) { + qreal oldPadding = q->rightPadding(); + rightPadding = value; + hasRightPadding = !reset; + if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) { emit q->rightPaddingChanged(); emit q->availableWidthChanged(); - q->paddingChange(getPadding(), oldPadding); + q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding), + QMarginsF(leftPadding, topPadding, oldPadding, bottomPadding)); } } void QQuickControlPrivate::setBottomPadding(qreal value, bool reset) { Q_Q(QQuickControl); - const QMarginsF oldPadding = getPadding(); - extra.value().bottomPadding = value; - extra.value().hasBottomPadding = !reset; - if ((!reset && !qFuzzyCompare(oldPadding.bottom(), value)) || (reset && !qFuzzyCompare(oldPadding.bottom(), getVerticalPadding()))) { + qreal oldPadding = q->bottomPadding(); + bottomPadding = value; + hasBottomPadding = !reset; + if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) { emit q->bottomPaddingChanged(); emit q->availableHeightChanged(); - q->paddingChange(getPadding(), oldPadding); - } -} - -void QQuickControlPrivate::setHorizontalPadding(qreal value, bool reset) -{ - Q_Q(QQuickControl); - const QMarginsF oldPadding = getPadding(); - const qreal oldHorizontalPadding = getHorizontalPadding(); - horizontalPadding = value; - hasHorizontalPadding = !reset; - if ((!reset && !qFuzzyCompare(oldHorizontalPadding, value)) || (reset && !qFuzzyCompare(oldHorizontalPadding, padding))) { - const QMarginsF newPadding = getPadding(); - if (!qFuzzyCompare(newPadding.left(), oldPadding.left())) - emit q->leftPaddingChanged(); - if (!qFuzzyCompare(newPadding.right(), oldPadding.right())) - emit q->rightPaddingChanged(); - emit q->horizontalPaddingChanged(); - emit q->availableWidthChanged(); - q->paddingChange(newPadding, oldPadding); - } -} - -void QQuickControlPrivate::setVerticalPadding(qreal value, bool reset) -{ - Q_Q(QQuickControl); - const QMarginsF oldPadding = getPadding(); - const qreal oldVerticalPadding = getVerticalPadding(); - verticalPadding = value; - hasVerticalPadding = !reset; - if ((!reset && !qFuzzyCompare(oldVerticalPadding, value)) || (reset && !qFuzzyCompare(oldVerticalPadding, padding))) { - const QMarginsF newPadding = getPadding(); - if (!qFuzzyCompare(newPadding.top(), oldPadding.top())) - emit q->topPaddingChanged(); - if (!qFuzzyCompare(newPadding.bottom(), oldPadding.bottom())) - emit q->bottomPaddingChanged(); - emit q->verticalPaddingChanged(); - emit q->availableHeightChanged(); - q->paddingChange(newPadding, oldPadding); - } -} - -void QQuickControlPrivate::setTopInset(qreal value, bool reset) -{ - Q_Q(QQuickControl); - const QMarginsF oldInset = getInset(); - extra.value().topInset = value; - extra.value().hasTopInset = !reset; - if (!qFuzzyCompare(oldInset.top(), value)) { - emit q->topInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickControlPrivate::setLeftInset(qreal value, bool reset) -{ - Q_Q(QQuickControl); - const QMarginsF oldInset = getInset(); - extra.value().leftInset = value; - extra.value().hasLeftInset = !reset; - if (!qFuzzyCompare(oldInset.left(), value)) { - emit q->leftInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickControlPrivate::setRightInset(qreal value, bool reset) -{ - Q_Q(QQuickControl); - const QMarginsF oldInset = getInset(); - extra.value().rightInset = value; - extra.value().hasRightInset = !reset; - if (!qFuzzyCompare(oldInset.right(), value)) { - emit q->rightInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickControlPrivate::setBottomInset(qreal value, bool reset) -{ - Q_Q(QQuickControl); - const QMarginsF oldInset = getInset(); - extra.value().bottomInset = value; - extra.value().hasBottomInset = !reset; - if (!qFuzzyCompare(oldInset.bottom(), value)) { - emit q->bottomInsetChanged(); - q->insetChange(getInset(), oldInset); + q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding), + QMarginsF(leftPadding, topPadding, rightPadding, oldPadding)); } } void QQuickControlPrivate::resizeBackground() { - if (!background) - return; - - resizingBackground = true; - - QQuickItemPrivate *p = QQuickItemPrivate::get(background); - if (((!p->widthValid || !extra.isAllocated() || !extra->hasBackgroundWidth) && qFuzzyIsNull(background->x())) - || (extra.isAllocated() && (extra->hasLeftInset || extra->hasRightInset))) { - background->setX(getLeftInset()); - background->setWidth(width - getLeftInset() - getRightInset()); - } - if (((!p->heightValid || !extra.isAllocated() || !extra->hasBackgroundHeight) && qFuzzyIsNull(background->y())) - || (extra.isAllocated() && (extra->hasTopInset || extra->hasBottomInset))) { - background->setY(getTopInset()); - background->setHeight(height - getTopInset() - getBottomInset()); + Q_Q(QQuickControl); + if (background) { + QQuickItemPrivate *p = QQuickItemPrivate::get(background); + if (!p->widthValid && qFuzzyIsNull(background->x())) { + background->setWidth(q->width()); + p->widthValid = false; + } + if (!p->heightValid && qFuzzyIsNull(background->y())) { + background->setHeight(q->height()); + p->heightValid = false; + } } - - resizingBackground = false; } void QQuickControlPrivate::resizeContent() @@ -412,73 +302,21 @@ if (!contentItem.isExecuting()) cancelContentItem(); - QQuickItem *oldContentItem = contentItem; - if (oldContentItem) { - disconnect(oldContentItem, &QQuickItem::baselineOffsetChanged, this, &QQuickControlPrivate::updateBaselineOffset); - removeImplicitSizeListener(oldContentItem); - } - + q->contentItemChange(item, contentItem); + delete contentItem; contentItem = item; - q->contentItemChange(item, oldContentItem); - delete oldContentItem; if (item) { - connect(contentItem.data(), &QQuickItem::baselineOffsetChanged, this, &QQuickControlPrivate::updateBaselineOffset); if (!item->parentItem()) item->setParentItem(q); if (componentComplete) resizeContent(); - addImplicitSizeListener(contentItem); } - updateImplicitContentSize(); - updateBaselineOffset(); - if (notify && !contentItem.isExecuting()) emit q->contentItemChanged(); } -qreal QQuickControlPrivate::getContentWidth() const -{ - return contentItem ? contentItem->implicitWidth() : 0; -} - -qreal QQuickControlPrivate::getContentHeight() const -{ - return contentItem ? contentItem->implicitHeight() : 0; -} - -void QQuickControlPrivate::updateImplicitContentWidth() -{ - Q_Q(QQuickControl); - const qreal oldWidth = implicitContentWidth; - implicitContentWidth = getContentWidth(); - if (!qFuzzyCompare(implicitContentWidth, oldWidth)) - emit q->implicitContentWidthChanged(); -} - -void QQuickControlPrivate::updateImplicitContentHeight() -{ - Q_Q(QQuickControl); - const qreal oldHeight = implicitContentHeight; - implicitContentHeight = getContentHeight(); - if (!qFuzzyCompare(implicitContentHeight, oldHeight)) - emit q->implicitContentHeightChanged(); -} - -void QQuickControlPrivate::updateImplicitContentSize() -{ - Q_Q(QQuickControl); - const qreal oldWidth = implicitContentWidth; - const qreal oldHeight = implicitContentHeight; - implicitContentWidth = getContentWidth(); - implicitContentHeight = getContentHeight(); - if (!qFuzzyCompare(implicitContentWidth, oldWidth)) - emit q->implicitContentWidthChanged(); - if (!qFuzzyCompare(implicitContentHeight, oldHeight)) - emit q->implicitContentHeightChanged(); -} - #if QT_CONFIG(accessibility) void QQuickControlPrivate::accessibilityActiveChanged(bool active) { @@ -492,11 +330,27 @@ return q->accessibleRole(); } -QQuickAccessibleAttached *QQuickControlPrivate::accessibleAttached(const QObject *object) +QAccessible::Role QQuickControl::accessibleRole() const +{ + return QAccessible::NoRole; +} + +void QQuickControl::accessibilityActiveChanged(bool active) { - if (!QAccessible::isActive()) - return nullptr; - return QQuickAccessibleAttached::attachedProperties(object); + Q_D(QQuickControl); + if (d->accessibleAttached || !active) + return; + + d->accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(this, true)); + + // QQuickControl relies on the existence of a QQuickAccessibleAttached object. + // However, qmlAttachedPropertiesObject(create=true) creates an instance only + // for items that have been created by a QML engine. Therefore we create the + // object by hand for items created in C++ (QQuickPopupItem, for instance). + if (!d->accessibleAttached) + d->accessibleAttached = new QQuickAccessibleAttached(this); + + d->accessibleAttached->setRole(accessibleRole()); } #endif @@ -525,7 +379,21 @@ if (QQuickApplicationWindow *window = qobject_cast(item->window())) return window->font(); - return QQuickTheme::font(QQuickTheme::System); + return themeFont(QPlatformTheme::SystemFont); +} + +QFont QQuickControlPrivate::themeFont(QPlatformTheme::Font type) +{ + if (QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) { + if (const QFont *font = theme->font(type)) { + QFont f = *font; + if (type == QPlatformTheme::SystemFont) + f.resolve(0); + return f; + } + } + + return QFont(); } /*! @@ -542,11 +410,11 @@ inheritFont(parentFont(q)); } -void QQuickControlPrivate::inheritFont(const QFont &font) +void QQuickControlPrivate::inheritFont(const QFont &f) { Q_Q(QQuickControl); - QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font; - parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve()); + QFont parentFont = extra.isAllocated() ? extra->font.resolve(f) : f; + parentFont.resolve(extra.isAllocated() ? extra->font.resolve() | f.resolve() : f.resolve()); const QFont defaultFont = q->defaultFont(); const QFont resolvedFont = parentFont.resolve(defaultFont); @@ -559,178 +427,35 @@ Assign \a font to this control, and propagate it to all children. */ -void QQuickControlPrivate::updateFont(const QFont &font) +void QQuickControlPrivate::updateFont(const QFont &f) { Q_Q(QQuickControl); - QFont oldFont = resolvedFont; - resolvedFont = font; + QFont old = resolvedFont; + resolvedFont = f; - if (oldFont != font) - q->fontChange(font, oldFont); + if (old != f) + q->fontChange(f, old); - QQuickControlPrivate::updateFontRecur(q, font); + QQuickControlPrivate::updateFontRecur(q, f); - if (oldFont != font) + if (old != f) emit q->fontChanged(); } -void QQuickControlPrivate::updateFontRecur(QQuickItem *item, const QFont &font) -{ - const auto childItems = item->childItems(); - for (QQuickItem *child : childItems) { - if (QQuickControl *control = qobject_cast(child)) - QQuickControlPrivate::get(control)->inheritFont(font); - else if (QQuickLabel *label = qobject_cast(child)) - QQuickLabelPrivate::get(label)->inheritFont(font); - else if (QQuickTextArea *textArea = qobject_cast(child)) - QQuickTextAreaPrivate::get(textArea)->inheritFont(font); - else if (QQuickTextField *textField = qobject_cast(child)) - QQuickTextFieldPrivate::get(textField)->inheritFont(font); - else - QQuickControlPrivate::updateFontRecur(child, font); - } -} - -/*! - \internal - - Returns the palette that the item inherits from its ancestors and - QGuiApplication::palette. -*/ -QPalette QQuickControlPrivate::parentPalette(const QQuickItem *item) -{ - QQuickItem *p = item->parentItem(); - while (p) { - if (QQuickControl *control = qobject_cast(p)) - return control->palette(); - else if (QQuickLabel *label = qobject_cast(p)) - return label->palette(); - else if (QQuickTextField *textField = qobject_cast(p)) - return textField->palette(); - else if (QQuickTextArea *textArea = qobject_cast(p)) - return textArea->palette(); - - p = p->parentItem(); - } - - if (QQuickApplicationWindow *window = qobject_cast(item->window())) - return window->palette(); - - return QQuickTheme::palette(QQuickTheme::System); -} - -/*! - \internal - - Determine which palette is implicitly imposed on this control by its ancestors - and QGuiApplication::palette, resolve this against its own palette (attributes from - the implicit palette are copied over). Then propagate this palette to this - control's children. -*/ -void QQuickControlPrivate::resolvePalette() -{ - Q_Q(QQuickControl); - inheritPalette(parentPalette(q)); -} - -void QQuickControlPrivate::inheritPalette(const QPalette &palette) -{ - Q_Q(QQuickControl); - QPalette parentPalette = extra.isAllocated() ? extra->requestedPalette.resolve(palette) : palette; - parentPalette.resolve(extra.isAllocated() ? extra->requestedPalette.resolve() | palette.resolve() : palette.resolve()); - - const QPalette defaultPalette = q->defaultPalette(); - const QPalette resolvedPalette = parentPalette.resolve(defaultPalette); - - setPalette_helper(resolvedPalette); -} - -/*! - \internal - - Assign \a palette to this control, and propagate it to all children. -*/ -void QQuickControlPrivate::updatePalette(const QPalette &palette) -{ - Q_Q(QQuickControl); - QPalette oldPalette = resolvedPalette; - resolvedPalette = palette; - - if (oldPalette != palette) - q->paletteChange(palette, oldPalette); - - QQuickControlPrivate::updatePaletteRecur(q, palette); - - if (oldPalette != palette) - emit q->paletteChanged(); -} - -void QQuickControlPrivate::updatePaletteRecur(QQuickItem *item, const QPalette &palette) +void QQuickControlPrivate::updateFontRecur(QQuickItem *item, const QFont &f) { const auto childItems = item->childItems(); for (QQuickItem *child : childItems) { if (QQuickControl *control = qobject_cast(child)) - QQuickControlPrivate::get(control)->inheritPalette(palette); + QQuickControlPrivate::get(control)->inheritFont(f); else if (QQuickLabel *label = qobject_cast(child)) - QQuickLabelPrivate::get(label)->inheritPalette(palette); + QQuickLabelPrivate::get(label)->inheritFont(f); else if (QQuickTextArea *textArea = qobject_cast(child)) - QQuickTextAreaPrivate::get(textArea)->inheritPalette(palette); + QQuickTextAreaPrivate::get(textArea)->inheritFont(f); else if (QQuickTextField *textField = qobject_cast(child)) - QQuickTextFieldPrivate::get(textField)->inheritPalette(palette); - else - QQuickControlPrivate::updatePaletteRecur(child, palette); - } -} - -QLocale QQuickControlPrivate::calcLocale(const QQuickItem *item) -{ - const QQuickItem *p = item; - while (p) { - if (const QQuickControl *control = qobject_cast(p)) - return control->locale(); - - QVariant v = p->property("locale"); - if (v.isValid() && v.userType() == QMetaType::QLocale) - return v.toLocale(); - - p = p->parentItem(); - } - - if (item) { - if (QQuickApplicationWindow *window = qobject_cast(item->window())) - return window->locale(); - } - - return QLocale(); -} - -void QQuickControlPrivate::updateLocale(const QLocale &l, bool e) -{ - Q_Q(QQuickControl); - if (!e && hasLocale) - return; - - QLocale old = q->locale(); - hasLocale = e; - if (old != l) { - bool wasMirrored = q->isMirrored(); - locale = l; - q->localeChange(l, old); - QQuickControlPrivate::updateLocaleRecur(q, l); - emit q->localeChanged(); - if (wasMirrored != q->isMirrored()) - q->mirrorChange(); - } -} - -void QQuickControlPrivate::updateLocaleRecur(QQuickItem *item, const QLocale &l) -{ - const auto childItems = item->childItems(); - for (QQuickItem *child : childItems) { - if (QQuickControl *control = qobject_cast(child)) - QQuickControlPrivate::get(control)->updateLocale(l, false); + QQuickTextFieldPrivate::get(textField)->inheritFont(f); else - updateLocaleRecur(child, l); + QQuickControlPrivate::updateFontRecur(child, f); } } @@ -792,148 +517,58 @@ } #endif -static inline QString contentItemName() { return QStringLiteral("contentItem"); } - -void QQuickControlPrivate::cancelContentItem() +QString QQuickControl::accessibleName() const { - Q_Q(QQuickControl); - quickCancelDeferred(q, contentItemName()); +#if QT_CONFIG(accessibility) + Q_D(const QQuickControl); + if (d->accessibleAttached) + return d->accessibleAttached->name(); +#endif + return QString(); } -void QQuickControlPrivate::executeContentItem(bool complete) +void QQuickControl::setAccessibleName(const QString &name) { - Q_Q(QQuickControl); - if (contentItem.wasExecuted()) - return; - - if (!contentItem || complete) - quickBeginDeferred(q, contentItemName(), contentItem); - if (complete) - quickCompleteDeferred(q, contentItemName(), contentItem); +#if QT_CONFIG(accessibility) + Q_D(QQuickControl); + if (d->accessibleAttached) + d->accessibleAttached->setName(name); +#else + Q_UNUSED(name) +#endif } -static inline QString backgroundName() { return QStringLiteral("background"); } - -void QQuickControlPrivate::cancelBackground() +QVariant QQuickControl::accessibleProperty(const char *propertyName) { - Q_Q(QQuickControl); - quickCancelDeferred(q, backgroundName()); +#if QT_CONFIG(accessibility) + Q_D(QQuickControl); + if (d->accessibleAttached) + return QQuickAccessibleAttached::property(this, propertyName); +#endif + Q_UNUSED(propertyName) + return QVariant(); } -void QQuickControlPrivate::executeBackground(bool complete) +bool QQuickControl::setAccessibleProperty(const char *propertyName, const QVariant &value) { - Q_Q(QQuickControl); - if (background.wasExecuted()) - return; - - if (!background || complete) - quickBeginDeferred(q, backgroundName(), background); - if (complete) - quickCompleteDeferred(q, backgroundName(), background); -} - -void QQuickControlPrivate::updateBaselineOffset() -{ - Q_Q(QQuickControl); - if (extra.isAllocated() && extra.value().hasBaselineOffset) - return; - - if (!contentItem) - q->QQuickItem::setBaselineOffset(0); - else - q->QQuickItem::setBaselineOffset(getTopPadding() + contentItem->baselineOffset()); -} - -void QQuickControlPrivate::addImplicitSizeListener(QQuickItem *item, ChangeTypes changes) -{ - addImplicitSizeListener(item, this, changes); -} - -void QQuickControlPrivate::removeImplicitSizeListener(QQuickItem *item, ChangeTypes changes) -{ - removeImplicitSizeListener(item, this, changes); -} - -void QQuickControlPrivate::addImplicitSizeListener(QQuickItem *item, QQuickItemChangeListener *listener, ChangeTypes changes) -{ - if (!item || !listener) - return; - QQuickItemPrivate::get(item)->addItemChangeListener(listener, changes); -} - -void QQuickControlPrivate::removeImplicitSizeListener(QQuickItem *item, QQuickItemChangeListener *listener, ChangeTypes changes) -{ - if (!item || !listener) - return; - QQuickItemPrivate::get(item)->removeItemChangeListener(listener, changes); -} - -void QQuickControlPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - Q_Q(QQuickControl); - if (item == background) - emit q->implicitBackgroundWidthChanged(); - else if (item == contentItem) - updateImplicitContentWidth(); -} - -void QQuickControlPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - Q_Q(QQuickControl); - if (item == background) - emit q->implicitBackgroundHeightChanged(); - else if (item == contentItem) - updateImplicitContentHeight(); -} - -void QQuickControlPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) -{ - Q_UNUSED(diff); - if (resizingBackground || item != background || !change.sizeChange()) - return; - - QQuickItemPrivate *p = QQuickItemPrivate::get(item); - // Only set hasBackgroundWidth/Height if it was a width/height change, - // otherwise we're prevented from setting a width/height in the future. - if (change.widthChange()) - extra.value().hasBackgroundWidth = p->widthValid; - if (change.heightChange()) - extra.value().hasBackgroundHeight = p->heightValid; - resizeBackground(); -} - -void QQuickControlPrivate::itemDestroyed(QQuickItem *item) -{ - Q_Q(QQuickControl); - if (item == background) { - background = nullptr; - emit q->implicitBackgroundWidthChanged(); - emit q->implicitBackgroundHeightChanged(); - } else if (item == contentItem) { - contentItem = nullptr; - updateImplicitContentSize(); - } +#if QT_CONFIG(accessibility) + Q_D(QQuickControl); + if (d->accessibleAttached) + return QQuickAccessibleAttached::setProperty(this, propertyName, value); +#endif + Q_UNUSED(propertyName) + Q_UNUSED(value) + return false; } QQuickControl::QQuickControl(QQuickItem *parent) : QQuickItem(*(new QQuickControlPrivate), parent) { - Q_D(QQuickControl); - d->init(); } QQuickControl::QQuickControl(QQuickControlPrivate &dd, QQuickItem *parent) : QQuickItem(dd, parent) { - Q_D(QQuickControl); - d->init(); -} - -QQuickControl::~QQuickControl() -{ - Q_D(QQuickControl); - d->removeImplicitSizeListener(d->background, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); - d->removeImplicitSizeListener(d->contentItem); } void QQuickControl::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value) @@ -941,10 +576,6 @@ Q_D(QQuickControl); QQuickItem::itemChange(change, value); switch (change) { - case ItemEnabledHasChanged: - emit paletteChanged(); - enabledChange(); - break; case ItemVisibleHasChanged: #if QT_CONFIG(quicktemplates2_hover) if (!value.boolValue) @@ -955,7 +586,6 @@ case ItemParentHasChanged: if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) { d->resolveFont(); - d->resolvePalette(); if (!d->hasLocale) d->updateLocale(QQuickControlPrivate::calcLocale(d->parentItem), false); // explicit=false #if QT_CONFIG(quicktemplates2_hover) @@ -985,14 +615,9 @@ The default font depends on the system environment. ApplicationWindow maintains a system/theme font which serves as a default for all controls. There may also be special font defaults for - certain types of controls. You can also set the default font for controls by either: - - \list - \li passing a custom font to QGuiApplication::setFont(), before loading the QML; or - \li specifying the fonts in the \l {Qt Quick Controls 2 Configuration File}{qtquickcontrols2.conf file}. - \endlist - - Finally, the font is matched against Qt's font database to find the best match. + certain types of controls. You can also set the default font for controls by passing a custom + font to QGuiApplication::setFont(), before loading the QML. Finally, the font is matched + against Qt's font database to find the best match. Control propagates explicit font properties from parent to children. If you change a specific property on a control's font, that property propagates to all of the control's children, @@ -1013,9 +638,6 @@ } } \endcode - - For the full list of available font properties, see the - \l [QtQuick]{font}{font QML Basic Type} documentation. */ QFont QQuickControl::font() const { @@ -1026,10 +648,10 @@ void QQuickControl::setFont(const QFont &font) { Q_D(QQuickControl); - if (d->extra.value().requestedFont.resolve() == font.resolve() && d->extra.value().requestedFont == font) + if (d->extra.value().font.resolve() == font.resolve() && d->extra.value().font == font) return; - d->extra.value().requestedFont = font; + d->extra.value().font = font; d->resolveFont(); } @@ -1083,26 +705,6 @@ \li \l {Control::}{bottomPadding} \endlist - \note Different styles may specify the default padding for certain controls - in different ways, and these ways may change over time as the design - guidelines that the style is based on evolve. To ensure that these changes - don't affect the padding values you have specified, it is best to use the - most specific properties available. For example, rather than setting - the \l padding property: - - \code - padding: 0 - \endcode - - set each specific property instead: - - \code - leftPadding: 0 - rightPadding: 0 - topPadding: 0 - bottomPadding: 0 - \endcode - \sa {Control Layout}, availableWidth, availableHeight, topPadding, leftPadding, rightPadding, bottomPadding */ qreal QQuickControl::padding() const @@ -1116,18 +718,10 @@ Q_D(QQuickControl); if (qFuzzyCompare(d->padding, padding)) return; - - const QMarginsF oldPadding = d->getPadding(); - const qreal oldVerticalPadding = d->getVerticalPadding(); - const qreal oldHorizontalPadding = d->getHorizontalPadding(); - + QMarginsF oldPadding(leftPadding(), topPadding(), rightPadding(), bottomPadding()); d->padding = padding; emit paddingChanged(); - - const QMarginsF newPadding = d->getPadding(); - const qreal newVerticalPadding = d->getVerticalPadding(); - const qreal newHorizontalPadding = d->getHorizontalPadding(); - + QMarginsF newPadding(leftPadding(), topPadding(), rightPadding(), bottomPadding()); if (!qFuzzyCompare(newPadding.top(), oldPadding.top())) emit topPaddingChanged(); if (!qFuzzyCompare(newPadding.left(), oldPadding.left())) @@ -1136,15 +730,10 @@ emit rightPaddingChanged(); if (!qFuzzyCompare(newPadding.bottom(), oldPadding.bottom())) emit bottomPaddingChanged(); - if (!qFuzzyCompare(newVerticalPadding, oldVerticalPadding)) - emit verticalPaddingChanged(); - if (!qFuzzyCompare(newHorizontalPadding, oldHorizontalPadding)) - emit horizontalPaddingChanged(); if (!qFuzzyCompare(newPadding.top(), oldPadding.top()) || !qFuzzyCompare(newPadding.bottom(), oldPadding.bottom())) emit availableHeightChanged(); if (!qFuzzyCompare(newPadding.left(), oldPadding.left()) || !qFuzzyCompare(newPadding.right(), oldPadding.right())) emit availableWidthChanged(); - paddingChange(newPadding, oldPadding); } @@ -1156,15 +745,16 @@ /*! \qmlproperty real QtQuick.Controls::Control::topPadding - This property holds the top padding. Unless explicitly set, the value - is equal to \c verticalPadding. + This property holds the top padding. - \sa {Control Layout}, padding, bottomPadding, verticalPadding, availableHeight + \sa {Control Layout}, padding, bottomPadding, availableHeight */ qreal QQuickControl::topPadding() const { Q_D(const QQuickControl); - return d->getTopPadding(); + if (d->hasTopPadding) + return d->topPadding; + return d->padding; } void QQuickControl::setTopPadding(qreal padding) @@ -1182,15 +772,16 @@ /*! \qmlproperty real QtQuick.Controls::Control::leftPadding - This property holds the left padding. Unless explicitly set, the value - is equal to \c horizontalPadding. + This property holds the left padding. - \sa {Control Layout}, padding, rightPadding, horizontalPadding, availableWidth + \sa {Control Layout}, padding, rightPadding, availableWidth */ qreal QQuickControl::leftPadding() const { Q_D(const QQuickControl); - return d->getLeftPadding(); + if (d->hasLeftPadding) + return d->leftPadding; + return d->padding; } void QQuickControl::setLeftPadding(qreal padding) @@ -1208,15 +799,16 @@ /*! \qmlproperty real QtQuick.Controls::Control::rightPadding - This property holds the right padding. Unless explicitly set, the value - is equal to \c horizontalPadding. + This property holds the right padding. - \sa {Control Layout}, padding, leftPadding, horizontalPadding, availableWidth + \sa {Control Layout}, padding, leftPadding, availableWidth */ qreal QQuickControl::rightPadding() const { Q_D(const QQuickControl); - return d->getRightPadding(); + if (d->hasRightPadding) + return d->rightPadding; + return d->padding; } void QQuickControl::setRightPadding(qreal padding) @@ -1234,15 +826,16 @@ /*! \qmlproperty real QtQuick.Controls::Control::bottomPadding - This property holds the bottom padding. Unless explicitly set, the value - is equal to \c verticalPadding. + This property holds the bottom padding. - \sa {Control Layout}, padding, topPadding, verticalPadding, availableHeight + \sa {Control Layout}, padding, topPadding, availableHeight */ qreal QQuickControl::bottomPadding() const { Q_D(const QQuickControl); - return d->getBottomPadding(); + if (d->hasBottomPadding) + return d->bottomPadding; + return d->padding; } void QQuickControl::setBottomPadding(qreal padding) @@ -1331,6 +924,98 @@ d->updateLocale(QQuickControlPrivate::calcLocale(d->parentItem), false); // explicit=false } +QLocale QQuickControlPrivate::calcLocale(const QQuickItem *item) +{ + const QQuickItem *p = item; + while (p) { + if (const QQuickControl *control = qobject_cast(p)) + return control->locale(); + + QVariant v = p->property("locale"); + if (v.isValid() && v.userType() == QMetaType::QLocale) + return v.toLocale(); + + p = p->parentItem(); + } + + if (item) { + if (QQuickApplicationWindow *window = qobject_cast(item->window())) + return window->locale(); + } + + return QLocale(); +} + +static inline QString contentItemName() { return QStringLiteral("contentItem"); } + +void QQuickControlPrivate::cancelContentItem() +{ + Q_Q(QQuickControl); + quickCancelDeferred(q, contentItemName()); +} + +void QQuickControlPrivate::executeContentItem(bool complete) +{ + Q_Q(QQuickControl); + if (contentItem.wasExecuted()) + return; + + if (!contentItem || complete) + quickBeginDeferred(q, contentItemName(), contentItem); + if (complete) + quickCompleteDeferred(q, contentItemName(), contentItem); +} + +static inline QString backgroundName() { return QStringLiteral("background"); } + +void QQuickControlPrivate::cancelBackground() +{ + Q_Q(QQuickControl); + quickCancelDeferred(q, backgroundName()); +} + +void QQuickControlPrivate::executeBackground(bool complete) +{ + Q_Q(QQuickControl); + if (background.wasExecuted()) + return; + + if (!background || complete) + quickBeginDeferred(q, backgroundName(), background); + if (complete) + quickCompleteDeferred(q, backgroundName(), background); +} + +void QQuickControlPrivate::updateLocale(const QLocale &l, bool e) +{ + Q_Q(QQuickControl); + if (!e && hasLocale) + return; + + QLocale old = q->locale(); + hasLocale = e; + if (old != l) { + bool wasMirrored = q->isMirrored(); + q->localeChange(l, old); + locale = l; + QQuickControlPrivate::updateLocaleRecur(q, l); + emit q->localeChanged(); + if (wasMirrored != q->isMirrored()) + q->mirrorChange(); + } +} + +void QQuickControlPrivate::updateLocaleRecur(QQuickItem *item, const QLocale &l) +{ + const auto childItems = item->childItems(); + for (QQuickItem *child : childItems) { + if (QQuickControl *control = qobject_cast(child)) + QQuickControlPrivate::get(control)->updateLocale(l, false); + else + updateLocaleRecur(child, l); + } +} + /*! \qmlproperty bool QtQuick.Controls::Control::mirrored \readonly @@ -1575,36 +1260,15 @@ if (!d->background.isExecuting()) d->cancelBackground(); - const qreal oldImplicitBackgroundWidth = implicitBackgroundWidth(); - const qreal oldImplicitBackgroundHeight = implicitBackgroundHeight(); - - if (d->extra.isAllocated()) { - d->extra.value().hasBackgroundWidth = false; - d->extra.value().hasBackgroundHeight = false; - } - - d->removeImplicitSizeListener(d->background, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); delete d->background; d->background = background; - if (background) { background->setParentItem(this); if (qFuzzyIsNull(background->z())) background->setZ(-1); - QQuickItemPrivate *p = QQuickItemPrivate::get(background); - if (p->widthValid || p->heightValid) { - d->extra.value().hasBackgroundWidth = p->widthValid; - d->extra.value().hasBackgroundHeight = p->heightValid; - } if (isComponentComplete()) d->resizeBackground(); - d->addImplicitSizeListener(background, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); } - - if (!qFuzzyCompare(oldImplicitBackgroundWidth, implicitBackgroundWidth())) - emit implicitBackgroundWidthChanged(); - if (!qFuzzyCompare(oldImplicitBackgroundHeight, implicitBackgroundHeight())) - emit implicitBackgroundHeightChanged(); if (!d->background.isExecuting()) emit backgroundChanged(); } @@ -1626,9 +1290,8 @@ } \endcode - \note The content item is automatically positioned and resized to fit - within the \l padding of the control. Bindings to the \l x, \l y, \l width, - and \l height properties of the contentItem are not respected. + \note The content item is automatically resized to fit within the + \l padding of the control. \note Most controls use the implicit size of the content item to calculate the implicit size of the control itself. If you replace the content item @@ -1652,377 +1315,11 @@ d->setContentItem_helper(item, true); } -qreal QQuickControl::baselineOffset() const -{ - Q_D(const QQuickControl); - return d->baselineOffset; -} - -void QQuickControl::setBaselineOffset(qreal offset) -{ - Q_D(QQuickControl); - d->extra.value().hasBaselineOffset = true; - QQuickItem::setBaselineOffset(offset); -} - -void QQuickControl::resetBaselineOffset() -{ - Q_D(QQuickControl); - if (!d->extra.isAllocated() || !d->extra.value().hasBaselineOffset) - return; - - if (d->extra.isAllocated()) - d->extra.value().hasBaselineOffset = false; - d->updateBaselineOffset(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty palette QtQuick.Controls::Control::palette - - This property holds the palette currently set for the control. - - This property describes the control's requested palette. The palette is used by the control's - style when rendering standard components, and is available as a means to ensure that custom - controls can maintain consistency with the native platform's native look and feel. It's common - that different platforms, or different styles, define different palettes for an application. - - The default palette depends on the system environment. ApplicationWindow maintains a system/theme - palette which serves as a default for all controls. There may also be special palette defaults for - certain types of controls. You can also set the default palette for controls by either: - - \list - \li passing a custom palette to QGuiApplication::setPalette(), before loading any QML; or - \li specifying the colors in the \l {Qt Quick Controls 2 Configuration File}{qtquickcontrols2.conf file}. - \endlist - - Control propagates explicit palette properties from parent to children. If you change a specific - property on a control's palette, that property propagates to all of the control's children, - overriding any system defaults for that property. - - \code - Page { - palette.text: "red" - - Column { - Label { - text: qsTr("This will use red color...") - } - - Switch { - text: qsTr("... and so will this") - } - } - } - \endcode - - For the full list of available palette colors, see the - \l {qtquickcontrols2-palette}{palette QML Basic Type} documentation. - - \sa ApplicationWindow::palette, Popup::palette -*/ -QPalette QQuickControl::palette() const -{ - Q_D(const QQuickControl); - QPalette palette = d->resolvedPalette; - if (!isEnabled()) - palette.setCurrentColorGroup(QPalette::Disabled); - return palette; -} - -void QQuickControl::setPalette(const QPalette &palette) -{ - Q_D(QQuickControl); - if (d->extra.value().requestedPalette.resolve() == palette.resolve() && d->extra.value().requestedPalette == palette) - return; - - d->extra.value().requestedPalette = palette; - d->resolvePalette(); -} - -void QQuickControl::resetPalette() -{ - setPalette(QPalette()); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Control::horizontalPadding - - This property holds the horizontal padding. Unless explicitly set, the value - is equal to \c padding. - - \sa {Control Layout}, padding, leftPadding, rightPadding, verticalPadding -*/ -qreal QQuickControl::horizontalPadding() const -{ - Q_D(const QQuickControl); - return d->getHorizontalPadding(); -} - -void QQuickControl::setHorizontalPadding(qreal padding) -{ - Q_D(QQuickControl); - d->setHorizontalPadding(padding); -} - -void QQuickControl::resetHorizontalPadding() -{ - Q_D(QQuickControl); - d->setHorizontalPadding(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Control::verticalPadding - - This property holds the vertical padding. Unless explicitly set, the value - is equal to \c padding. - - \sa {Control Layout}, padding, topPadding, bottomPadding, horizontalPadding -*/ -qreal QQuickControl::verticalPadding() const -{ - Q_D(const QQuickControl); - return d->getVerticalPadding(); -} - -void QQuickControl::setVerticalPadding(qreal padding) -{ - Q_D(QQuickControl); - d->setVerticalPadding(padding); -} - -void QQuickControl::resetVerticalPadding() -{ - Q_D(QQuickControl); - d->setVerticalPadding(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Control::implicitContentWidth - \readonly - - This property holds the implicit content width. - - For basic controls, the value is equal to \c {contentItem ? contentItem.implicitWidth : 0}. - For types that inherit Container or Pane, the value is calculated based on the content children. - - This is typically used, together with \l implicitBackgroundWidth, to calculate - the \l {Item::}{implicitWidth}: - - \code - Control { - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - } - \endcode - - \sa implicitContentHeight, implicitBackgroundWidth -*/ -qreal QQuickControl::implicitContentWidth() const -{ - Q_D(const QQuickControl); - return d->implicitContentWidth; -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Control::implicitContentHeight - \readonly - - This property holds the implicit content height. - - For basic controls, the value is equal to \c {contentItem ? contentItem.implicitHeight : 0}. - For types that inherit Container or Pane, the value is calculated based on the content children. - - This is typically used, together with \l implicitBackgroundHeight, to calculate - the \l {Item::}{implicitHeight}: - - \code - Control { - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - } - \endcode - - \sa implicitContentWidth, implicitBackgroundHeight -*/ -qreal QQuickControl::implicitContentHeight() const -{ - Q_D(const QQuickControl); - return d->implicitContentHeight; -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Control::implicitBackgroundWidth - \readonly - - This property holds the implicit background width. - - The value is equal to \c {background ? background.implicitWidth : 0}. - - This is typically used, together with \l implicitContentWidth, to calculate - the \l {Item::}{implicitWidth}: - - \code - Control { - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - } - \endcode - - \sa implicitBackgroundHeight, implicitContentWidth -*/ -qreal QQuickControl::implicitBackgroundWidth() const -{ - Q_D(const QQuickControl); - if (!d->background) - return 0; - return d->background->implicitWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Control::implicitBackgroundHeight - \readonly - - This property holds the implicit background height. - - The value is equal to \c {background ? background.implicitHeight : 0}. - - This is typically used, together with \l implicitContentHeight, to calculate - the \l {Item::}{implicitHeight}: - - \code - Control { - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - } - \endcode - - \sa implicitBackgroundWidth, implicitContentHeight -*/ -qreal QQuickControl::implicitBackgroundHeight() const -{ - Q_D(const QQuickControl); - if (!d->background) - return 0; - return d->background->implicitHeight(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Control::topInset - - This property holds the top inset for the background. - - \sa {Control Layout}, bottomInset -*/ -qreal QQuickControl::topInset() const -{ - Q_D(const QQuickControl); - return d->getTopInset(); -} - -void QQuickControl::setTopInset(qreal inset) -{ - Q_D(QQuickControl); - d->setTopInset(inset); -} - -void QQuickControl::resetTopInset() -{ - Q_D(QQuickControl); - d->setTopInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Control::leftInset - - This property holds the left inset for the background. - - \sa {Control Layout}, rightInset -*/ -qreal QQuickControl::leftInset() const -{ - Q_D(const QQuickControl); - return d->getLeftInset(); -} - -void QQuickControl::setLeftInset(qreal inset) -{ - Q_D(QQuickControl); - d->setLeftInset(inset); -} - -void QQuickControl::resetLeftInset() -{ - Q_D(QQuickControl); - d->setLeftInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Control::rightInset - - This property holds the right inset for the background. - - \sa {Control Layout}, leftInset -*/ -qreal QQuickControl::rightInset() const -{ - Q_D(const QQuickControl); - return d->getRightInset(); -} - -void QQuickControl::setRightInset(qreal inset) -{ - Q_D(QQuickControl); - d->setRightInset(inset); -} - -void QQuickControl::resetRightInset() -{ - Q_D(QQuickControl); - d->setRightInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Control::bottomInset - - This property holds the bottom inset for the background. - - \sa {Control Layout}, topInset -*/ -qreal QQuickControl::bottomInset() const -{ - Q_D(const QQuickControl); - return d->getBottomInset(); -} - -void QQuickControl::setBottomInset(qreal inset) -{ - Q_D(QQuickControl); - d->setBottomInset(inset); -} - -void QQuickControl::resetBottomInset() -{ - Q_D(QQuickControl); - d->setBottomInset(0, true); -} - void QQuickControl::classBegin() { Q_D(QQuickControl); QQuickItem::classBegin(); d->resolveFont(); - d->resolvePalette(); } void QQuickControl::componentComplete() @@ -2033,7 +1330,6 @@ QQuickItem::componentComplete(); d->resizeBackground(); d->resizeContent(); - d->updateBaselineOffset(); if (!d->hasLocale) d->locale = QQuickControlPrivate::calcLocale(d->parentItem); #if QT_CONFIG(quicktemplates2_hover) @@ -2041,19 +1337,14 @@ setAcceptHoverEvents(QQuickControlPrivate::calcHoverEnabled(d->parentItem)); #endif #if QT_CONFIG(accessibility) - if (QAccessible::isActive()) + if (!d->accessibleAttached && QAccessible::isActive()) accessibilityActiveChanged(true); #endif } QFont QQuickControl::defaultFont() const { - return QQuickTheme::font(QQuickTheme::System); -} - -QPalette QQuickControl::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::System); + return QQuickControlPrivate::themeFont(QPlatformTheme::SystemFont); } void QQuickControl::focusInEvent(QFocusEvent *event) @@ -2186,10 +1477,6 @@ emit availableHeightChanged(); } -void QQuickControl::enabledChange() -{ -} - void QQuickControl::fontChange(const QFont &newFont, const QFont &oldFont) { Q_UNUSED(newFont); @@ -2219,7 +1506,6 @@ Q_UNUSED(newPadding); Q_UNUSED(oldPadding); d->resizeContent(); - d->updateBaselineOffset(); } void QQuickControl::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) @@ -2234,75 +1520,4 @@ Q_UNUSED(oldLocale); } -void QQuickControl::paletteChange(const QPalette &newPalette, const QPalette &oldPalette) -{ - Q_UNUSED(newPalette); - Q_UNUSED(oldPalette); -} - -void QQuickControl::insetChange(const QMarginsF &newInset, const QMarginsF &oldInset) -{ - Q_D(QQuickControl); - Q_UNUSED(newInset); - Q_UNUSED(oldInset); - d->resizeBackground(); -} - -#if QT_CONFIG(accessibility) -QAccessible::Role QQuickControl::accessibleRole() const -{ - return QAccessible::NoRole; -} - -void QQuickControl::accessibilityActiveChanged(bool active) -{ - if (!active) - return; - - QQuickAccessibleAttached *accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(this, true)); - Q_ASSERT(accessibleAttached); - accessibleAttached->setRole(accessibleRole()); -} -#endif - -QString QQuickControl::accessibleName() const -{ -#if QT_CONFIG(accessibility) - if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(this)) - return accessibleAttached->name(); -#endif - return QString(); -} - -void QQuickControl::setAccessibleName(const QString &name) -{ -#if QT_CONFIG(accessibility) - if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(this)) - accessibleAttached->setName(name); -#else - Q_UNUSED(name) -#endif -} - -QVariant QQuickControl::accessibleProperty(const char *propertyName) -{ -#if QT_CONFIG(accessibility) - if (QAccessible::isActive()) - return QQuickAccessibleAttached::property(this, propertyName); -#endif - Q_UNUSED(propertyName) - return QVariant(); -} - -bool QQuickControl::setAccessibleProperty(const char *propertyName, const QVariant &value) -{ -#if QT_CONFIG(accessibility) - if (QAccessible::isActive()) - return QQuickAccessibleAttached::setProperty(this, propertyName, value); -#endif - Q_UNUSED(propertyName) - Q_UNUSED(value) - return false; -} - QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontrol_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontrol_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontrol_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontrol_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -49,7 +49,6 @@ // #include -#include #include #include @@ -79,25 +78,10 @@ Q_PROPERTY(bool wheelEnabled READ isWheelEnabled WRITE setWheelEnabled NOTIFY wheelEnabledChanged FINAL) Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL) - Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset RESET resetBaselineOffset NOTIFY baselineOffsetChanged FINAL) - // 2.3 (Qt 5.10) - Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal horizontalPadding READ horizontalPadding WRITE setHorizontalPadding RESET resetHorizontalPadding NOTIFY horizontalPaddingChanged FINAL REVISION 5) - Q_PROPERTY(qreal verticalPadding READ verticalPadding WRITE setVerticalPadding RESET resetVerticalPadding NOTIFY verticalPaddingChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitContentWidth READ implicitContentWidth NOTIFY implicitContentWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitContentHeight READ implicitContentHeight NOTIFY implicitContentHeightChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitBackgroundWidth READ implicitBackgroundWidth NOTIFY implicitBackgroundWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitBackgroundHeight READ implicitBackgroundHeight NOTIFY implicitBackgroundHeightChanged FINAL REVISION 5) - Q_PROPERTY(qreal topInset READ topInset WRITE setTopInset RESET resetTopInset NOTIFY topInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal leftInset READ leftInset WRITE setLeftInset RESET resetLeftInset NOTIFY leftInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal rightInset READ rightInset WRITE setRightInset RESET resetRightInset NOTIFY rightInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal bottomInset READ bottomInset WRITE setBottomInset RESET resetBottomInset NOTIFY bottomInsetChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "background,contentItem") public: explicit QQuickControl(QQuickItem *parent = nullptr); - ~QQuickControl(); QFont font() const; void setFont(const QFont &font); @@ -160,46 +144,6 @@ QQuickItem *contentItem() const; void setContentItem(QQuickItem *item); - qreal baselineOffset() const; - void setBaselineOffset(qreal offset); - void resetBaselineOffset(); - - // 2.3 (Qt 5.10) - QPalette palette() const; - void setPalette(const QPalette &palette); - void resetPalette(); - - // 2.5 (Qt 5.12) - qreal horizontalPadding() const; - void setHorizontalPadding(qreal padding); - void resetHorizontalPadding(); - - qreal verticalPadding() const; - void setVerticalPadding(qreal padding); - void resetVerticalPadding(); - - qreal implicitContentWidth() const; - qreal implicitContentHeight() const; - - qreal implicitBackgroundWidth() const; - qreal implicitBackgroundHeight() const; - - qreal topInset() const; - void setTopInset(qreal inset); - void resetTopInset(); - - qreal leftInset() const; - void setLeftInset(qreal inset); - void resetLeftInset(); - - qreal rightInset() const; - void setRightInset(qreal inset); - void resetRightInset(); - - qreal bottomInset() const; - void setBottomInset(qreal inset); - void resetBottomInset(); - Q_SIGNALS: void fontChanged(); void availableWidthChanged(); @@ -220,24 +164,9 @@ void wheelEnabledChanged(); void backgroundChanged(); void contentItemChanged(); - void baselineOffsetChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void paletteChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void horizontalPaddingChanged(); - Q_REVISION(5) void verticalPaddingChanged(); - Q_REVISION(5) void implicitContentWidthChanged(); - Q_REVISION(5) void implicitContentHeightChanged(); - Q_REVISION(5) void implicitBackgroundWidthChanged(); - Q_REVISION(5) void implicitBackgroundHeightChanged(); - Q_REVISION(5) void topInsetChanged(); - Q_REVISION(5) void leftInsetChanged(); - Q_REVISION(5) void rightInsetChanged(); - Q_REVISION(5) void bottomInsetChanged(); protected: virtual QFont defaultFont() const; - virtual QPalette defaultPalette() const; QQuickControl(QQuickControlPrivate &dd, QQuickItem *parent); @@ -276,13 +205,10 @@ virtual void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding); virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem); virtual void localeChange(const QLocale &newLocale, const QLocale &oldLocale); - virtual void paletteChange(const QPalette &newPalette, const QPalette &oldPalette); - virtual void insetChange(const QMarginsF &newInset, const QMarginsF &oldInset); - virtual void enabledChange(); #if QT_CONFIG(accessibility) - virtual QAccessible::Role accessibleRole() const; virtual void accessibilityActiveChanged(bool active); + virtual QAccessible::Role accessibleRole() const; #endif // helper functions which avoid to check QT_CONFIG(accessibility) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontrol_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontrol_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickcontrol_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickcontrol_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,13 +48,12 @@ // We mean it. // -#include -#include -#include +#include "qquickcontrol_p.h" +#include "qquickdeferredpointer_p_p.h" #include -#include #include +#include #if QT_CONFIG(accessibility) #include @@ -64,7 +63,7 @@ class QQuickAccessibleAttached; -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControlPrivate : public QQuickItemPrivate, public QQuickItemChangeListener +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControlPrivate : public QQuickItemPrivate #if QT_CONFIG(accessibility) , public QAccessible::ActivationObserver #endif @@ -73,15 +72,13 @@ public: QQuickControlPrivate(); - ~QQuickControlPrivate(); + virtual ~QQuickControlPrivate(); static QQuickControlPrivate *get(QQuickControl *control) { return control->d_func(); } - void init(); - #if QT_CONFIG(quicktemplates2_multitouch) virtual bool acceptTouch(const QTouchEvent::TouchPoint &point); #endif @@ -92,31 +89,10 @@ void mirrorChange() override; - inline QMarginsF getPadding() const { return QMarginsF(getLeftPadding(), getTopPadding(), getRightPadding(), getBottomPadding()); } - inline qreal getTopPadding() const { return extra.isAllocated() && extra->hasTopPadding ? extra->topPadding : getVerticalPadding(); } - inline qreal getLeftPadding() const { return extra.isAllocated() && extra->hasLeftPadding ? extra->leftPadding : getHorizontalPadding(); } - inline qreal getRightPadding() const { return extra.isAllocated() && extra->hasRightPadding ? extra->rightPadding : getHorizontalPadding(); } - inline qreal getBottomPadding() const { return extra.isAllocated() && extra->hasBottomPadding ? extra->bottomPadding : getVerticalPadding(); } - inline qreal getHorizontalPadding() const { return hasHorizontalPadding ? horizontalPadding : padding; } - inline qreal getVerticalPadding() const { return hasVerticalPadding ? verticalPadding : padding; } - void setTopPadding(qreal value, bool reset = false); void setLeftPadding(qreal value, bool reset = false); void setRightPadding(qreal value, bool reset = false); void setBottomPadding(qreal value, bool reset = false); - void setHorizontalPadding(qreal value, bool reset = false); - void setVerticalPadding(qreal value, bool reset = false); - - inline QMarginsF getInset() const { return QMarginsF(getLeftInset(), getTopInset(), getRightInset(), getBottomInset()); } - inline qreal getTopInset() const { return extra.isAllocated() ? extra->topInset : 0; } - inline qreal getLeftInset() const { return extra.isAllocated() ? extra->leftInset : 0; } - inline qreal getRightInset() const { return extra.isAllocated() ? extra->rightInset : 0; } - inline qreal getBottomInset() const { return extra.isAllocated() ? extra->bottomInset : 0; } - - void setTopInset(qreal value, bool reset = false); - void setLeftInset(qreal value, bool reset = false); - void setRightInset(qreal value, bool reset = false); - void setBottomInset(qreal value, bool reset = false); void resizeBackground(); virtual void resizeContent(); @@ -127,30 +103,19 @@ #if QT_CONFIG(accessibility) void accessibilityActiveChanged(bool active) override; QAccessible::Role accessibleRole() const override; - static QQuickAccessibleAttached *accessibleAttached(const QObject *object); #endif - virtual void resolveFont(); - void inheritFont(const QFont &font); - void updateFont(const QFont &font); - static void updateFontRecur(QQuickItem *item, const QFont &font); - inline void setFont_helper(const QFont &font) { - if (resolvedFont.resolve() == font.resolve() && resolvedFont == font) + void updateFont(const QFont &f); + static void updateFontRecur(QQuickItem *item, const QFont &f); + inline void setFont_helper(const QFont &f) { + if (resolvedFont.resolve() == f.resolve() && resolvedFont == f) return; - updateFont(font); + updateFont(f); } + virtual void resolveFont(); + void inheritFont(const QFont &f); static QFont parentFont(const QQuickItem *item); - - virtual void resolvePalette(); - void inheritPalette(const QPalette &palette); - void updatePalette(const QPalette &palette); - static void updatePaletteRecur(QQuickItem *item, const QPalette &palette); - inline void setPalette_helper(const QPalette &palette) { - if (resolvedPalette.resolve() == palette.resolve() && resolvedPalette == palette) - return; - updatePalette(palette); - } - static QPalette parentPalette(const QQuickItem *item); + static QFont themeFont(QPlatformTheme::Font type); void updateLocale(const QLocale &l, bool e); static void updateLocaleRecur(QQuickItem *item, const QLocale &l); @@ -168,76 +133,36 @@ virtual void cancelBackground(); virtual void executeBackground(bool complete = false); - void updateBaselineOffset(); - - static const ChangeTypes ImplicitSizeChanges; - - void addImplicitSizeListener(QQuickItem *item, ChangeTypes changes = ImplicitSizeChanges); - void removeImplicitSizeListener(QQuickItem *item, ChangeTypes changes = ImplicitSizeChanges); - - static void addImplicitSizeListener(QQuickItem *item, QQuickItemChangeListener *listener, ChangeTypes changes = ImplicitSizeChanges); - static void removeImplicitSizeListener(QQuickItem *item, QQuickItemChangeListener *listener, ChangeTypes changes = ImplicitSizeChanges); - - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) override; - void itemDestroyed(QQuickItem *item) override; - - virtual qreal getContentWidth() const; - virtual qreal getContentHeight() const; - - void updateImplicitContentWidth(); - void updateImplicitContentHeight(); - void updateImplicitContentSize(); - struct ExtraData { - bool hasTopPadding = false; - bool hasLeftPadding = false; - bool hasRightPadding = false; - bool hasBottomPadding = false; - bool hasBaselineOffset = false; - bool hasTopInset = false; - bool hasLeftInset = false; - bool hasRightInset = false; - bool hasBottomInset = false; - bool hasBackgroundWidth = false; - bool hasBackgroundHeight = false; - qreal topPadding = 0; - qreal leftPadding = 0; - qreal rightPadding = 0; - qreal bottomPadding = 0; - qreal topInset = 0; - qreal leftInset = 0; - qreal rightInset = 0; - qreal bottomInset = 0; - QFont requestedFont; - QPalette requestedPalette; + ExtraData(); + QFont font; }; QLazilyAllocated extra; - bool hasHorizontalPadding = false; - bool hasVerticalPadding = false; - bool hasLocale = false; - bool wheelEnabled = false; + QFont resolvedFont; + bool hasTopPadding; + bool hasLeftPadding; + bool hasRightPadding; + bool hasBottomPadding; + bool hasLocale; + bool wheelEnabled; #if QT_CONFIG(quicktemplates2_hover) - bool hovered = false; - bool explicitHoverEnabled = false; + bool hovered; + bool explicitHoverEnabled; #endif - bool resizingBackground = false; - int touchId = -1; - qreal padding = 0; - qreal horizontalPadding = 0; - qreal verticalPadding = 0; - qreal implicitContentWidth = 0; - qreal implicitContentHeight = 0; - qreal spacing = 0; + int touchId; + qreal padding; + qreal topPadding; + qreal leftPadding; + qreal rightPadding; + qreal bottomPadding; + qreal spacing; QLocale locale; - QFont resolvedFont; - QPalette resolvedPalette; - Qt::FocusPolicy focusPolicy = Qt::NoFocus; - Qt::FocusReason focusReason = Qt::OtherFocusReason; + Qt::FocusPolicy focusPolicy; + Qt::FocusReason focusReason; QQuickDeferredPointer background; QQuickDeferredPointer contentItem; + QQuickAccessibleAttached *accessibleAttached; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdeferredexecute.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdeferredexecute.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdeferredexecute.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdeferredexecute.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -55,8 +55,9 @@ Q_GLOBAL_STATIC(DeferredStates, deferredStates) -static void cancelDeferred(QQmlData *ddata, int propertyIndex) +static void cancelDeferred(QObject *object, int propertyIndex) { + QQmlData *ddata = QQmlData::get(object); auto dit = ddata->deferredData.rbegin(); while (dit != ddata->deferredData.rend()) { (*dit)->bindings.remove(propertyIndex); @@ -76,9 +77,8 @@ for (auto dit = ddata->deferredData.rbegin(); dit != ddata->deferredData.rend(); ++dit) { QQmlData::DeferredData *deferData = *dit; - auto bindings = deferData->bindings; - auto range = bindings.equal_range(propertyIndex); - if (range.first == bindings.end()) + auto range = deferData->bindings.equal_range(propertyIndex); + if (range.first == deferData->bindings.end()) continue; QQmlComponentPrivate::ConstructionState *state = new QQmlComponentPrivate::ConstructionState; @@ -102,7 +102,7 @@ // Cleanup any remaining deferred bindings for this property, also in inner contexts, // to avoid executing them later and overriding the property that was just populated. - cancelDeferred(ddata, propertyIndex); + cancelDeferred(object, propertyIndex); break; } @@ -128,9 +128,7 @@ void cancelDeferred(QObject *object, const QString &property) { - QQmlData *data = QQmlData::get(object); - if (data) - cancelDeferred(data, QQmlProperty(object, property).index()); + cancelDeferred(object, QQmlProperty(object, property).index()); } void completeDeferred(QObject *object, const QString &property) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdeferredexecute_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdeferredexecute_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdeferredexecute_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdeferredexecute_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -51,8 +51,6 @@ #include #include -#include - QT_BEGIN_NAMESPACE class QString; @@ -67,9 +65,6 @@ template void quickBeginDeferred(QObject *object, const QString &property, QQuickDeferredPointer &delegate) { - if (!QQmlVME::componentCompleteEnabled()) - return; - delegate.setExecuting(true); QtQuickPrivate::beginDeferred(object, property); delegate.setExecuting(false); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdeferredpointer_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdeferredpointer_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdeferredpointer_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdeferredpointer_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -79,7 +79,7 @@ inline QQuickDeferredPointer &operator=(const QQuickDeferredPointer &o); private: - quintptr ptr_value = 0; + quintptr ptr_value; static const quintptr WasExecutedBit = 0x1; static const quintptr IsExecutingBit = 0x2; @@ -88,6 +88,7 @@ template QQuickDeferredPointer::QQuickDeferredPointer() +: ptr_value(0) { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdelaybutton.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdelaybutton.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdelaybutton.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdelaybutton.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -80,13 +80,15 @@ Q_DECLARE_PUBLIC(QQuickDelayButton) public: + QQuickDelayButtonPrivate(); + void beginTransition(qreal to); void finishTransition(); void cancelTransition(); - int delay = 300; - qreal progress = 0.0; - QQuickTransition *transition = nullptr; + int delay; + qreal progress; + QQuickTransition *transition; QScopedPointer transitionManager; }; @@ -101,7 +103,7 @@ void finished() override; private: - QQuickDelayButton *m_button = nullptr; + QQuickDelayButton *m_button; }; void QQuickDelayTransitionManager::transition(QQuickTransition *transition, qreal progress) @@ -127,6 +129,13 @@ emit m_button->activated(); } +QQuickDelayButtonPrivate::QQuickDelayButtonPrivate() + : delay(3000), + progress(0.0), + transition(nullptr) +{ +} + void QQuickDelayButtonPrivate::beginTransition(qreal to) { Q_Q(QQuickDelayButton); @@ -256,12 +265,7 @@ QFont QQuickDelayButton::defaultFont() const { - return QQuickTheme::font(QQuickTheme::Button); -} - -QPalette QQuickDelayButton::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::Button); + return QQuickControlPrivate::themeFont(QPlatformTheme::PushButtonFont); } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdelaybutton_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdelaybutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdelaybutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdelaybutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -85,7 +85,6 @@ void nextCheckState() override; QFont defaultFont() const override; - QPalette defaultPalette() const override; private: Q_DISABLE_COPY(QQuickDelayButton) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdial.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdial.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdial.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdial.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -75,8 +75,6 @@ \row \li Set \l value to \l to \li \c Qt.Key_End \endtable - \include qquickdial.qdocinc inputMode - \sa {Customizing Dial}, {Input Controls} */ @@ -98,15 +96,27 @@ Q_DECLARE_PUBLIC(QQuickDial) public: + QQuickDialPrivate() + : from(0), + to(1), + value(0), + position(0), + angle(startAngle), + stepSize(0), + pressed(false), + snapMode(QQuickDial::NoSnap), + wrap(false), + live(true), + handle(nullptr) + { + } + qreal valueAt(qreal position) const; qreal snapPosition(qreal position) const; qreal positionAt(const QPointF &point) const; - qreal circularPositionAt(const QPointF &point) const; - qreal linearPositionAt(const QPointF &point) const; void setPosition(qreal position); void updatePosition(); bool isLargeChange(const QPointF &eventPos, qreal proposedPosition) const; - bool isHorizontalOrVertical() const; void handlePress(const QPointF &point) override; void handleMove(const QPointF &point) override; @@ -116,19 +126,17 @@ void cancelHandle(); void executeHandle(bool complete = false); - qreal from = 0; - qreal to = 1; - qreal value = 0; - qreal position = 0; - qreal angle = startAngle; - qreal stepSize = 0; - bool pressed = false; + qreal from; + qreal to; + qreal value; + qreal position; + qreal angle; + qreal stepSize; + bool pressed; QPointF pressPoint; - qreal positionBeforePress = 0; - QQuickDial::SnapMode snapMode = QQuickDial::NoSnap; - QQuickDial::InputMode inputMode = QQuickDial::Circular; - bool wrap = false; - bool live = true; + QQuickDial::SnapMode snapMode; + bool wrap; + bool live; QQuickDeferredPointer handle; }; @@ -152,11 +160,6 @@ qreal QQuickDialPrivate::positionAt(const QPointF &point) const { - return inputMode == QQuickDial::Circular ? circularPositionAt(point) : linearPositionAt(point); -} - -qreal QQuickDialPrivate::circularPositionAt(const QPointF &point) const -{ qreal yy = height / 2.0 - point.y(); qreal xx = point.x() - width / 2.0; qreal angle = (xx || yy) ? std::atan2(yy, xx) : 0; @@ -168,36 +171,10 @@ return normalizedAngle; } -qreal QQuickDialPrivate::linearPositionAt(const QPointF &point) const -{ - // This value determines the range (either horizontal or vertical) - // within which the dial can be dragged. - // The larger this value is, the further the drag distance - // must be to go from a position of e.g. 0.0 to 1.0. - qreal dragArea = 0; - - // The linear input mode uses a "relative" input system, - // where the distance from the press point is used to calculate - // the change in position. Moving the mouse above the press - // point increases the position (when inputMode is Vertical), - // and vice versa. This prevents the dial from jumping when clicked. - qreal dragDistance = 0; - - if (inputMode == QQuickDial::Horizontal) { - dragArea = width * 2; - dragDistance = pressPoint.x() - point.x(); - } else { - dragArea = height * 2; - dragDistance = point.y() - pressPoint.y(); - } - const qreal normalisedDifference = dragDistance / dragArea; - return qBound(qreal(0), positionBeforePress - normalisedDifference, qreal(1)); -} - void QQuickDialPrivate::setPosition(qreal pos) { Q_Q(QQuickDial); - pos = qBound(qreal(0), pos, qreal(1)); + pos = qBound(0.0, pos, 1.0); if (qFuzzyCompare(position, pos)) return; @@ -219,12 +196,7 @@ bool QQuickDialPrivate::isLargeChange(const QPointF &eventPos, qreal proposedPosition) const { - return qAbs(proposedPosition - position) >= qreal(0.5) && eventPos.y() >= height / 2; -} - -bool QQuickDialPrivate::isHorizontalOrVertical() const -{ - return inputMode == QQuickDial::Horizontal || inputMode == QQuickDial::Vertical; + return qAbs(proposedPosition - position) >= 0.5 && eventPos.y() >= height / 2; } void QQuickDialPrivate::handlePress(const QPointF &point) @@ -232,7 +204,6 @@ Q_Q(QQuickDial); QQuickControlPrivate::handlePress(point); pressPoint = point; - positionBeforePress = position; q->setPressed(true); } @@ -245,7 +216,7 @@ if (snapMode == QQuickDial::SnapAlways) pos = snapPosition(pos); - if (wrap || (!wrap && (isHorizontalOrVertical() || !isLargeChange(point, pos)))) { + if (wrap || (!wrap && !isLargeChange(point, pos))) { if (live) q->setValue(valueAt(pos)); else @@ -265,7 +236,7 @@ if (snapMode != QQuickDial::NoSnap) pos = snapPosition(pos); - if (wrap || (!wrap && (isHorizontalOrVertical() || !isLargeChange(point, pos)))) + if (wrap || (!wrap && !isLargeChange(point, pos))) q->setValue(valueAt(pos)); if (!qFuzzyCompare(pos, oldPos)) emit q->moved(); @@ -276,7 +247,6 @@ q->setPressed(false); pressPoint = QPointF(); - positionBeforePress = 0; } void QQuickDialPrivate::handleUngrab() @@ -284,7 +254,6 @@ Q_Q(QQuickDial); QQuickControlPrivate::handleUngrab(); pressPoint = QPointF(); - positionBeforePress = 0; q->setPressed(false); } @@ -500,32 +469,6 @@ } /*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty enumeration QtQuick.Controls::Dial::inputMode - - This property holds the input mode. - - \include qquickdial.qdocinc inputMode - - The default value is \c Dial.Circular. -*/ -QQuickDial::InputMode QQuickDial::inputMode() const -{ - Q_D(const QQuickDial); - return d->inputMode; -} - -void QQuickDial::setInputMode(QQuickDial::InputMode mode) -{ - Q_D(QQuickDial); - if (d->inputMode == mode) - return; - - d->inputMode = mode; - emit inputModeChanged(); -} - -/*! \qmlproperty bool QtQuick.Controls::Dial::wrap This property holds whether the dial wraps when dragged. @@ -736,7 +679,21 @@ Q_D(QQuickDial); QQuickControl::mousePressEvent(event); d->handleMove(event->localPos()); - setKeepMouseGrab(true); +} + +void QQuickDial::mouseMoveEvent(QMouseEvent *event) +{ + Q_D(QQuickDial); + if (!keepMouseGrab()) { + bool overXDragThreshold = QQuickWindowPrivate::dragOverThreshold(event->localPos().x() - d->pressPoint.x(), Qt::XAxis, event); + setKeepMouseGrab(overXDragThreshold); + + if (!overXDragThreshold) { + bool overYDragThreshold = QQuickWindowPrivate::dragOverThreshold(event->localPos().y() - d->pressPoint.y(), Qt::YAxis, event); + setKeepMouseGrab(overYDragThreshold); + } + } + QQuickControl::mouseMoveEvent(event); } #if QT_CONFIG(quicktemplates2_multitouch) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialogbuttonbox.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialogbuttonbox.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialogbuttonbox.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialogbuttonbox.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -38,7 +38,6 @@ #include "qquickdialogbuttonbox_p_p.h" #include "qquickabstractbutton_p.h" #include "qquickbutton_p.h" -#include "qquickdialog_p_p.h" #include #include @@ -97,33 +96,9 @@ You can also mix and match normal buttons and standard buttons. When a button is clicked in the button box, the \l clicked() signal is - emitted for the actual button that is pressed. In addition, the - following signals are automatically emitted when a button with the - respective role(s) is pressed: - - \table - \header - \li Role - \li Signal - \row - \li \c AcceptRole, \c YesRole - \li \l accepted() - \row - \li \c ApplyRole - \li \l applied() - \row - \li \c DiscardRole - \li \l discarded() - \row - \li \c HelpRole - \li \l helpRequested() - \row - \li \c RejectRole, \c NoRole - \li \l rejected() - \row - \li \c ResetRole - \li \l reset() - \endtable + emitted for the actual button that is pressed. For convenience, if the + button has an \c AcceptRole, \c RejectRole, or \c HelpRole, the \l accepted(), + \l rejected(), or \l helpRequested() signals are emitted respectively. \sa Dialog */ @@ -147,36 +122,6 @@ */ /*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlsignal QtQuick.Controls::DialogButtonBox::applied() - - This signal is emitted when a button defined with the \c ApplyRole is - clicked. - - \sa discarded(), reset() -*/ - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlsignal QtQuick.Controls::DialogButtonBox::reset() - - This signal is emitted when a button defined with the \c ResetRole is - clicked. - - \sa discarded(), applied() -*/ - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlsignal QtQuick.Controls::DialogButtonBox::discarded() - - This signal is emitted when a button defined with the \c DiscardRole is - clicked. - - \sa reset(), applied() -*/ - -/*! \qmlsignal QtQuick.Controls::DialogButtonBox::helpRequested() This signal is emitted when a button defined with the \c HelpRole is clicked. @@ -192,27 +137,30 @@ \sa accepted(), rejected(), helpRequested() */ -static QPlatformDialogHelper::ButtonLayout platformButtonLayout() +static QPlatformDialogHelper::ButtonRole buttonRole(QQuickAbstractButton *button) +{ + const QQuickDialogButtonBoxAttached *attached = qobject_cast(qmlAttachedPropertiesObject(button, false)); + return attached ? attached->buttonRole() : QPlatformDialogHelper::InvalidRole; +} + +QQuickDialogButtonBoxPrivate::QQuickDialogButtonBoxPrivate() + : alignment(0), + position(QQuickDialogButtonBox::Footer), + standardButtons(QPlatformDialogHelper::NoButton), + delegate(nullptr) { - return QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::DialogButtonBoxLayout).value(); } void QQuickDialogButtonBoxPrivate::itemImplicitWidthChanged(QQuickItem *item) { - QQuickContainerPrivate::itemImplicitWidthChanged(item); - if (item == contentItem) - resizeContent(); - else - updateImplicitContentWidth(); + Q_UNUSED(item); + resizeContent(); } void QQuickDialogButtonBoxPrivate::itemImplicitHeightChanged(QQuickItem *item) { - QQuickContainerPrivate::itemImplicitHeightChanged(item); - if (item == contentItem) - resizeContent(); - else - updateImplicitContentHeight(); + Q_UNUSED(item); + resizeContent(); } // adapted from QStyle::alignedRect() @@ -223,7 +171,7 @@ qreal y = rectangle.y(); qreal w = size.width(); qreal h = size.height(); - if ((alignment & Qt::AlignVCenter) == Qt::AlignVCenter || (alignment & Qt::AlignVertical_Mask) == 0) + if ((alignment & Qt::AlignVCenter) == Qt::AlignVCenter) y += (rectangle.size().height() - h) / 2; else if ((alignment & Qt::AlignBottom) == Qt::AlignBottom) y += rectangle.size().height() - h; @@ -241,8 +189,11 @@ return; QRectF geometry = q->boundingRect().adjusted(q->leftPadding(), q->topPadding(), -q->rightPadding(), -q->bottomPadding()); - if (alignment != 0) - geometry = alignedRect(q->isMirrored() ? Qt::RightToLeft : Qt::LeftToRight, alignment, QSizeF(contentWidth, contentHeight), geometry); + if (alignment != 0) { + qreal cw = (alignment & Qt::AlignHorizontal_Mask) == 0 ? q->availableWidth() : contentItem->implicitWidth(); + qreal ch = (alignment & Qt::AlignVertical_Mask) == 0 ? q->availableHeight() : contentItem->implicitHeight(); + geometry = alignedRect(q->isMirrored() ? Qt::RightToLeft : Qt::LeftToRight, alignment, QSizeF(cw, ch), geometry); + } contentItem->setPosition(geometry.topLeft()); contentItem->setSize(geometry.size()); @@ -259,8 +210,8 @@ const int valign = alignment & Qt::AlignVertical_Mask; QVector buttons; - const qreal cw = (alignment & Qt::AlignHorizontal_Mask) == 0 ? q->availableWidth() : contentWidth; - const qreal itemWidth = (cw - qMax(0, count - 1) * spacing) / count; + const qreal maxItemWidth = ((contentItem ? contentItem->width() : q->availableWidth()) - qMax(0, count - 1) * spacing) / count; + const qreal maxItemHeight = contentItem ? contentItem->height() : q->availableHeight(); for (int i = 0; i < count; ++i) { QQuickItem *item = q->itemAt(i); @@ -268,11 +219,11 @@ QQuickItemPrivate *p = QQuickItemPrivate::get(item); if (!p->widthValid) { if (!halign) - item->setWidth(itemWidth); + item->setWidth(maxItemWidth); else item->resetWidth(); if (!valign) - item->setHeight(contentHeight); + item->setHeight(maxItemHeight); else item->resetHeight(); p->widthValid = false; @@ -282,20 +233,14 @@ } struct ButtonLayout { - ButtonLayout(QPlatformDialogHelper::ButtonLayout layout) - : m_layout(QPlatformDialogHelper::buttonLayout(Qt::Horizontal, layout)) - { - } - bool operator()(QQuickAbstractButton *first, QQuickAbstractButton *second) { - const QPlatformDialogHelper::ButtonRole firstRole = QQuickDialogPrivate::buttonRole(first); - const QPlatformDialogHelper::ButtonRole secondRole = QQuickDialogPrivate::buttonRole(second); + const QPlatformDialogHelper::ButtonRole firstRole = buttonRole(first); + const QPlatformDialogHelper::ButtonRole secondRole = buttonRole(second); if (firstRole != secondRole && firstRole != QPlatformDialogHelper::InvalidRole && secondRole != QPlatformDialogHelper::InvalidRole) { const int *l = m_layout; while (*l != QPlatformDialogHelper::EOL) { - // Unset the Reverse flag. const int role = (*l & ~QPlatformDialogHelper::Reverse); if (role == firstRole) return true; @@ -306,51 +251,24 @@ } if (firstRole == secondRole) - return false; + return first < second; return firstRole != QPlatformDialogHelper::InvalidRole; } - const int *m_layout; + static const int *themeButtonLayout() + { + const int hint = QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::DialogButtonBoxLayout).toInt(); + return QPlatformDialogHelper::buttonLayout(Qt::Horizontal, static_cast(hint)); + } + const int *m_layout = themeButtonLayout(); }; - std::stable_sort(buttons.begin(), buttons.end(), ButtonLayout(static_cast(buttonLayout))); + std::sort(buttons.begin(), buttons.end(), ButtonLayout()); for (int i = 0; i < buttons.count() - 1; ++i) q->insertItem(i, buttons.at(i)); } -qreal QQuickDialogButtonBoxPrivate::getContentWidth() const -{ - Q_Q(const QQuickDialogButtonBox); - const int count = contentModel->count(); - const qreal totalSpacing = qMax(0, count - 1) * spacing; - qreal totalWidth = totalSpacing; - qreal maxWidth = 0; - for (int i = 0; i < count; ++i) { - QQuickItem *item = q->itemAt(i); - if (item) { - totalWidth += item->implicitWidth(); - maxWidth = qMax(maxWidth, item->implicitWidth()); - } - } - if ((alignment & Qt::AlignHorizontal_Mask) == 0) - totalWidth = qMax(totalWidth, count * maxWidth + totalSpacing); - return totalWidth; -} - -qreal QQuickDialogButtonBoxPrivate::getContentHeight() const -{ - Q_Q(const QQuickDialogButtonBox); - const int count = contentModel->count(); - qreal maxHeight = 0; - for (int i = 0; i < count; ++i) { - QQuickItem *item = q->itemAt(i); - if (item) - maxHeight = qMax(maxHeight, item->implicitHeight()); - } - return maxHeight; -} - void QQuickDialogButtonBoxPrivate::handleClick() { Q_Q(QQuickDialogButtonBox); @@ -362,7 +280,7 @@ // or change its role. Now changing the role is not possible yet, but arguably // both clicked and accepted/rejected/etc. should be emitted "atomically" // depending on whatever role the button had at the time of the click. - const QPlatformDialogHelper::ButtonRole role = QQuickDialogPrivate::buttonRole(button); + const QPlatformDialogHelper::ButtonRole role = buttonRole(button); QPointer guard(q); emit q->clicked(button); @@ -379,15 +297,6 @@ case QPlatformDialogHelper::NoRole: emit q->rejected(); break; - case QPlatformDialogHelper::ApplyRole: - emit q->applied(); - break; - case QPlatformDialogHelper::ResetRole: - emit q->reset(); - break; - case QPlatformDialogHelper::DestructiveRole: - emit q->discarded(); - break; case QPlatformDialogHelper::HelpRole: emit q->helpRequested(); break; @@ -446,9 +355,6 @@ QQuickDialogButtonBox::QQuickDialogButtonBox(QQuickItem *parent) : QQuickContainer(*(new QQuickDialogButtonBoxPrivate), parent) { - Q_D(QQuickDialogButtonBox); - d->changeTypes |= QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight; - d->buttonLayout = platformButtonLayout(); } QQuickDialogButtonBox::~QQuickDialogButtonBox() @@ -640,43 +546,6 @@ return new QQuickDialogButtonBoxAttached(object); } -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty enumeration QtQuick.Controls::DialogButtonBox::buttonLayout - - This property holds the button layout policy to be used when arranging the buttons contained in the button box. - The default value is platform-specific. - - Available values: - \value DialogButtonBox.WinLayout Use a policy appropriate for applications on Windows. - \value DialogButtonBox.MacLayout Use a policy appropriate for applications on macOS. - \value DialogButtonBox.KdeLayout Use a policy appropriate for applications on KDE. - \value DialogButtonBox.GnomeLayout Use a policy appropriate for applications on GNOME. - \value DialogButtonBox.AndroidLayout Use a policy appropriate for applications on Android. -*/ -QPlatformDialogHelper::ButtonLayout QQuickDialogButtonBox::buttonLayout() const -{ - Q_D(const QQuickDialogButtonBox); - return d->buttonLayout; -} - -void QQuickDialogButtonBox::setButtonLayout(QPlatformDialogHelper::ButtonLayout layout) -{ - Q_D(QQuickDialogButtonBox); - if (d->buttonLayout == layout) - return; - - d->buttonLayout = layout; - if (isComponentComplete()) - d->updateLayout(); - emit buttonLayoutChanged(); -} - -void QQuickDialogButtonBox::resetButtonLayout() -{ - setButtonLayout(platformButtonLayout()); -} - void QQuickDialogButtonBox::updatePolish() { Q_D(QQuickDialogButtonBox); @@ -721,7 +590,6 @@ QObjectPrivate::connect(button, &QQuickAbstractButton::clicked, d, &QQuickDialogButtonBoxPrivate::handleClick); if (QQuickDialogButtonBoxAttached *attached = qobject_cast(qmlAttachedPropertiesObject(item, false))) QQuickDialogButtonBoxAttachedPrivate::get(attached)->setButtonBox(this); - d->updateImplicitContentSize(); if (isComponentComplete()) polish(); } @@ -734,7 +602,6 @@ QObjectPrivate::disconnect(button, &QQuickAbstractButton::clicked, d, &QQuickDialogButtonBoxPrivate::handleClick); if (QQuickDialogButtonBoxAttached *attached = qobject_cast(qmlAttachedPropertiesObject(item, false))) QQuickDialogButtonBoxAttachedPrivate::get(attached)->setButtonBox(nullptr); - d->updateImplicitContentSize(); if (isComponentComplete()) polish(); } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialogbuttonbox_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialogbuttonbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialogbuttonbox_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialogbuttonbox_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -66,8 +66,6 @@ Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment RESET resetAlignment NOTIFY alignmentChanged FINAL) Q_PROPERTY(QPlatformDialogHelper::StandardButtons standardButtons READ standardButtons WRITE setStandardButtons NOTIFY standardButtonsChanged FINAL) Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) - // 2.5 (Qt 5.12) - Q_PROPERTY(QPlatformDialogHelper::ButtonLayout buttonLayout READ buttonLayout WRITE setButtonLayout RESET resetButtonLayout NOTIFY buttonLayoutChanged FINAL REVISION 5) Q_FLAGS(QPlatformDialogHelper::StandardButtons) public: @@ -96,28 +94,16 @@ static QQuickDialogButtonBoxAttached *qmlAttachedProperties(QObject *object); - // 2.5 (Qt 5.12) - Q_ENUMS(QPlatformDialogHelper::ButtonLayout) - - QPlatformDialogHelper::ButtonLayout buttonLayout() const; - void setButtonLayout(QPlatformDialogHelper::ButtonLayout layout); - void resetButtonLayout(); - Q_SIGNALS: void accepted(); void rejected(); void helpRequested(); void clicked(QQuickAbstractButton *button); + void positionChanged(); void alignmentChanged(); void standardButtonsChanged(); void delegateChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void applied(); - Q_REVISION(3) void reset(); - Q_REVISION(3) void discarded(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void buttonLayoutChanged(); protected: void updatePolish() override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialogbuttonbox_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialogbuttonbox_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialogbuttonbox_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialogbuttonbox_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -58,6 +58,8 @@ Q_DECLARE_PUBLIC(QQuickDialogButtonBox) public: + QQuickDialogButtonBoxPrivate(); + static QQuickDialogButtonBoxPrivate *get(QQuickDialogButtonBox *box) { return box->d_func(); @@ -67,22 +69,16 @@ void itemImplicitHeightChanged(QQuickItem *item) override; void resizeContent() override; - void updateLayout(); - - qreal getContentWidth() const override; - qreal getContentHeight() const override; - void handleClick(); QQuickAbstractButton *createStandardButton(QPlatformDialogHelper::StandardButton button); void removeStandardButtons(); - Qt::Alignment alignment = 0; - QQuickDialogButtonBox::Position position = QQuickDialogButtonBox::Footer; - QPlatformDialogHelper::StandardButtons standardButtons = QPlatformDialogHelper::NoButton; - QPlatformDialogHelper::ButtonLayout buttonLayout = QPlatformDialogHelper::UnknownLayout; - QQmlComponent *delegate = nullptr; + Qt::Alignment alignment; + QQuickDialogButtonBox::Position position; + QPlatformDialogHelper::StandardButtons standardButtons; + QQmlComponent *delegate; }; class QQuickDialogButtonBoxAttachedPrivate : public QObjectPrivate @@ -90,6 +86,13 @@ Q_DECLARE_PUBLIC(QQuickDialogButtonBoxAttached) public: + QQuickDialogButtonBoxAttachedPrivate() + : buttonBox(nullptr), + buttonRole(QPlatformDialogHelper::InvalidRole), + standardButton(QPlatformDialogHelper::NoButton) + { + } + static QQuickDialogButtonBoxAttachedPrivate *get(QQuickDialogButtonBoxAttached *q) { return q->d_func(); @@ -97,9 +100,9 @@ void setButtonBox(QQuickDialogButtonBox *box); - QQuickDialogButtonBox *buttonBox = nullptr; - QPlatformDialogHelper::ButtonRole buttonRole = QPlatformDialogHelper::InvalidRole; - QPlatformDialogHelper::StandardButton standardButton = QPlatformDialogHelper::NoButton; + QQuickDialogButtonBox *buttonBox; + QPlatformDialogHelper::ButtonRole buttonRole; + QPlatformDialogHelper::StandardButton standardButton; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialog.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialog.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialog.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialog.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -37,7 +37,6 @@ #include "qquickdialog_p.h" #include "qquickdialog_p_p.h" #include "qquickdialogbuttonbox_p.h" -#include "qquickabstractbutton_p.h" #include "qquickpopupitem_p_p.h" QT_BEGIN_NAMESPACE @@ -116,80 +115,11 @@ \sa accepted() */ -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlsignal QtQuick.Controls::Dialog::applied() - - This signal is emitted when the \c Dialog.Apply standard button is clicked. - - \sa discarded(), reset() -*/ - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlsignal QtQuick.Controls::Dialog::reset() - - This signal is emitted when the \c Dialog.Reset standard button is clicked. - - \sa discarded(), applied() -*/ - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlsignal QtQuick.Controls::Dialog::discarded() - - This signal is emitted when the \c Dialog.Discard standard button is clicked. - - \sa reset(), applied() -*/ - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlsignal QtQuick.Controls::Dialog::helpRequested() - - This signal is emitted when the \c Dialog.Help standard button is clicked. - - \sa accepted(), rejected() -*/ - -QPlatformDialogHelper::ButtonRole QQuickDialogPrivate::buttonRole(QQuickAbstractButton *button) -{ - const QQuickDialogButtonBoxAttached *attached = qobject_cast(qmlAttachedPropertiesObject(button, false)); - return attached ? attached->buttonRole() : QPlatformDialogHelper::InvalidRole; -} - -void QQuickDialogPrivate::handleClick(QQuickAbstractButton *button) -{ - Q_Q(QQuickDialog); - switch (buttonRole(button)) { - case QPlatformDialogHelper::ApplyRole: - emit q->applied(); - break; - case QPlatformDialogHelper::ResetRole: - emit q->reset(); - break; - case QPlatformDialogHelper::DestructiveRole: - emit q->discarded(); - break; - case QPlatformDialogHelper::HelpRole: - emit q->helpRequested(); - break; - default: - break; - } -} - QQuickDialog::QQuickDialog(QObject *parent) : QQuickPopup(*(new QQuickDialogPrivate), parent) { Q_D(QQuickDialog); - connect(d->popupItem, &QQuickPopupItem::titleChanged, this, &QQuickDialog::titleChanged); - connect(d->popupItem, &QQuickPopupItem::headerChanged, this, &QQuickDialog::headerChanged); - connect(d->popupItem, &QQuickPopupItem::footerChanged, this, &QQuickDialog::footerChanged); - connect(d->popupItem, &QQuickPopupItem::implicitHeaderWidthChanged, this, &QQuickDialog::implicitHeaderWidthChanged); - connect(d->popupItem, &QQuickPopupItem::implicitHeaderHeightChanged, this, &QQuickDialog::implicitHeaderHeightChanged); - connect(d->popupItem, &QQuickPopupItem::implicitFooterWidthChanged, this, &QQuickDialog::implicitFooterWidthChanged); - connect(d->popupItem, &QQuickPopupItem::implicitFooterHeightChanged, this, &QQuickDialog::implicitFooterHeightChanged); + d->layout.reset(new QQuickPageLayout(d->popupItem)); } /*! @@ -212,14 +142,18 @@ QString QQuickDialog::title() const { Q_D(const QQuickDialog); - return d->popupItem->title(); + return d->title; } void QQuickDialog::setTitle(const QString &title) { Q_D(QQuickDialog); - d->popupItem->setTitle(title); + if (d->title == title) + return; + + d->title = title; setAccessibleName(title); + emit titleChanged(); } /*! @@ -241,33 +175,32 @@ QQuickItem *QQuickDialog::header() const { Q_D(const QQuickDialog); - return d->popupItem->header(); + return d->layout->header(); } void QQuickDialog::setHeader(QQuickItem *header) { Q_D(QQuickDialog); - QQuickItem *oldHeader = d->popupItem->header(); - if (oldHeader == header) + QQuickItem *oldHeader = d->layout->header(); + if (!d->layout->setHeader(header)) return; if (QQuickDialogButtonBox *buttonBox = qobject_cast(oldHeader)) { disconnect(buttonBox, &QQuickDialogButtonBox::accepted, this, &QQuickDialog::accept); disconnect(buttonBox, &QQuickDialogButtonBox::rejected, this, &QQuickDialog::reject); - QObjectPrivate::disconnect(buttonBox, &QQuickDialogButtonBox::clicked, d, &QQuickDialogPrivate::handleClick); if (d->buttonBox == buttonBox) d->buttonBox = nullptr; } - if (QQuickDialogButtonBox *buttonBox = qobject_cast(header)) { connect(buttonBox, &QQuickDialogButtonBox::accepted, this, &QQuickDialog::accept); connect(buttonBox, &QQuickDialogButtonBox::rejected, this, &QQuickDialog::reject); - QObjectPrivate::connect(buttonBox, &QQuickDialogButtonBox::clicked, d, &QQuickDialogPrivate::handleClick); d->buttonBox = buttonBox; buttonBox->setStandardButtons(d->standardButtons); } - d->popupItem->setHeader(header); + if (isComponentComplete()) + d->layout->update(); + emit headerChanged(); } /*! @@ -289,32 +222,32 @@ QQuickItem *QQuickDialog::footer() const { Q_D(const QQuickDialog); - return d->popupItem->footer(); + return d->layout->footer(); } void QQuickDialog::setFooter(QQuickItem *footer) { Q_D(QQuickDialog); - QQuickItem *oldFooter = d->popupItem->footer(); - if (oldFooter == footer) + QQuickItem *oldFooter = d->layout->footer(); + if (!d->layout->setFooter(footer)) return; if (QQuickDialogButtonBox *buttonBox = qobject_cast(oldFooter)) { disconnect(buttonBox, &QQuickDialogButtonBox::accepted, this, &QQuickDialog::accept); disconnect(buttonBox, &QQuickDialogButtonBox::rejected, this, &QQuickDialog::reject); - QObjectPrivate::disconnect(buttonBox, &QQuickDialogButtonBox::clicked, d, &QQuickDialogPrivate::handleClick); if (d->buttonBox == buttonBox) d->buttonBox = nullptr; } if (QQuickDialogButtonBox *buttonBox = qobject_cast(footer)) { connect(buttonBox, &QQuickDialogButtonBox::accepted, this, &QQuickDialog::accept); connect(buttonBox, &QQuickDialogButtonBox::rejected, this, &QQuickDialog::reject); - QObjectPrivate::connect(buttonBox, &QQuickDialogButtonBox::clicked, d, &QQuickDialogPrivate::handleClick); d->buttonBox = buttonBox; buttonBox->setStandardButtons(d->standardButtons); } - d->popupItem->setFooter(footer); + if (isComponentComplete()) + d->layout->update(); + emit footerChanged(); } /*! @@ -368,127 +301,16 @@ } /*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod AbstractButton QtQuick.Controls::Dialog::standardButton(StandardButton button) - - Returns the specified standard \a button, or \c null if it does not exist. - - \sa standardButtons -*/ -QQuickAbstractButton *QQuickDialog::standardButton(QPlatformDialogHelper::StandardButton button) const -{ - Q_D(const QQuickDialog); - if (!d->buttonBox) - return nullptr; - return d->buttonBox->standardButton(button); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty int QtQuick.Controls::Dialog::result - - This property holds the result code. - - Standard result codes: - \value Dialog.Accepted The dialog was accepted. - \value Dialog.Rejected The dialog was rejected. - - \sa accept(), reject(), done() -*/ -int QQuickDialog::result() const -{ - Q_D(const QQuickDialog); - return d->result; -} - -void QQuickDialog::setResult(int result) -{ - Q_D(QQuickDialog); - if (d->result == result) - return; - - d->result = result; - emit resultChanged(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Dialog::implicitHeaderWidth - \readonly - - This property holds the implicit header width. - - The value is equal to \c {header && header.visible ? header.implicitWidth : 0}. - - \sa implicitHeaderHeight, implicitFooterWidth -*/ -qreal QQuickDialog::implicitHeaderWidth() const -{ - Q_D(const QQuickDialog); - return d->popupItem->implicitHeaderWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Dialog::implicitHeaderHeight - \readonly - - This property holds the implicit header height. - - The value is equal to \c {header && header.visible ? header.implicitHeight : 0}. - - \sa implicitHeaderWidth, implicitFooterHeight -*/ -qreal QQuickDialog::implicitHeaderHeight() const -{ - Q_D(const QQuickDialog); - return d->popupItem->implicitHeaderHeight(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Dialog::implicitFooterWidth - \readonly - - This property holds the implicit footer width. - - The value is equal to \c {footer && footer.visible ? footer.implicitWidth : 0}. - - \sa implicitFooterHeight, implicitHeaderWidth -*/ -qreal QQuickDialog::implicitFooterWidth() const -{ - Q_D(const QQuickDialog); - return d->popupItem->implicitFooterWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Dialog::implicitFooterHeight - \readonly - - This property holds the implicit footer height. - - The value is equal to \c {footer && footer.visible ? footer.implicitHeight : 0}. - - \sa implicitFooterWidth, implicitHeaderHeight -*/ -qreal QQuickDialog::implicitFooterHeight() const -{ - Q_D(const QQuickDialog); - return d->popupItem->implicitFooterHeight(); -} - -/*! \qmlmethod void QtQuick.Controls::Dialog::accept() Closes the dialog and emits the \l accepted() signal. - \sa reject(), done() + \sa reject() */ void QQuickDialog::accept() { - done(Accepted); + close(); + emit accepted(); } /*! @@ -496,32 +318,33 @@ Closes the dialog and emits the \l rejected() signal. - \sa accept(), done() + \sa accept() */ void QQuickDialog::reject() { - done(Rejected); + close(); + emit rejected(); } -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Dialog::done(int result) - - Closes the dialog, sets the \a result, and emits \l accepted() or - \l rejected() depending on whether the result is \c Dialog.Accepted - or \c Dialog.Rejected, respectively. +void QQuickDialog::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +{ + Q_D(QQuickDialog); + QQuickPopup::geometryChanged(newGeometry, oldGeometry); + d->layout->update(); +} - \sa accept(), reject(), result -*/ -void QQuickDialog::done(int result) +void QQuickDialog::paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) { - close(); - setResult(result); + Q_D(QQuickDialog); + QQuickPopup::paddingChange(newPadding, oldPadding); + d->layout->update(); +} - if (result == Accepted) - emit accepted(); - else if (result == Rejected) - emit rejected(); +void QQuickDialog::spacingChange(qreal newSpacing, qreal oldSpacing) +{ + Q_D(QQuickDialog); + QQuickPopup::spacingChange(newSpacing, oldSpacing); + d->layout->update(); } #if QT_CONFIG(accessibility) @@ -536,7 +359,7 @@ QQuickPopup::accessibilityActiveChanged(active); if (active) - setAccessibleName(d->popupItem->title()); + setAccessibleName(d->title); } #endif diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialog_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialog_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialog_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialog_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE class QQuickDialogPrivate; -class QQuickAbstractButton; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialog : public QQuickPopup { @@ -63,14 +62,7 @@ Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) Q_PROPERTY(QPlatformDialogHelper::StandardButtons standardButtons READ standardButtons WRITE setStandardButtons NOTIFY standardButtonsChanged FINAL) - // 2.3 (Qt 5.10) - Q_PROPERTY(int result READ result WRITE setResult NOTIFY resultChanged FINAL REVISION 3) Q_FLAGS(QPlatformDialogHelper::StandardButtons) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal implicitHeaderWidth READ implicitHeaderWidth NOTIFY implicitHeaderWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitHeaderHeight READ implicitHeaderHeight NOTIFY implicitHeaderHeightChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitFooterWidth READ implicitFooterWidth NOTIFY implicitFooterWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitFooterHeight READ implicitFooterHeight NOTIFY implicitFooterHeightChanged FINAL REVISION 5) public: explicit QQuickDialog(QObject *parent = nullptr); @@ -86,47 +78,25 @@ QPlatformDialogHelper::StandardButtons standardButtons() const; void setStandardButtons(QPlatformDialogHelper::StandardButtons buttons); - Q_REVISION(3) Q_INVOKABLE QQuickAbstractButton *standardButton(QPlatformDialogHelper::StandardButton button) const; - - // 2.3 (Qt 5.10) - enum StandardCode { Rejected, Accepted }; - Q_ENUM(StandardCode) - - int result() const; - void setResult(int result); - - // 2.5 (Qt 5.12) - qreal implicitHeaderWidth() const; - qreal implicitHeaderHeight() const; - - qreal implicitFooterWidth() const; - qreal implicitFooterHeight() const; public Q_SLOTS: - virtual void accept(); - virtual void reject(); - virtual void done(int result); + void accept(); + void reject(); Q_SIGNALS: void accepted(); void rejected(); + void titleChanged(); void headerChanged(); void footerChanged(); void standardButtonsChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void applied(); - Q_REVISION(3) void reset(); - Q_REVISION(3) void discarded(); - Q_REVISION(3) void helpRequested(); - Q_REVISION(3) void resultChanged(); - // 2.5 (Qt 5.12) - void implicitHeaderWidthChanged(); - void implicitHeaderHeightChanged(); - void implicitFooterWidthChanged(); - void implicitFooterHeightChanged(); protected: + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; + void spacingChange(qreal newSpacing, qreal oldSpacing) override; + #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; void accessibilityActiveChanged(bool active) override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialog_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialog_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdialog_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdialog_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,13 +48,11 @@ // We mean it. // -#include #include -#include +#include QT_BEGIN_NAMESPACE -class QQuickAbstractButton; class QQuickDialogButtonBox; class QQuickDialogPrivate : public QQuickPopupPrivate @@ -62,19 +60,17 @@ Q_DECLARE_PUBLIC(QQuickDialog) public: + QQuickDialogPrivate() : buttonBox(nullptr) { } + static QQuickDialogPrivate *get(QQuickDialog *dialog) { return dialog->d_func(); } - static QPlatformDialogHelper::ButtonRole buttonRole(QQuickAbstractButton *button); - - void handleClick(QQuickAbstractButton *button); - - int result = 0; QString title; - QQuickDialogButtonBox *buttonBox = nullptr; - QPlatformDialogHelper::StandardButtons standardButtons = QPlatformDialogHelper::NoButton; + QQuickDialogButtonBox *buttonBox; + QScopedPointer layout; + QPlatformDialogHelper::StandardButtons standardButtons; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdial_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdial_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdial_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdial_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -72,8 +72,6 @@ Q_PROPERTY(QQuickItem *handle READ handle WRITE setHandle NOTIFY handleChanged FINAL) // 2.2 (Qt 5.9) Q_PROPERTY(bool live READ live WRITE setLive NOTIFY liveChanged FINAL REVISION 2) - // 2.5 (Qt 5.12) - Q_PROPERTY(InputMode inputMode READ inputMode WRITE setInputMode NOTIFY inputModeChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "background,handle") public: @@ -105,13 +103,6 @@ SnapMode snapMode() const; void setSnapMode(SnapMode mode); - enum InputMode { - Circular, - Horizontal, - Vertical, - }; - Q_ENUM(InputMode) - bool wrap() const; void setWrap(bool wrap); @@ -125,10 +116,6 @@ bool live() const; void setLive(bool live); - // 2.5 (Qt 5.12) - InputMode inputMode() const; - void setInputMode(InputMode mode); - public Q_SLOTS: void increase(); void decrease(); @@ -147,13 +134,12 @@ // 2.2 (Qt 5.9) Q_REVISION(2) void moved(); Q_REVISION(2) void liveChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void inputModeChanged(); protected: void keyPressEvent(QKeyEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override; void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; #if QT_CONFIG(quicktemplates2_multitouch) void touchEvent(QTouchEvent *event) override; #endif diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdrawer.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdrawer.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdrawer.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdrawer.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -37,7 +37,6 @@ #include "qquickdrawer_p.h" #include "qquickdrawer_p_p.h" #include "qquickpopupitem_p_p.h" -#include "qquickpopuppositioner_p_p.h" #include #include @@ -68,9 +67,9 @@ drawer is then opened by \e "dragging" it out from the left edge of the window. - \code \QtMinorVersion - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 + \code + import QtQuick 2.7 + import QtQuick.Controls 2.0 ApplicationWindow { id: window @@ -98,9 +97,9 @@ Drawer can be configured to cover only part of its window edge. The following example illustrates how Drawer can be positioned to appear below a window header: - \code \QtMinorVersion - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 + \code + import QtQuick 2.7 + import QtQuick.Controls 2.0 ApplicationWindow { id: window @@ -124,9 +123,9 @@ In the image above, the application's contents are \e "pushed" across the screen. This is achieved by applying a translation to the contents: - \code \QtMinorVersion - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 + \code + import QtQuick 2.7 + import QtQuick.Controls 2.1 ApplicationWindow { id: window @@ -172,13 +171,14 @@ \sa SwipeView, {Customizing Drawer}, {Navigation Controls}, {Popup Controls} */ -class QQuickDrawerPositioner : public QQuickPopupPositioner +QQuickDrawerPrivate::QQuickDrawerPrivate() + : edge(Qt::LeftEdge), + offset(0), + position(0), + dragMargin(QGuiApplication::styleHints()->startDragDistance()) { -public: - QQuickDrawerPositioner(QQuickDrawer *drawer) : QQuickPopupPositioner(drawer) { } - - void reposition() override; -}; + setEdge(Qt::LeftEdge); +} qreal QQuickDrawerPrivate::offsetAt(const QPointF &point) const { @@ -212,27 +212,14 @@ } } -QQuickPopupPositioner *QQuickDrawerPrivate::getPositioner() +void QQuickDrawerPrivate::reposition() { Q_Q(QQuickDrawer); - if (!positioner) - positioner = new QQuickDrawerPositioner(q); - return positioner; -} - -void QQuickDrawerPositioner::reposition() -{ - if (m_positioning) - return; - - QQuickDrawer *drawer = static_cast(popup()); - QQuickWindow *window = drawer->window(); + QQuickWindow *window = q->window(); if (!window) return; - const qreal position = drawer->position(); - QQuickItem *popupItem = drawer->popupItem(); - switch (drawer->edge()) { + switch (edge) { case Qt::LeftEdge: popupItem->setX((position - 1.0) * popupItem->width()); break; @@ -247,17 +234,7 @@ break; } - QQuickPopupPositioner::reposition(); -} - -void QQuickDrawerPrivate::showOverlay() -{ - // managed in setPosition() -} - -void QQuickDrawerPrivate::hideOverlay() -{ - // managed in setPosition() + QQuickPopupPrivate::reposition(); } void QQuickDrawerPrivate::resizeOverlay() @@ -332,17 +309,12 @@ return false; } -static inline bool keepGrab(QQuickItem *item) -{ - return item->keepMouseGrab() || item->keepTouchGrab(); -} - bool QQuickDrawerPrivate::grabMouse(QQuickItem *item, QMouseEvent *event) { Q_Q(QQuickDrawer); handleMouseEvent(item, event); - if (!window || !interactive || keepGrab(popupItem) || keepGrab(item)) + if (!window || !interactive || popupItem->keepMouseGrab() || popupItem->keepTouchGrab()) return false; const QPointF movePoint = event->windowPos(); @@ -370,9 +342,12 @@ } if (overThreshold) { - popupItem->grabMouse(); - popupItem->setKeepMouseGrab(true); - offset = offsetAt(movePoint); + QQuickItem *grabber = window->mouseGrabberItem(); + if (!grabber || !grabber->keepMouseGrab()) { + popupItem->grabMouse(); + popupItem->setKeepMouseGrab(true); + offset = offsetAt(movePoint); + } } return overThreshold; @@ -384,7 +359,7 @@ Q_Q(QQuickDrawer); bool handled = handleTouchEvent(item, event); - if (!window || !interactive || keepGrab(popupItem) || keepGrab(item) || !event->touchPointStates().testFlag(Qt::TouchPointMoved)) + if (!window || !interactive || popupItem->keepTouchGrab() || !event->touchPointStates().testFlag(Qt::TouchPointMoved)) return handled; bool overThreshold = false; @@ -621,10 +596,6 @@ QQuickDrawer::QQuickDrawer(QObject *parent) : QQuickPopup(*(new QQuickDrawerPrivate), parent) { - Q_D(QQuickDrawer); - d->dragMargin = QGuiApplication::styleHints()->startDragDistance(); - d->setEdge(Qt::LeftEdge); - setFocus(true); setModal(true); setFiltersChildMouseEvents(true); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdrawer_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdrawer_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickdrawer_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickdrawer_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ // We mean it. // -#include -#include -#include +#include "qquickdrawer_p.h" +#include "qquickpopup_p_p.h" +#include "qquickvelocitycalculator_p_p.h" QT_BEGIN_NAMESPACE @@ -59,6 +59,8 @@ Q_DECLARE_PUBLIC(QQuickDrawer) public: + QQuickDrawerPrivate(); + static QQuickDrawerPrivate *get(QQuickDrawer *drawer) { return drawer->d_func(); @@ -67,9 +69,7 @@ qreal offsetAt(const QPointF &point) const; qreal positionAt(const QPointF &point) const; - QQuickPopupPositioner *getPositioner() override; - void showOverlay() override; - void hideOverlay() override; + void reposition() override; void resizeOverlay() override; bool startDrag(QEvent *event); @@ -89,10 +89,10 @@ bool setEdge(Qt::Edge edge); - Qt::Edge edge = Qt::LeftEdge; - qreal offset = 0; - qreal position = 0; - qreal dragMargin = 0; + Qt::Edge edge; + qreal offset; + qreal position; + qreal dragMargin; QQuickVelocityCalculator velocityCalculator; }; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickgroupbox.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickgroupbox.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickgroupbox.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickgroupbox.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -89,12 +89,11 @@ Q_DECLARE_PUBLIC(QQuickGroupBox) public: + QQuickGroupBoxPrivate() : label(nullptr) { } + void cancelLabel(); void executeLabel(bool complete = false); - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - QString title; QQuickDeferredPointer label; }; @@ -119,33 +118,11 @@ quickCompleteDeferred(q, labelName(), label); } -void QQuickGroupBoxPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - Q_Q(QQuickGroupBox); - QQuickFramePrivate::itemImplicitWidthChanged(item); - if (item == label) - emit q->implicitLabelWidthChanged(); -} - -void QQuickGroupBoxPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - Q_Q(QQuickGroupBox); - QQuickFramePrivate::itemImplicitHeightChanged(item); - if (item == label) - emit q->implicitLabelHeightChanged(); -} - QQuickGroupBox::QQuickGroupBox(QQuickItem *parent) : QQuickFrame(*(new QQuickGroupBoxPrivate), parent) { } -QQuickGroupBox::~QQuickGroupBox() -{ - Q_D(QQuickGroupBox); - d->removeImplicitSizeListener(d->label); -} - /*! \qmlproperty string QtQuick.Controls::GroupBox::title @@ -195,65 +172,14 @@ if (!d->label.isExecuting()) d->cancelLabel(); - const qreal oldImplicitLabelWidth = implicitLabelWidth(); - const qreal oldImplicitLabelHeight = implicitLabelHeight(); - - d->removeImplicitSizeListener(d->label); delete d->label; d->label = label; - - if (label) { - if (!label->parentItem()) - label->setParentItem(this); - d->addImplicitSizeListener(label); - } - - if (!qFuzzyCompare(oldImplicitLabelWidth, implicitLabelWidth())) - emit implicitLabelWidthChanged(); - if (!qFuzzyCompare(oldImplicitLabelHeight, implicitLabelHeight())) - emit implicitLabelHeightChanged(); + if (label && !label->parentItem()) + label->setParentItem(this); if (!d->label.isExecuting()) emit labelChanged(); } -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::GroupBox::implicitLabelWidth - \readonly - - This property holds the implicit label width. - - The value is equal to \c {label ? label.implicitWidth : 0}. - - \sa implicitLabelHeight -*/ -qreal QQuickGroupBox::implicitLabelWidth() const -{ - Q_D(const QQuickGroupBox); - if (!d->label) - return 0; - return d->label->implicitWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::GroupBox::implicitLabelHeight - \readonly - - This property holds the implicit label height. - - The value is equal to \c {label ? label.implicitHeight : 0}. - - \sa implicitLabelWidth -*/ -qreal QQuickGroupBox::implicitLabelHeight() const -{ - Q_D(const QQuickGroupBox); - if (!d->label) - return 0; - return d->label->implicitHeight(); -} - void QQuickGroupBox::componentComplete() { Q_D(QQuickGroupBox); @@ -263,12 +189,7 @@ QFont QQuickGroupBox::defaultFont() const { - return QQuickTheme::font(QQuickTheme::GroupBox); -} - -QPalette QQuickGroupBox::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::GroupBox); + return QQuickControlPrivate::themeFont(QPlatformTheme::GroupBoxTitleFont); } #if QT_CONFIG(accessibility) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickgroupbox_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickgroupbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickgroupbox_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickgroupbox_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -59,14 +59,10 @@ Q_OBJECT Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) Q_PROPERTY(QQuickItem *label READ label WRITE setLabel NOTIFY labelChanged FINAL) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal implicitLabelWidth READ implicitLabelWidth NOTIFY implicitLabelWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitLabelHeight READ implicitLabelHeight NOTIFY implicitLabelHeightChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "background,contentItem,label") public: explicit QQuickGroupBox(QQuickItem *parent = nullptr); - ~QQuickGroupBox(); QString title() const; void setTitle(const QString &title); @@ -74,22 +70,14 @@ QQuickItem *label() const; void setLabel(QQuickItem *label); - // 2.5 (Qt 5.12) - qreal implicitLabelWidth() const; - qreal implicitLabelHeight() const; - Q_SIGNALS: void titleChanged(); void labelChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void implicitLabelWidthChanged(); - Q_REVISION(5) void implicitLabelHeightChanged(); protected: void componentComplete() override; QFont defaultFont() const override; - QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickicon.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickicon.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickicon.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickicon.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,224 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickicon_p.h" - -QT_BEGIN_NAMESPACE - -class QQuickIconPrivate : public QSharedData -{ -public: - QString name; - QUrl source; - int width = 0; - int height = 0; - QColor color = Qt::transparent; - - enum ResolveProperties { - NameResolved = 0x0001, - SourceResolved = 0x0002, - WidthResolved = 0x0004, - HeightResolved = 0x0008, - ColorResolved = 0x0010, - AllPropertiesResolved = 0x1ffff - }; - - // This is based on QFont's resolve_mask. - int resolveMask = 0; -}; - -QQuickIcon::QQuickIcon() - : d(new QQuickIconPrivate) -{ -} - -QQuickIcon::QQuickIcon(const QQuickIcon &other) - : d(other.d) -{ -} - -QQuickIcon::~QQuickIcon() -{ -} - -QQuickIcon &QQuickIcon::operator=(const QQuickIcon &other) -{ - d = other.d; - return *this; -} - -bool QQuickIcon::operator==(const QQuickIcon &other) const -{ - return d == other.d || (d->name == other.d->name - && d->source == other.d->source - && d->width == other.d->width - && d->height == other.d->height - && d->color == other.d->color); -} - -bool QQuickIcon::operator!=(const QQuickIcon &other) const -{ - return !(*this == other); -} - -bool QQuickIcon::isEmpty() const -{ - return d->name.isEmpty() && d->source.isEmpty(); -} - -QString QQuickIcon::name() const -{ - return d->name; -} - -void QQuickIcon::setName(const QString &name) -{ - if ((d->resolveMask & QQuickIconPrivate::NameResolved) && d->name == name) - return; - - d->name = name; - d->resolveMask |= QQuickIconPrivate::NameResolved; -} - -void QQuickIcon::resetName() -{ - d->name = QString(); - d->resolveMask &= ~QQuickIconPrivate::NameResolved; -} - -QUrl QQuickIcon::source() const -{ - return d->source; -} - -void QQuickIcon::setSource(const QUrl &source) -{ - if ((d->resolveMask & QQuickIconPrivate::SourceResolved) && d->source == source) - return; - - d->source = source; - d->resolveMask |= QQuickIconPrivate::SourceResolved; -} - -void QQuickIcon::resetSource() -{ - d->source = QString(); - d->resolveMask &= ~QQuickIconPrivate::SourceResolved; -} - -int QQuickIcon::width() const -{ - return d->width; -} - -void QQuickIcon::setWidth(int width) -{ - if ((d->resolveMask & QQuickIconPrivate::WidthResolved) && d->width == width) - return; - - d->width = width; - d->resolveMask |= QQuickIconPrivate::WidthResolved; -} - -void QQuickIcon::resetWidth() -{ - d->width = 0; - d->resolveMask &= ~QQuickIconPrivate::WidthResolved; -} - -int QQuickIcon::height() const -{ - return d->height; -} - -void QQuickIcon::setHeight(int height) -{ - if ((d->resolveMask & QQuickIconPrivate::HeightResolved) && d->height == height) - return; - - d->height = height; - d->resolveMask |= QQuickIconPrivate::HeightResolved; -} - -void QQuickIcon::resetHeight() -{ - d->height = 0; - d->resolveMask &= ~QQuickIconPrivate::HeightResolved; -} - -QColor QQuickIcon::color() const -{ - return d->color; -} - -void QQuickIcon::setColor(const QColor &color) -{ - if ((d->resolveMask & QQuickIconPrivate::ColorResolved) && d->color == color) - return; - - d->color = color; - d->resolveMask |= QQuickIconPrivate::ColorResolved; -} - -void QQuickIcon::resetColor() -{ - d->color = Qt::transparent; - d->resolveMask &= ~QQuickIconPrivate::ColorResolved; -} - -QQuickIcon QQuickIcon::resolve(const QQuickIcon &other) const -{ - QQuickIcon resolved = *this; - - if (!(d->resolveMask & QQuickIconPrivate::NameResolved)) - resolved.setName(other.name()); - - if (!(d->resolveMask & QQuickIconPrivate::SourceResolved)) - resolved.setSource(other.source()); - - if (!(d->resolveMask & QQuickIconPrivate::WidthResolved)) - resolved.setWidth(other.width()); - - if (!(d->resolveMask & QQuickIconPrivate::HeightResolved)) - resolved.setHeight(other.height()); - - if (!(d->resolveMask & QQuickIconPrivate::ColorResolved)) - resolved.setColor(other.color()); - - return resolved; -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickicon_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickicon_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickicon_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickicon_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKICON_P_H -#define QQUICKICON_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickIconPrivate; - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickIcon -{ - Q_GADGET - Q_PROPERTY(QString name READ name WRITE setName RESET resetName FINAL) - Q_PROPERTY(QUrl source READ source WRITE setSource RESET resetSource FINAL) - Q_PROPERTY(int width READ width WRITE setWidth RESET resetWidth FINAL) - Q_PROPERTY(int height READ height WRITE setHeight RESET resetHeight FINAL) - Q_PROPERTY(QColor color READ color WRITE setColor RESET resetColor FINAL) - -public: - QQuickIcon(); - QQuickIcon(const QQuickIcon &other); - ~QQuickIcon(); - - QQuickIcon& operator=(const QQuickIcon &other); - bool operator==(const QQuickIcon &other) const; - bool operator!=(const QQuickIcon &other) const; - - bool isEmpty() const; - - QString name() const; - void setName(const QString &name); - void resetName(); - - QUrl source() const; - void setSource(const QUrl &source); - void resetSource(); - - int width() const; - void setWidth(int width); - void resetWidth(); - - int height() const; - void setHeight(int height); - void resetHeight(); - - QColor color() const; - void setColor(const QColor &color); - void resetColor(); - - QQuickIcon resolve(const QQuickIcon &other) const; - -private: - QSharedDataPointer d; -}; - -QT_END_NAMESPACE - -#endif // QQUICKICON_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickitemdelegate.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickitemdelegate.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickitemdelegate.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickitemdelegate.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -56,14 +56,19 @@ in various views and controls, such as \l ListView and \l ComboBox. ItemDelegate inherits its API from AbstractButton. For instance, you can set - \l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls 2}{icon}, - and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API. + \l {AbstractButton::text}{text}, and react to \l {AbstractButton::clicked}{clicks} + using the AbstractButton API. \snippet qtquickcontrols2-itemdelegate.qml 1 \sa {Customizing ItemDelegate}, {Delegate Controls} */ +QQuickItemDelegatePrivate::QQuickItemDelegatePrivate() + : highlighted(false) +{ +} + QQuickItemDelegate::QQuickItemDelegate(QQuickItem *parent) : QQuickAbstractButton(*(new QQuickItemDelegatePrivate), parent) { @@ -117,12 +122,7 @@ QFont QQuickItemDelegate::defaultFont() const { - return QQuickTheme::font(QQuickTheme::ItemView); -} - -QPalette QQuickItemDelegate::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ItemView); + return QQuickControlPrivate::themeFont(QPlatformTheme::ItemViewFont); } #if QT_CONFIG(accessibility) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickitemdelegate_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickitemdelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickitemdelegate_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickitemdelegate_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -70,7 +70,6 @@ protected: QFont defaultFont() const override; - QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickitemdelegate_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickitemdelegate_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickitemdelegate_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickitemdelegate_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -57,7 +57,9 @@ Q_DECLARE_PUBLIC(QQuickItemDelegate) public: - bool highlighted = false; + QQuickItemDelegatePrivate(); + + bool highlighted; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicklabel.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicklabel.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicklabel.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicklabel.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -80,6 +80,8 @@ */ QQuickLabelPrivate::QQuickLabelPrivate() + : background(nullptr), + accessibleAttached(nullptr) { #if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); @@ -93,76 +95,6 @@ #endif } -void QQuickLabelPrivate::setTopInset(qreal value, bool reset) -{ - Q_Q(QQuickLabel); - const QMarginsF oldInset = getInset(); - extra.value().topInset = value; - extra.value().hasTopInset = !reset; - if (!qFuzzyCompare(oldInset.top(), value)) { - emit q->topInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickLabelPrivate::setLeftInset(qreal value, bool reset) -{ - Q_Q(QQuickLabel); - const QMarginsF oldInset = getInset(); - extra.value().leftInset = value; - extra.value().hasLeftInset = !reset; - if (!qFuzzyCompare(oldInset.left(), value)) { - emit q->leftInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickLabelPrivate::setRightInset(qreal value, bool reset) -{ - Q_Q(QQuickLabel); - const QMarginsF oldInset = getInset(); - extra.value().rightInset = value; - extra.value().hasRightInset = !reset; - if (!qFuzzyCompare(oldInset.right(), value)) { - emit q->rightInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickLabelPrivate::setBottomInset(qreal value, bool reset) -{ - Q_Q(QQuickLabel); - const QMarginsF oldInset = getInset(); - extra.value().bottomInset = value; - extra.value().hasBottomInset = !reset; - if (!qFuzzyCompare(oldInset.bottom(), value)) { - emit q->bottomInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickLabelPrivate::resizeBackground() -{ - if (!background) - return; - - resizingBackground = true; - - QQuickItemPrivate *p = QQuickItemPrivate::get(background); - if (((!p->widthValid || !extra.isAllocated() || !extra->hasBackgroundWidth) && qFuzzyIsNull(background->x())) - || (extra.isAllocated() && (extra->hasLeftInset || extra->hasRightInset))) { - background->setX(getLeftInset()); - background->setWidth(width - getLeftInset() - getRightInset()); - } - if (((!p->heightValid || !extra.isAllocated() || !extra->hasBackgroundHeight) && qFuzzyIsNull(background->y())) - || (extra.isAllocated() && (extra->hasTopInset || extra->hasBottomInset))) { - background->setY(getTopInset()); - background->setHeight(height - getTopInset() - getBottomInset()); - } - - resizingBackground = false; -} - /*! \internal @@ -177,76 +109,25 @@ inheritFont(QQuickControlPrivate::parentFont(q)); } -void QQuickLabelPrivate::inheritFont(const QFont &font) -{ - QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font; - parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve()); - - const QFont defaultFont = QQuickTheme::font(QQuickTheme::Label); - const QFont resolvedFont = parentFont.resolve(defaultFont); - - setFont_helper(resolvedFont); -} - -/*! - \internal - - Assign \a font to this control, and propagate it to all children. -*/ -void QQuickLabelPrivate::updateFont(const QFont &font) +void QQuickLabelPrivate::inheritFont(const QFont &f) { Q_Q(QQuickLabel); - QFont oldFont = sourceFont; - q->QQuickText::setFont(font); + QFont parentFont = font.resolve(f); + parentFont.resolve(font.resolve() | f.resolve()); - QQuickControlPrivate::updateFontRecur(q, font); + const QFont defaultFont = QQuickControlPrivate::themeFont(QPlatformTheme::LabelFont); + const QFont resolvedFont = parentFont.resolve(defaultFont); - if (oldFont != font) + const bool changed = resolvedFont != sourceFont; + q->QQuickText::setFont(resolvedFont); + if (changed) emit q->fontChanged(); } -/*! - \internal - - Determine which palette is implicitly imposed on this control by its ancestors - and QGuiApplication::palette, resolve this against its own palette (attributes from - the implicit palette are copied over). Then propagate this palette to this - control's children. -*/ -void QQuickLabelPrivate::resolvePalette() -{ - Q_Q(QQuickLabel); - inheritPalette(QQuickControlPrivate::parentPalette(q)); -} - -void QQuickLabelPrivate::inheritPalette(const QPalette &palette) -{ - QPalette parentPalette = extra.isAllocated() ? extra->requestedPalette.resolve(palette) : palette; - parentPalette.resolve(extra.isAllocated() ? extra->requestedPalette.resolve() | palette.resolve() : palette.resolve()); - - const QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::Label); - const QPalette resolvedPalette = parentPalette.resolve(defaultPalette); - - setPalette_helper(resolvedPalette); -} - -void QQuickLabelPrivate::updatePalette(const QPalette &palette) -{ - Q_Q(QQuickLabel); - QPalette oldPalette = resolvedPalette; - resolvedPalette = palette; - - QQuickControlPrivate::updatePaletteRecur(q, palette); - - if (oldPalette != palette) - emit q->paletteChanged(); -} - void QQuickLabelPrivate::textChanged(const QString &text) { #if QT_CONFIG(accessibility) - Q_Q(QQuickLabel); - if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(q)) + if (accessibleAttached) accessibleAttached->setName(text); #else Q_UNUSED(text) @@ -256,14 +137,17 @@ #if QT_CONFIG(accessibility) void QQuickLabelPrivate::accessibilityActiveChanged(bool active) { - if (!active) + if (accessibleAttached || !active) return; Q_Q(QQuickLabel); - QQuickAccessibleAttached *accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(q, true)); - Q_ASSERT(accessibleAttached); - accessibleAttached->setRole(accessibleRole()); - accessibleAttached->setName(text); + accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(q, true)); + if (accessibleAttached) { + accessibleAttached->setRole(accessibleRole()); + accessibleAttached->setName(text); + } else { + qWarning() << "QQuickLabel: " << q << " QQuickAccessibleAttached object creation failed!"; + } } QAccessible::Role QQuickLabelPrivate::accessibleRole() const @@ -292,42 +176,6 @@ quickCompleteDeferred(q, backgroundName(), background); } -void QQuickLabelPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) -{ - Q_UNUSED(diff); - if (resizingBackground || item != background || !change.sizeChange()) - return; - - QQuickItemPrivate *p = QQuickItemPrivate::get(item); - extra.value().hasBackgroundWidth = p->widthValid; - extra.value().hasBackgroundHeight = p->heightValid; - resizeBackground(); -} - -void QQuickLabelPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - Q_Q(QQuickLabel); - if (item == background) - emit q->implicitBackgroundWidthChanged(); -} - -void QQuickLabelPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - Q_Q(QQuickLabel); - if (item == background) - emit q->implicitBackgroundHeightChanged(); -} - -void QQuickLabelPrivate::itemDestroyed(QQuickItem *item) -{ - Q_Q(QQuickLabel); - if (item == background) { - background = nullptr; - emit q->implicitBackgroundWidthChanged(); - emit q->implicitBackgroundHeightChanged(); - } -} - QQuickLabel::QQuickLabel(QQuickItem *parent) : QQuickText(*(new QQuickLabelPrivate), parent) { @@ -335,12 +183,6 @@ QObjectPrivate::connect(this, &QQuickText::textChanged, d, &QQuickLabelPrivate::textChanged); } -QQuickLabel::~QQuickLabel() -{ - Q_D(QQuickLabel); - QQuickControlPrivate::removeImplicitSizeListener(d->background, d, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); -} - QFont QQuickLabel::font() const { return QQuickText::font(); @@ -349,10 +191,10 @@ void QQuickLabel::setFont(const QFont &font) { Q_D(QQuickLabel); - if (d->extra.value().requestedFont.resolve() == font.resolve() && d->extra.value().requestedFont == font) + if (d->font.resolve() == font.resolve() && d->font == font) return; - d->extra.value().requestedFont = font; + d->font = font; d->resolveFont(); } @@ -384,220 +226,22 @@ if (!d->background.isExecuting()) d->cancelBackground(); - const qreal oldImplicitBackgroundWidth = implicitBackgroundWidth(); - const qreal oldImplicitBackgroundHeight = implicitBackgroundHeight(); - - if (d->extra.isAllocated()) { - d->extra.value().hasBackgroundWidth = false; - d->extra.value().hasBackgroundHeight = false; - } - - QQuickControlPrivate::removeImplicitSizeListener(d->background, d, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); delete d->background; d->background = background; - if (background) { background->setParentItem(this); if (qFuzzyIsNull(background->z())) background->setZ(-1); - QQuickItemPrivate *p = QQuickItemPrivate::get(background); - if (p->widthValid || p->heightValid) { - d->extra.value().hasBackgroundWidth = p->widthValid; - d->extra.value().hasBackgroundHeight = p->heightValid; - } - if (isComponentComplete()) - d->resizeBackground(); - QQuickControlPrivate::addImplicitSizeListener(background, d, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); } - - if (!qFuzzyCompare(oldImplicitBackgroundWidth, implicitBackgroundWidth())) - emit implicitBackgroundWidthChanged(); - if (!qFuzzyCompare(oldImplicitBackgroundHeight, implicitBackgroundHeight())) - emit implicitBackgroundHeightChanged(); if (!d->background.isExecuting()) emit backgroundChanged(); } -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty palette QtQuick.Controls::Label::palette - - This property holds the palette currently set for the label. - - \sa Control::palette -*/ -QPalette QQuickLabel::palette() const -{ - Q_D(const QQuickLabel); - QPalette palette = d->resolvedPalette; - if (!isEnabled()) - palette.setCurrentColorGroup(QPalette::Disabled); - return palette; -} - -void QQuickLabel::setPalette(const QPalette &palette) -{ - Q_D(QQuickLabel); - if (d->extra.value().requestedPalette.resolve() == palette.resolve() && d->extra.value().requestedPalette == palette) - return; - - d->extra.value().requestedPalette = palette; - d->resolvePalette(); -} - -void QQuickLabel::resetPalette() -{ - setPalette(QPalette()); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Label::implicitBackgroundWidth - \readonly - - This property holds the implicit background width. - - The value is equal to \c {background ? background.implicitWidth : 0}. - - \sa implicitBackgroundHeight -*/ -qreal QQuickLabel::implicitBackgroundWidth() const -{ - Q_D(const QQuickLabel); - if (!d->background) - return 0; - return d->background->implicitWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Label::implicitBackgroundHeight - \readonly - - This property holds the implicit background height. - - The value is equal to \c {background ? background.implicitHeight : 0}. - - \sa implicitBackgroundWidth -*/ -qreal QQuickLabel::implicitBackgroundHeight() const -{ - Q_D(const QQuickLabel); - if (!d->background) - return 0; - return d->background->implicitHeight(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Label::topInset - - This property holds the top inset for the background. - - \sa {Control Layout}, bottomInset -*/ -qreal QQuickLabel::topInset() const -{ - Q_D(const QQuickLabel); - return d->getTopInset(); -} - -void QQuickLabel::setTopInset(qreal inset) -{ - Q_D(QQuickLabel); - d->setTopInset(inset); -} - -void QQuickLabel::resetTopInset() -{ - Q_D(QQuickLabel); - d->setTopInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Label::leftInset - - This property holds the left inset for the background. - - \sa {Control Layout}, rightInset -*/ -qreal QQuickLabel::leftInset() const -{ - Q_D(const QQuickLabel); - return d->getLeftInset(); -} - -void QQuickLabel::setLeftInset(qreal inset) -{ - Q_D(QQuickLabel); - d->setLeftInset(inset); -} - -void QQuickLabel::resetLeftInset() -{ - Q_D(QQuickLabel); - d->setLeftInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Label::rightInset - - This property holds the right inset for the background. - - \sa {Control Layout}, leftInset -*/ -qreal QQuickLabel::rightInset() const -{ - Q_D(const QQuickLabel); - return d->getRightInset(); -} - -void QQuickLabel::setRightInset(qreal inset) -{ - Q_D(QQuickLabel); - d->setRightInset(inset); -} - -void QQuickLabel::resetRightInset() -{ - Q_D(QQuickLabel); - d->setRightInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Label::bottomInset - - This property holds the bottom inset for the background. - - \sa {Control Layout}, topInset -*/ -qreal QQuickLabel::bottomInset() const -{ - Q_D(const QQuickLabel); - return d->getBottomInset(); -} - -void QQuickLabel::setBottomInset(qreal inset) -{ - Q_D(QQuickLabel); - d->setBottomInset(inset); -} - -void QQuickLabel::resetBottomInset() -{ - Q_D(QQuickLabel); - d->setBottomInset(0, true); -} - void QQuickLabel::classBegin() { Q_D(QQuickLabel); QQuickText::classBegin(); d->resolveFont(); - d->resolvePalette(); } void QQuickLabel::componentComplete() @@ -605,9 +249,8 @@ Q_D(QQuickLabel); d->executeBackground(true); QQuickText::componentComplete(); - d->resizeBackground(); #if QT_CONFIG(accessibility) - if (QAccessible::isActive()) + if (!d->accessibleAttached && QAccessible::isActive()) d->accessibilityActiveChanged(true); #endif } @@ -616,35 +259,25 @@ { Q_D(QQuickLabel); QQuickText::itemChange(change, value); - switch (change) { - case ItemEnabledHasChanged: - emit paletteChanged(); - break; - case ItemSceneChange: - case ItemParentHasChanged: - if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) { - d->resolveFont(); - d->resolvePalette(); - } - break; - default: - break; - } + if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) + d->resolveFont(); } void QQuickLabel::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickLabel); QQuickText::geometryChanged(newGeometry, oldGeometry); - d->resizeBackground(); -} - -void QQuickLabel::insetChange(const QMarginsF &newInset, const QMarginsF &oldInset) -{ - Q_D(QQuickLabel); - Q_UNUSED(newInset); - Q_UNUSED(oldInset); - d->resizeBackground(); + if (d->background) { + QQuickItemPrivate *p = QQuickItemPrivate::get(d->background); + if (!p->widthValid) { + d->background->setWidth(newGeometry.width()); + p->widthValid = false; + } + if (!p->heightValid) { + d->background->setHeight(newGeometry.height()); + p->heightValid = false; + } + } } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicklabel_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicklabel_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicklabel_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicklabel_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,6 @@ // We mean it. // -#include #include #include @@ -61,20 +60,10 @@ Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) - // 2.3 (Qt 5.10) - Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal implicitBackgroundWidth READ implicitBackgroundWidth NOTIFY implicitBackgroundWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitBackgroundHeight READ implicitBackgroundHeight NOTIFY implicitBackgroundHeightChanged FINAL REVISION 5) - Q_PROPERTY(qreal topInset READ topInset WRITE setTopInset RESET resetTopInset NOTIFY topInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal leftInset READ leftInset WRITE setLeftInset RESET resetLeftInset NOTIFY leftInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal rightInset READ rightInset WRITE setRightInset RESET resetRightInset NOTIFY rightInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal bottomInset READ bottomInset WRITE setBottomInset RESET resetBottomInset NOTIFY bottomInsetChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "background") public: explicit QQuickLabel(QQuickItem *parent = nullptr); - ~QQuickLabel(); QFont font() const; void setFont(const QFont &font); @@ -82,43 +71,9 @@ QQuickItem *background() const; void setBackground(QQuickItem *background); - // 2.3 (Qt 5.10) - QPalette palette() const; - void setPalette(const QPalette &palette); - void resetPalette(); - - // 2.5 (Qt 5.12) - qreal implicitBackgroundWidth() const; - qreal implicitBackgroundHeight() const; - - qreal topInset() const; - void setTopInset(qreal inset); - void resetTopInset(); - - qreal leftInset() const; - void setLeftInset(qreal inset); - void resetLeftInset(); - - qreal rightInset() const; - void setRightInset(qreal inset); - void resetRightInset(); - - qreal bottomInset() const; - void setBottomInset(qreal inset); - void resetBottomInset(); - Q_SIGNALS: void fontChanged(); void backgroundChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void paletteChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void implicitBackgroundWidthChanged(); - Q_REVISION(5) void implicitBackgroundHeightChanged(); - Q_REVISION(5) void topInsetChanged(); - Q_REVISION(5) void leftInsetChanged(); - Q_REVISION(5) void rightInsetChanged(); - Q_REVISION(5) void bottomInsetChanged(); protected: void classBegin() override; @@ -126,7 +81,6 @@ void itemChange(ItemChange change, const ItemChangeData &value) override; void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; - virtual void insetChange(const QMarginsF &newInset, const QMarginsF &oldInset); private: Q_DISABLE_COPY(QQuickLabel) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicklabel_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicklabel_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicklabel_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicklabel_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,7 @@ // We mean it. // -#include #include -#include #include #if QT_CONFIG(accessibility) @@ -59,7 +57,9 @@ QT_BEGIN_NAMESPACE -class QQuickLabelPrivate : public QQuickTextPrivate, public QQuickItemChangeListener +class QQuickAccessibleAttached; + +class QQuickLabelPrivate : public QQuickTextPrivate #if QT_CONFIG(accessibility) , public QAccessible::ActivationObserver #endif @@ -75,36 +75,8 @@ return static_cast(QObjectPrivate::get(item)); } - inline QMarginsF getInset() const { return QMarginsF(getLeftInset(), getTopInset(), getRightInset(), getBottomInset()); } - inline qreal getTopInset() const { return extra.isAllocated() ? extra->topInset : 0; } - inline qreal getLeftInset() const { return extra.isAllocated() ? extra->leftInset : 0; } - inline qreal getRightInset() const { return extra.isAllocated() ? extra->rightInset : 0; } - inline qreal getBottomInset() const { return extra.isAllocated() ? extra->bottomInset : 0; } - - void setTopInset(qreal value, bool reset = false); - void setLeftInset(qreal value, bool reset = false); - void setRightInset(qreal value, bool reset = false); - void setBottomInset(qreal value, bool reset = false); - - void resizeBackground(); - void resolveFont(); - void inheritFont(const QFont &font); - void updateFont(const QFont &font); - inline void setFont_helper(const QFont &font) { - if (sourceFont.resolve() == font.resolve() && sourceFont == font) - return; - updateFont(font); - } - - void resolvePalette(); - void inheritPalette(const QPalette &palette); - void updatePalette(const QPalette &palette); - inline void setPalette_helper(const QPalette &palette) { - if (resolvedPalette.resolve() == palette.resolve() && resolvedPalette == palette) - return; - updatePalette(palette); - } + void inheritFont(const QFont &f); void textChanged(const QString &text); @@ -116,30 +88,9 @@ void cancelBackground(); void executeBackground(bool complete = false); - void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) override; - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - void itemDestroyed(QQuickItem *item) override; - - struct ExtraData { - bool hasTopInset = false; - bool hasLeftInset = false; - bool hasRightInset = false; - bool hasBottomInset = false; - bool hasBackgroundWidth = false; - bool hasBackgroundHeight = false; - qreal topInset = 0; - qreal leftInset = 0; - qreal rightInset = 0; - qreal bottomInset = 0; - QFont requestedFont; - QPalette requestedPalette; - }; - QLazilyAllocated extra; - - bool resizingBackground = false; - QPalette resolvedPalette; + QFont font; QQuickDeferredPointer background; + QQuickAccessibleAttached *accessibleAttached; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubar.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubar.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubar.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubar.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,581 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickmenubar_p.h" -#include "qquickmenubar_p_p.h" -#include "qquickmenubaritem_p_p.h" -#include "qquickmenu_p.h" -#include "qquickmenu_p_p.h" - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -/*! - \qmltype MenuBar - \inherits Container - \instantiates QQuickMenuBar - \inqmlmodule QtQuick.Controls - \since 5.10 - \ingroup qtquickcontrols2-menus - \ingroup qtquickcontrols2-focusscopes - \brief Provides a window menu bar. - - \image qtquickcontrols2-menubar.png - - MenuBar consists of drop-down menus, and is normally located at the top - edge of the window. - - \quotefromfile qtquickcontrols2-menubar.qml - \skipuntil begin - \printto skipfrom - \skipuntil skipto - \printto end - - Typically, menus are statically declared as children of the menu bar, but - MenuBar also provides API to \l {addMenu}{add}, \l {insertMenu}{insert}, - \l {removeMenu}{remove}, and \l {takeMenu}{take} menus dynamically. The - menus in a menu bar can be accessed using \l menuAt(). - - \sa {Customizing MenuBar}, Menu, MenuBarItem, {Menu Controls}, - {Focus Management in Qt Quick Controls 2} -*/ - -QQuickItem *QQuickMenuBarPrivate::beginCreateItem() -{ - Q_Q(QQuickMenuBar); - if (!delegate) - return nullptr; - - QQmlContext *creationContext = delegate->creationContext(); - if (!creationContext) - creationContext = qmlContext(q); - QQmlContext *context = new QQmlContext(creationContext, q); - context->setContextObject(q); - - QObject *object = delegate->beginCreate(context); - QQuickItem *item = qobject_cast(object); - if (!item) { - delete object; - delete context; - return nullptr; - } - - item->setParentItem(q); - QQml_setParent_noEvent(item, q); - - return item; -} - -void QQuickMenuBarPrivate::completeCreateItem() -{ - if (!delegate) - return; - - delegate->completeCreate(); -} - -QQuickItem *QQuickMenuBarPrivate::createItem(QQuickMenu *menu) -{ - QQuickItem *item = beginCreateItem(); - if (QQuickMenuBarItem *menuBarItem = qobject_cast(item)) - menuBarItem->setMenu(menu); - completeCreateItem(); - return item; -} - -void QQuickMenuBarPrivate::toggleCurrentMenu(bool visible, bool activate) -{ - if (!currentItem || visible == popupMode) - return; - - QQuickMenu *menu = currentItem->menu(); - - triggering = true; - popupMode = visible; - if (menu) - menu->setVisible(visible); - if (!visible) - currentItem->forceActiveFocus(); - else if (menu && activate) - menu->setCurrentIndex(0); - triggering = false; -} - -void QQuickMenuBarPrivate::activateItem(QQuickMenuBarItem *item) -{ - if (currentItem == item) - return; - - if (currentItem) { - currentItem->setHighlighted(false); - if (popupMode) { - if (QQuickMenu *menu = currentItem->menu()) - menu->dismiss(); - } - } - - if (item) { - item->setHighlighted(true); - if (popupMode) { - if (QQuickMenu *menu = item->menu()) - menu->open(); - } - } - - currentItem = item; -} - -void QQuickMenuBarPrivate::activateNextItem() -{ - int index = currentItem ? contentModel->indexOf(currentItem, nullptr) : -1; - if (index >= contentModel->count() - 1) - index = -1; - activateItem(qobject_cast(itemAt(++index))); -} - -void QQuickMenuBarPrivate::activatePreviousItem() -{ - int index = currentItem ? contentModel->indexOf(currentItem, nullptr) : contentModel->count(); - if (index <= 0) - index = contentModel->count(); - activateItem(qobject_cast(itemAt(--index))); -} - -void QQuickMenuBarPrivate::onItemHovered() -{ - Q_Q(QQuickMenuBar); - QQuickMenuBarItem *item = qobject_cast(q->sender()); - if (!item || item == currentItem || !item->isHovered() || QQuickMenuBarItemPrivate::get(item)->touchId != -1) - return; - - activateItem(item); -} - -void QQuickMenuBarPrivate::onItemTriggered() -{ - Q_Q(QQuickMenuBar); - QQuickMenuBarItem *item = qobject_cast(q->sender()); - if (!item) - return; - - if (item == currentItem) { - toggleCurrentMenu(!popupMode, false); - } else { - popupMode = true; - activateItem(item); - } -} - -void QQuickMenuBarPrivate::onMenuAboutToHide() -{ - if (triggering || !currentItem || currentItem->isHovered() || !currentItem->isHighlighted()) - return; - - popupMode = false; - activateItem(nullptr); -} - -qreal QQuickMenuBarPrivate::getContentWidth() const -{ - Q_Q(const QQuickMenuBar); - const int count = contentModel->count(); - qreal totalWidth = qMax(0, count - 1) * spacing; - for (int i = 0; i < count; ++i) { - QQuickItem *item = q->itemAt(i); - if (item) - totalWidth += item->implicitWidth(); - } - return totalWidth; -} - -qreal QQuickMenuBarPrivate::getContentHeight() const -{ - Q_Q(const QQuickMenuBar); - const int count = contentModel->count(); - qreal maxHeight = 0; - for (int i = 0; i < count; ++i) { - QQuickItem *item = q->itemAt(i); - if (item) - maxHeight = qMax(maxHeight, item->implicitHeight()); - } - return maxHeight; -} - -void QQuickMenuBarPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - QQuickContainerPrivate::itemImplicitWidthChanged(item); - if (item != contentItem) - updateImplicitContentWidth(); -} - -void QQuickMenuBarPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - QQuickContainerPrivate::itemImplicitHeightChanged(item); - if (item != contentItem) - updateImplicitContentHeight(); -} - -void QQuickMenuBarPrivate::contentData_append(QQmlListProperty *prop, QObject *obj) -{ - QQuickMenuBar *menuBar = static_cast(prop->object); - if (QQuickMenu *menu = qobject_cast(obj)) - obj = QQuickMenuBarPrivate::get(menuBar)->createItem(menu); - QQuickContainerPrivate::contentData_append(prop, obj); -} - -void QQuickMenuBarPrivate::menus_append(QQmlListProperty *prop, QQuickMenu *obj) -{ - QQuickMenuBar *menuBar = static_cast(prop->object); - menuBar->addMenu(obj); -} - -int QQuickMenuBarPrivate::menus_count(QQmlListProperty *prop) -{ - QQuickMenuBar *menuBar = static_cast(prop->object); - return menuBar->count(); -} - -QQuickMenu *QQuickMenuBarPrivate::menus_at(QQmlListProperty *prop, int index) -{ - QQuickMenuBar *menuBar = static_cast(prop->object); - return menuBar->menuAt(index); -} - -void QQuickMenuBarPrivate::menus_clear(QQmlListProperty *prop) -{ - QQuickMenuBar *menuBar = static_cast(prop->object); - QQuickMenuBarPrivate::get(menuBar)->contentModel->clear(); -} - -QQuickMenuBar::QQuickMenuBar(QQuickItem *parent) - : QQuickContainer(*(new QQuickMenuBarPrivate), parent) -{ - Q_D(QQuickMenuBar); - d->changeTypes |= QQuickItemPrivate::Geometry; - setFlag(ItemIsFocusScope); - setFocusPolicy(Qt::ClickFocus); -} - -/*! - \qmlproperty Component QtQuick.Controls::MenuBar::delegate - - This property holds the component that is used to create menu bar - items to present menus in the menu bar. - - \sa MenuBarItem -*/ -QQmlComponent *QQuickMenuBar::delegate() const -{ - Q_D(const QQuickMenuBar); - return d->delegate; -} - -void QQuickMenuBar::setDelegate(QQmlComponent *delegate) -{ - Q_D(QQuickMenuBar); - if (d->delegate == delegate) - return; - - d->delegate = delegate; - emit delegateChanged(); -} - -/*! - \qmlmethod Menu QtQuick.Controls::MenuBar::menuAt(int index) - - Returns the menu at \a index, or \c null if it does not exist. -*/ -QQuickMenu *QQuickMenuBar::menuAt(int index) const -{ - Q_D(const QQuickMenuBar); - QQuickMenuBarItem *item = qobject_cast(d->itemAt(index)); - if (!item) - return nullptr; - return item->menu(); -} - -/*! - \qmlmethod void QtQuick.Controls::MenuBar::addMenu(Menu menu) - - Adds \a menu to the end of the list of menus. -*/ -void QQuickMenuBar::addMenu(QQuickMenu *menu) -{ - Q_D(QQuickMenuBar); - addItem(d->createItem(menu)); -} - -/*! - \qmlmethod void QtQuick.Controls::MenuBar::insertMenu(int index, Menu menu) - - Inserts \a menu at \a index. -*/ -void QQuickMenuBar::insertMenu(int index, QQuickMenu *menu) -{ - Q_D(QQuickMenuBar); - insertItem(index, d->createItem(menu)); -} - -/*! - \qmlmethod void QtQuick.Controls::MenuBar::removeMenu(Menu menu) - - Removes and destroys the specified \a menu. -*/ -void QQuickMenuBar::removeMenu(QQuickMenu *menu) -{ - Q_D(QQuickMenuBar); - if (!menu) - return; - - const int count = d->contentModel->count(); - for (int i = 0; i < count; ++i) { - QQuickMenuBarItem *item = qobject_cast(itemAt(i)); - if (!item || item->menu() != menu) - continue; - - removeItem(item); - break; - } - - menu->deleteLater(); -} - -/*! - \qmlmethod Menu QtQuick.Controls::MenuBar::takeMenu(int index) - - Removes and returns the menu at \a index. - - \note The ownership of the item is transferred to the caller. -*/ -QQuickMenu *QQuickMenuBar::takeMenu(int index) -{ - Q_D(QQuickMenuBar); - QQuickMenuBarItem *item = qobject_cast(itemAt(index)); - if (!item) - return nullptr; - - QQuickMenu *menu = item->menu(); - if (!menu) - return nullptr; - - d->removeItem(index, item); - item->deleteLater(); - return menu; -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty real QtQuick.Controls::MenuBar::contentWidth - - This property holds the content width. It is used for calculating the total - implicit width of the menu bar. - - \note This property is available in MenuBar since QtQuick.Controls 2.3 (Qt 5.10), - but it was promoted to the Container base type in QtQuick.Controls 2.5 (Qt 5.12). - - \sa Container::contentWidth -*/ - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty real QtQuick.Controls::MenuBar::contentHeight - - This property holds the content height. It is used for calculating the total - implicit height of the menu bar. - - \note This property is available in MenuBar since QtQuick.Controls 2.3 (Qt 5.10), - but it was promoted to the Container base type in QtQuick.Controls 2.5 (Qt 5.12). - - \sa Container::contentHeight -*/ - -/*! - \qmlproperty list QtQuick.Controls::MenuBar::menus - - This property holds the list of menus. - - The list contains all menus that have been declared in QML as children - of the menu bar, and also menus that have been dynamically added or - inserted using the \l addMenu() and \l insertMenu() methods, respectively. -*/ -QQmlListProperty QQuickMenuBarPrivate::menus() -{ - Q_Q(QQuickMenuBar); - return QQmlListProperty(q, nullptr, - QQuickMenuBarPrivate::menus_append, - QQuickMenuBarPrivate::menus_count, - QQuickMenuBarPrivate::menus_at, - QQuickMenuBarPrivate::menus_clear); -} - -QQmlListProperty QQuickMenuBarPrivate::contentData() -{ - Q_Q(QQuickMenuBar); - return QQmlListProperty(q, nullptr, - QQuickMenuBarPrivate::contentData_append, - QQuickContainerPrivate::contentData_count, - QQuickContainerPrivate::contentData_at, - QQuickContainerPrivate::contentData_clear); -} - -bool QQuickMenuBar::eventFilter(QObject *object, QEvent *event) -{ - return QObject::eventFilter(object, event); -} - -void QQuickMenuBar::keyPressEvent(QKeyEvent *event) -{ - Q_D(QQuickMenuBar); - QQuickContainer::keyReleaseEvent(event); - - switch (event->key()) { - case Qt::Key_Up: - d->toggleCurrentMenu(false, false); - break; - - case Qt::Key_Down: - d->toggleCurrentMenu(true, true); - break; - - case Qt::Key_Left: - case Qt::Key_Right: - if (isMirrored() == (event->key() == Qt::Key_Left)) - d->activateNextItem(); - else - d->activatePreviousItem(); - break; - case Qt::Key_Escape: - if (d->currentItem) { - d->activateItem(nullptr); - setFocus(false); - } - break; - default: - break; - } -} - -void QQuickMenuBar::keyReleaseEvent(QKeyEvent *event) -{ - QQuickContainer::keyReleaseEvent(event); - - switch (event->key()) { - case Qt::Key_Up: - case Qt::Key_Down: - case Qt::Key_Left: - case Qt::Key_Right: - case Qt::Key_Escape: - event->accept(); - break; - - default: - event->ignore(); - break; - } -} - -void QQuickMenuBar::hoverLeaveEvent(QHoverEvent *event) -{ - Q_D(QQuickMenuBar); - QQuickContainer::hoverLeaveEvent(event); - if (!d->popupMode && d->currentItem) - d->activateItem(nullptr); -} - -bool QQuickMenuBar::isContent(QQuickItem *item) const -{ - return qobject_cast(item); -} - -void QQuickMenuBar::itemAdded(int index, QQuickItem *item) -{ - Q_D(QQuickMenuBar); - QQuickContainer::itemAdded(index, item); - if (QQuickMenuBarItem *menuBarItem = qobject_cast(item)) { - QQuickMenuBarItemPrivate::get(menuBarItem)->setMenuBar(this); - QObjectPrivate::connect(menuBarItem, &QQuickControl::hoveredChanged, d, &QQuickMenuBarPrivate::onItemHovered); - QObjectPrivate::connect(menuBarItem, &QQuickMenuBarItem::triggered, d, &QQuickMenuBarPrivate::onItemTriggered); - if (QQuickMenu *menu = menuBarItem->menu()) - QObjectPrivate::connect(menu, &QQuickPopup::aboutToHide, d, &QQuickMenuBarPrivate::onMenuAboutToHide); - } - d->updateImplicitContentSize(); - emit menusChanged(); -} - -void QQuickMenuBar::itemMoved(int index, QQuickItem *item) -{ - QQuickContainer::itemMoved(index, item); - emit menusChanged(); -} - -void QQuickMenuBar::itemRemoved(int index, QQuickItem *item) -{ - Q_D(QQuickMenuBar); - QQuickContainer::itemRemoved(index, item); - if (QQuickMenuBarItem *menuBarItem = qobject_cast(item)) { - QQuickMenuBarItemPrivate::get(menuBarItem)->setMenuBar(nullptr); - QObjectPrivate::disconnect(menuBarItem, &QQuickControl::hoveredChanged, d, &QQuickMenuBarPrivate::onItemHovered); - QObjectPrivate::disconnect(menuBarItem, &QQuickMenuBarItem::triggered, d, &QQuickMenuBarPrivate::onItemTriggered); - if (QQuickMenu *menu = menuBarItem->menu()) - QObjectPrivate::disconnect(menu, &QQuickPopup::aboutToHide, d, &QQuickMenuBarPrivate::onMenuAboutToHide); - } - d->updateImplicitContentSize(); - emit menusChanged(); -} - -QFont QQuickMenuBar::defaultFont() const -{ - return QQuickTheme::font(QQuickTheme::MenuBar); -} - -QPalette QQuickMenuBar::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::MenuBar); -} - -#if QT_CONFIG(accessibility) -QAccessible::Role QQuickMenuBar::accessibleRole() const -{ - return QAccessible::MenuBar; -} -#endif - -QT_END_NAMESPACE - -#include "moc_qquickmenubar_p.cpp" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubaritem.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubaritem.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubaritem.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubaritem.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,185 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickmenubaritem_p.h" -#include "qquickmenubaritem_p_p.h" -#include "qquickmenubar_p.h" -#include "qquickmenu_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \qmltype MenuBarItem - \inherits AbstractButton - \instantiates QQuickMenuBarItem - \inqmlmodule QtQuick.Controls - \since 5.10 - \ingroup qtquickcontrols2-menus - \brief Presents a drop-down menu within a MenuBar. - - MenuBarItem presents a Menu within a MenuBar. The respective drop-down menu - is shown when a MenuBarItem is \l triggered via keyboard, mouse, or touch. - - \image qtquickcontrols2-menubar.png - - MenuBarItem is used as a default \l {MenuBar::}{delegate} type for MenuBar. - Notice that it is not necessary to declare MenuBarItem instances by hand when - using MenuBar. It is sufficient to declare Menu instances as children of the - MenuBar and the respective items are created automatically. - - \sa {Customizing MenuBar}, MenuBar, {Menu Controls} -*/ - -/*! - \qmlsignal void QtQuick.Controls::MenuBarItem::triggered() - - This signal is emitted when the menu bar item is triggered by the user. -*/ - -void QQuickMenuBarItemPrivate::setMenuBar(QQuickMenuBar *newMenuBar) -{ - Q_Q(QQuickMenuBarItem); - if (menuBar == newMenuBar) - return; - - menuBar = newMenuBar; - emit q->menuBarChanged(); -} - -QQuickMenuBarItem::QQuickMenuBarItem(QQuickItem *parent) - : QQuickAbstractButton(*(new QQuickMenuBarItemPrivate), parent) -{ - setFocusPolicy(Qt::NoFocus); - connect(this, &QQuickAbstractButton::clicked, this, &QQuickMenuBarItem::triggered); -} - -/*! - \qmlproperty Menu QtQuick.Controls::MenuBarItem::menuBar - \readonly - - This property holds the menu bar that contains this item, - or \c null if the item is not in a menu bar. -*/ -QQuickMenuBar *QQuickMenuBarItem::menuBar() const -{ - Q_D(const QQuickMenuBarItem); - return d->menuBar; -} - -/*! - \qmlproperty Menu QtQuick.Controls::MenuBarItem::menu - - This property holds the menu that this item presents in a - menu bar, or \c null if this item does not have a menu. -*/ -QQuickMenu *QQuickMenuBarItem::menu() const -{ - Q_D(const QQuickMenuBarItem); - return d->menu; -} - -void QQuickMenuBarItem::setMenu(QQuickMenu *menu) -{ - Q_D(QQuickMenuBarItem); - if (d->menu == menu) - return; - - if (d->menu) - disconnect(d->menu, &QQuickMenu::titleChanged, this, &QQuickAbstractButton::setText); - - if (menu) { - setText(menu->title()); - menu->setY(height()); - menu->setParentItem(this); - menu->setClosePolicy(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutsideParent | QQuickPopup::CloseOnReleaseOutsideParent); - connect(menu, &QQuickMenu::titleChanged, this, &QQuickAbstractButton::setText); - } - - d->menu = menu; - emit menuChanged(); -} - -/*! - \qmlproperty bool QtQuick.Controls::MenuBarItem::highlighted - - This property holds whether the menu bar item is highlighted by the user. - - A menu bar item can be highlighted by mouse hover or keyboard navigation. - - The default value is \c false. -*/ -bool QQuickMenuBarItem::isHighlighted() const -{ - Q_D(const QQuickMenuBarItem); - return d->highlighted; -} - -void QQuickMenuBarItem::setHighlighted(bool highlighted) -{ - Q_D(QQuickMenuBarItem); - if (highlighted == d->highlighted) - return; - - d->highlighted = highlighted; - emit highlightedChanged(); -} - -void QQuickMenuBarItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) -{ - Q_D(QQuickMenuBarItem); - QQuickAbstractButton::geometryChanged(newGeometry, oldGeometry); - if (d->menu) - d->menu->setY(newGeometry.height()); -} - -QFont QQuickMenuBarItem::defaultFont() const -{ - return QQuickTheme::font(QQuickTheme::MenuBar); -} - -QPalette QQuickMenuBarItem::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::MenuBar); -} - -#if QT_CONFIG(accessibility) -QAccessible::Role QQuickMenuBarItem::accessibleRole() const -{ - return QAccessible::MenuBar; -} -#endif - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubaritem_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubaritem_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubaritem_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubaritem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKMENUBARITEM_P_H -#define QQUICKMENUBARITEM_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -QT_BEGIN_NAMESPACE - -class QQuickMenu; -class QQuickMenuBar; -class QQuickMenuBarItemPrivate; - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuBarItem : public QQuickAbstractButton -{ - Q_OBJECT - Q_PROPERTY(QQuickMenuBar *menuBar READ menuBar NOTIFY menuBarChanged FINAL) - Q_PROPERTY(QQuickMenu *menu READ menu WRITE setMenu NOTIFY menuChanged FINAL) - Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted NOTIFY highlightedChanged FINAL) - -public: - explicit QQuickMenuBarItem(QQuickItem *parent = nullptr); - - QQuickMenuBar *menuBar() const; - - QQuickMenu *menu() const; - void setMenu(QQuickMenu *menu); - - bool isHighlighted() const; - void setHighlighted(bool highlighted); - -Q_SIGNALS: - void triggered(); - void menuBarChanged(); - void menuChanged(); - void highlightedChanged(); - -protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; - - QFont defaultFont() const override; - QPalette defaultPalette() const override; - -#if QT_CONFIG(accessibility) - QAccessible::Role accessibleRole() const override; -#endif - -private: - Q_DISABLE_COPY(QQuickMenuBarItem) - Q_DECLARE_PRIVATE(QQuickMenuBarItem) -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QQuickMenuBarItem) - -#endif // QQUICKMENUBARITEM_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubaritem_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubaritem_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubaritem_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubaritem_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKMENUBARITEM_P_P_H -#define QQUICKMENUBARITEM_P_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickMenu; -class QQuickMenuBar; - -class QQuickMenuBarItemPrivate : public QQuickAbstractButtonPrivate -{ - Q_DECLARE_PUBLIC(QQuickMenuBarItem) - -public: - static QQuickMenuBarItemPrivate *get(QQuickMenuBarItem *item) - { - return item->d_func(); - } - - void setMenuBar(QQuickMenuBar *menuBar); - - bool highlighted = false; - QQuickMenu *menu = nullptr; - QQuickMenuBar *menuBar = nullptr; -}; - -QT_END_NAMESPACE - -#endif // QQUICKMENUBARITEM_P_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubar_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubar_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKMENUBAR_P_H -#define QQUICKMENUBAR_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -QT_BEGIN_NAMESPACE - -class QQuickMenu; -class QQuickMenuBarPrivate; - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuBar : public QQuickContainer -{ - Q_OBJECT - Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) - Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth RESET resetContentWidth NOTIFY contentWidthChanged FINAL) // re-declare QQuickContainer::contentWidth (REV 5) - Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight RESET resetContentHeight NOTIFY contentHeightChanged FINAL) // re-declare QQuickContainer::contentHeight (REV 5) - Q_PRIVATE_PROPERTY(QQuickMenuBar::d_func(), QQmlListProperty menus READ menus NOTIFY menusChanged FINAL) - Q_PRIVATE_PROPERTY(QQuickMenuBar::d_func(), QQmlListProperty contentData READ contentData FINAL) - -public: - explicit QQuickMenuBar(QQuickItem *parent = nullptr); - - QQmlComponent *delegate() const; - void setDelegate(QQmlComponent *delegate); - - Q_INVOKABLE QQuickMenu *menuAt(int index) const; - Q_INVOKABLE void addMenu(QQuickMenu *menu); - Q_INVOKABLE void insertMenu(int index, QQuickMenu *menu); - Q_INVOKABLE void removeMenu(QQuickMenu *menu); - Q_INVOKABLE QQuickMenu *takeMenu(int index); - -Q_SIGNALS: - void delegateChanged(); - void menusChanged(); - -protected: - bool eventFilter(QObject *object, QEvent *event) override; - void keyPressEvent(QKeyEvent *event) override; - void keyReleaseEvent(QKeyEvent *event) override; - void hoverLeaveEvent(QHoverEvent *event) override; - - bool isContent(QQuickItem *item) const override; - void itemAdded(int index, QQuickItem *item) override; - void itemMoved(int index, QQuickItem *item) override; - void itemRemoved(int index, QQuickItem *item) override; - - QFont defaultFont() const override; - QPalette defaultPalette() const override; - -#if QT_CONFIG(accessibility) - QAccessible::Role accessibleRole() const override; -#endif - -private: - Q_DISABLE_COPY(QQuickMenuBar) - Q_DECLARE_PRIVATE(QQuickMenuBar) -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QQuickMenuBar) - -#endif // QQUICKMENUBAR_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubar_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubar_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenubar_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenubar_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKMENUBAR_P_P_H -#define QQUICKMENUBAR_P_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class QQmlComponent; -class QQuickMenuBarItem; - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuBarPrivate : public QQuickContainerPrivate -{ - Q_DECLARE_PUBLIC(QQuickMenuBar) - -public: - static QQuickMenuBarPrivate *get(QQuickMenuBar *menuBar) - { - return menuBar->d_func(); - } - - QQmlListProperty menus(); - QQmlListProperty contentData(); - - QQuickItem *beginCreateItem(); - void completeCreateItem(); - - QQuickItem *createItem(QQuickMenu *menu); - - void toggleCurrentMenu(bool visible, bool activate); - void activateItem(QQuickMenuBarItem *item); - void activateNextItem(); - void activatePreviousItem(); - - void onItemHovered(); - void onItemTriggered(); - void onMenuAboutToHide(); - - qreal getContentWidth() const override; - qreal getContentHeight() const override; - - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - - static void contentData_append(QQmlListProperty *prop, QObject *obj); - - static void menus_append(QQmlListProperty *prop, QQuickMenu *obj); - static int menus_count(QQmlListProperty *prop); - static QQuickMenu *menus_at(QQmlListProperty *prop, int index); - static void menus_clear(QQmlListProperty *prop); - - bool popupMode = false; - bool triggering = false; - QQmlComponent *delegate = nullptr; - QPointer currentItem; -}; - -QT_END_NAMESPACE - -#endif // QQUICKMENUBAR_P_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenu.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenu.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenu.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenu.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -36,23 +36,11 @@ #include "qquickmenu_p.h" #include "qquickmenu_p_p.h" -#include "qquickmenuitem_p_p.h" -#include "qquickmenubaritem_p.h" -#include "qquickmenubar_p.h" +#include "qquickmenuitem_p.h" +#include "qquickcontrol_p_p.h" #include "qquickpopupitem_p_p.h" -#include "qquickpopuppositioner_p_p.h" -#include "qquickaction_p.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -62,9 +50,6 @@ QT_BEGIN_NAMESPACE -// copied from qfusionstyle.cpp -static const int SUBMENU_DELAY = 225; - /*! \qmltype Menu \inherits Popup @@ -83,37 +68,6 @@ \li Popup menus; for example, a menu that is shown after clicking a button \endlist - When used as a context menu, the recommended way of opening the menu is to call - \l popup(). Unless a position is explicitly specified, the menu is positioned at - the mouse cursor on desktop platforms that have a mouse cursor available, and - otherwise centered over its parent item. - - \code - MouseArea { - anchors.fill: parent - acceptedButtons: Qt.LeftButton | Qt.RightButton - onClicked: { - if (mouse.button === Qt.RightButton) - contextMenu.popup() - } - onPressAndHold: { - if (mouse.source === Qt.MouseEventNotSynthesized) - contextMenu.popup() - } - - Menu { - id: contextMenu - MenuItem { text: "Cut" } - MenuItem { text: "Copy" } - MenuItem { text: "Paste" } - } - } - \endcode - - When used as a popup menu, it is easiest to specify the position by specifying - the desired \l {Popup::}{x} and \l {Popup::}{y} coordinates using the respective - properties, and call \l {Popup::}{open()} to open the menu. - \code Button { id: fileButton @@ -137,30 +91,6 @@ } \endcode - Since QtQuick.Controls 2.3 (Qt 5.10), it is also possible to create sub-menus - and declare Action objects inside Menu: - - \code - Menu { - Action { text: "Cut" } - Action { text: "Copy" } - Action { text: "Paste" } - - MenuSeparator { } - - Menu { - title: "Find/Replace" - Action { text: "Find Next" } - Action { text: "Find Previous" } - Action { text: "Replace" } - } - } - \endcode - - Sub-menus are \l {cascade}{cascading} by default on desktop platforms - that have a mouse cursor available. Non-cascading menus are shown one - menu at a time, and centered over the parent menu. - Typically, menu items are statically declared as children of the menu, but Menu also provides API to \l {addItem}{add}, \l {insertItem}{insert}, \l {moveItem}{move} and \l {removeItem}{remove} items dynamically. The @@ -170,45 +100,14 @@ Although \l {MenuItem}{MenuItems} are most commonly used with Menu, it can contain any type of item. - \sa {Customizing Menu}, MenuItem, {Menu Controls}, {Popup Controls} + \sa {Customizing Menu}, {Menu Controls}, {Popup Controls} */ -/*! - \qmlproperty bool QtQuick.Controls::Menu::focus - - This property holds whether the popup wants focus. - - When the popup actually receives focus, \l activeFocus will be \c true. - For more information, see \l {Keyboard Focus in Qt Quick}. - - The default value is \c false. - - \sa activeFocus -*/ - -static const QQuickPopup::ClosePolicy cascadingSubMenuClosePolicy = QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutsideParent; - -static bool shouldCascade() -{ -#if QT_CONFIG(cursor) - return QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::MultipleWindows); -#else - return false; -#endif -} - -class QQuickMenuPositioner : public QQuickPopupPositioner -{ -public: - QQuickMenuPositioner(QQuickMenu *menu) : QQuickPopupPositioner(menu) { } - - void reposition() override; -}; - QQuickMenuPrivate::QQuickMenuPrivate() + : contentItem(nullptr), + contentModel(nullptr) { Q_Q(QQuickMenu); - cascade = shouldCascade(); contentModel = new QQmlObjectModel(q); } @@ -226,18 +125,14 @@ if (complete) resizeItem(item); QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Destroyed | QQuickItemPrivate::Parent); - QQuickItemPrivate::get(item)->updateOrAddGeometryChangeListener(this, QQuickGeometryChange::Width); contentModel->insert(index, item); QQuickMenuItem *menuItem = qobject_cast(item); if (menuItem) { Q_Q(QQuickMenu); - QQuickMenuItemPrivate::get(menuItem)->setMenu(q); - if (QQuickMenu *subMenu = menuItem->subMenu()) - QQuickMenuPrivate::get(subMenu)->setParentMenu(q); - QObjectPrivate::connect(menuItem, &QQuickMenuItem::triggered, this, &QQuickMenuPrivate::onItemTriggered); + QObjectPrivate::connect(menuItem, &QQuickMenuItem::pressed, this, &QQuickMenuPrivate::onItemPressed); + QObject::connect(menuItem, &QQuickMenuItem::triggered, q, &QQuickPopup::close); QObjectPrivate::connect(menuItem, &QQuickItem::activeFocusChanged, this, &QQuickMenuPrivate::onItemActiveFocusChanged); - QObjectPrivate::connect(menuItem, &QQuickControl::hoveredChanged, this, &QQuickMenuPrivate::onItemHovered); } } @@ -251,69 +146,18 @@ contentData.removeOne(item); QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Destroyed | QQuickItemPrivate::Parent); - QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Geometry); item->setParentItem(nullptr); contentModel->remove(index); QQuickMenuItem *menuItem = qobject_cast(item); if (menuItem) { - QQuickMenuItemPrivate::get(menuItem)->setMenu(nullptr); - if (QQuickMenu *subMenu = menuItem->subMenu()) - QQuickMenuPrivate::get(subMenu)->setParentMenu(nullptr); - QObjectPrivate::disconnect(menuItem, &QQuickMenuItem::triggered, this, &QQuickMenuPrivate::onItemTriggered); + Q_Q(QQuickMenu); + QObjectPrivate::disconnect(menuItem, &QQuickMenuItem::pressed, this, &QQuickMenuPrivate::onItemPressed); + QObject::disconnect(menuItem, &QQuickMenuItem::triggered, q, &QQuickPopup::close); QObjectPrivate::disconnect(menuItem, &QQuickItem::activeFocusChanged, this, &QQuickMenuPrivate::onItemActiveFocusChanged); - QObjectPrivate::disconnect(menuItem, &QQuickControl::hoveredChanged, this, &QQuickMenuPrivate::onItemHovered); } } -QQuickItem *QQuickMenuPrivate::beginCreateItem() -{ - Q_Q(QQuickMenu); - if (!delegate) - return nullptr; - - QQmlContext *creationContext = delegate->creationContext(); - if (!creationContext) - creationContext = qmlContext(q); - QQmlContext *context = new QQmlContext(creationContext, q); - context->setContextObject(q); - - QObject *object = delegate->beginCreate(context); - QQuickItem *item = qobject_cast(object); - if (!item) - delete object; - - QQml_setParent_noEvent(item, q); - - return item; -} - -void QQuickMenuPrivate::completeCreateItem() -{ - if (!delegate) - return; - - delegate->completeCreate(); -} - -QQuickItem *QQuickMenuPrivate::createItem(QQuickMenu *menu) -{ - QQuickItem *item = beginCreateItem(); - if (QQuickMenuItem *menuItem = qobject_cast(item)) - QQuickMenuItemPrivate::get(menuItem)->setSubMenu(menu); - completeCreateItem(); - return item; -} - -QQuickItem *QQuickMenuPrivate::createItem(QQuickAction *action) -{ - QQuickItem *item = beginCreateItem(); - if (QQuickAbstractButton *button = qobject_cast(item)) - button->setAction(action); - completeCreateItem(); - return item; -} - void QQuickMenuPrivate::resizeItem(QQuickItem *item) { if (!item || !contentItem) @@ -373,132 +217,18 @@ removeItem(index, item); } -void QQuickMenuPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange, const QRectF &) +void QQuickMenuPrivate::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &) { - if (!complete) - return; - - if (item == contentItem) { - // The contentItem's geometry changed, so resize any items - // that don't have explicit widths set so that they fill the width of the menu. + if (complete) resizeItems(); - } else { - // The geometry of an item in the menu changed. If the item - // doesn't have an explicit width set, make it fill the width of the menu. - resizeItem(item); - } } -QQuickPopupPositioner *QQuickMenuPrivate::getPositioner() +void QQuickMenuPrivate::onItemPressed() { Q_Q(QQuickMenu); - if (!positioner) - positioner = new QQuickMenuPositioner(q); - return positioner; -} - -void QQuickMenuPositioner::reposition() -{ - QQuickMenu *menu = static_cast(popup()); - QQuickMenuPrivate *p = QQuickMenuPrivate::get(menu); - if (p->parentMenu) { - if (p->cascade) { - if (p->popupItem->isMirrored()) - menu->setPosition(QPointF(-menu->width() - p->parentMenu->leftPadding() + menu->overlap(), -menu->topPadding())); - else if (p->parentItem) - menu->setPosition(QPointF(p->parentItem->width() + p->parentMenu->rightPadding() - menu->overlap(), -menu->topPadding())); - } else { - menu->setPosition(QPointF(p->parentMenu->x() + (p->parentMenu->width() - menu->width()) / 2, - p->parentMenu->y() + (p->parentMenu->height() - menu->height()) / 2)); - } - } - QQuickPopupPositioner::reposition(); -} - -bool QQuickMenuPrivate::prepareEnterTransition() -{ - Q_Q(QQuickMenu); - if (parentMenu && !cascade) - parentMenu->close(); - - // If a cascading sub-menu doesn't have enough space to open on - // the right, it flips on the other side of the parent menu. - allowHorizontalFlip = cascade && parentMenu; - - if (!QQuickPopupPrivate::prepareEnterTransition()) - return false; - - if (!hasClosePolicy) { - if (cascade && parentMenu) - closePolicy = cascadingSubMenuClosePolicy; - else - q->resetClosePolicy(); - } - return true; -} - -bool QQuickMenuPrivate::prepareExitTransition() -{ - if (!QQuickPopupPrivate::prepareExitTransition()) - return false; - - stopHoverTimer(); - - QQuickMenu *subMenu = currentSubMenu(); - while (subMenu) { - QPointer currentSubMenuItem = QQuickMenuPrivate::get(subMenu)->currentItem; - subMenu->close(); - subMenu = currentSubMenuItem ? currentSubMenuItem->subMenu() : nullptr; - } - return true; -} - -bool QQuickMenuPrivate::blockInput(QQuickItem *item, const QPointF &point) const -{ - // keep the parent menu open when a cascading sub-menu (this menu) is interacted with - return (cascade && parentMenu && contains(point)) || QQuickPopupPrivate::blockInput(item, point); -} - -void QQuickMenuPrivate::onItemHovered() -{ - Q_Q(QQuickMenu); - QQuickAbstractButton *button = qobject_cast(q->sender()); - if (!button || !button->isHovered() || QQuickAbstractButtonPrivate::get(button)->touchId != -1) - return; - - QQuickMenuItem *oldCurrentItem = currentItem; - - int index = contentModel->indexOf(button, nullptr); - if (index != -1) { - setCurrentIndex(index, Qt::OtherFocusReason); - if (oldCurrentItem != currentItem) { - if (oldCurrentItem) { - QQuickMenu *subMenu = oldCurrentItem->subMenu(); - if (subMenu) - subMenu->close(); - } - if (currentItem) { - QQuickMenu *subMenu = currentItem->menu(); - if (subMenu && subMenu->cascade()) - startHoverTimer(); - } - } - } -} - -void QQuickMenuPrivate::onItemTriggered() -{ - Q_Q(QQuickMenu); - QQuickMenuItem *item = qobject_cast(q->sender()); - if (!item) - return; - - if (QQuickMenu *subMenu = item->subMenu()) { - auto subMenuPrivate = QQuickMenuPrivate::get(subMenu); - subMenu->popup(subMenuPrivate->firstEnabledMenuItem()); - } else { - q->dismiss(); - } + QQuickItem *item = qobject_cast(q->sender()); + if (item) + item->forceActiveFocus(); } void QQuickMenuPrivate::onItemActiveFocusChanged() @@ -509,174 +239,52 @@ return; int indexOfItem = contentModel->indexOf(item, nullptr); - QQuickControl *control = qobject_cast(item); - setCurrentIndex(indexOfItem, control ? control->focusReason() : Qt::OtherFocusReason); -} - -QQuickMenu *QQuickMenuPrivate::currentSubMenu() const -{ - if (!currentItem) - return nullptr; - - return currentItem->subMenu(); + setCurrentIndex(indexOfItem); } -void QQuickMenuPrivate::setParentMenu(QQuickMenu *parent) +int QQuickMenuPrivate::currentIndex() const { - Q_Q(QQuickMenu); - if (parentMenu == parent) - return; - - if (parentMenu) { - QObject::disconnect(parentMenu.data(), &QQuickMenu::cascadeChanged, q, &QQuickMenu::setCascade); - disconnect(parentMenu.data(), &QQuickMenu::parentChanged, this, &QQuickMenuPrivate::resolveParentItem); - } - if (parent) { - QObject::connect(parent, &QQuickMenu::cascadeChanged, q, &QQuickMenu::setCascade); - connect(parent, &QQuickMenu::parentChanged, this, &QQuickMenuPrivate::resolveParentItem); - } - - parentMenu = parent; - q->resetCascade(); - resolveParentItem(); + QVariant index = contentItem->property("currentIndex"); + if (!index.isValid()) + return -1; + return index.toInt(); } -static QQuickItem *findParentMenuItem(QQuickMenu *subMenu) -{ - QQuickMenu *menu = QQuickMenuPrivate::get(subMenu)->parentMenu; - for (int i = 0; i < QQuickMenuPrivate::get(menu)->contentModel->count(); ++i) { - QQuickMenuItem *item = qobject_cast(menu->itemAt(i)); - if (item && item->subMenu() == subMenu) - return item; - } - return nullptr; -} - -void QQuickMenuPrivate::resolveParentItem() +void QQuickMenuPrivate::setCurrentIndex(int index) { - Q_Q(QQuickMenu); - if (!parentMenu) - q->resetParentItem(); - else if (!cascade) - q->setParentItem(parentMenu->parentItem()); - else - q->setParentItem(findParentMenuItem(q)); -} - -void QQuickMenuPrivate::propagateKeyEvent(QKeyEvent *event) -{ - if (QQuickMenuItem *menuItem = qobject_cast(parentItem)) { - if (QQuickMenu *menu = menuItem->menu()) - QQuickMenuPrivate::get(menu)->propagateKeyEvent(event); - } else if (QQuickMenuBarItem *menuBarItem = qobject_cast(parentItem)) { - if (QQuickMenuBar *menuBar = menuBarItem->menuBar()) { - event->accept(); - QCoreApplication::sendEvent(menuBar, event); - } - } + contentItem->setProperty("currentIndex", index); } -void QQuickMenuPrivate::startHoverTimer() +void QQuickMenuPrivate::activateNextItem() { - Q_Q(QQuickMenu); - stopHoverTimer(); - hoverTimer = q->startTimer(SUBMENU_DELAY); -} - -void QQuickMenuPrivate::stopHoverTimer() -{ - Q_Q(QQuickMenu); - if (!hoverTimer) - return; - - q->killTimer(hoverTimer); - hoverTimer = 0; -} - -void QQuickMenuPrivate::setCurrentIndex(int index, Qt::FocusReason reason) -{ - Q_Q(QQuickMenu); - if (currentIndex == index) - return; - - QQuickMenuItem *newCurrentItem = qobject_cast(itemAt(index)); - if (currentItem != newCurrentItem) { - stopHoverTimer(); - if (currentItem) { - currentItem->setHighlighted(false); - if (!newCurrentItem && window) { - QQuickItem *focusItem = QQuickItemPrivate::get(contentItem)->subFocusItem; - if (focusItem) - QQuickWindowPrivate::get(window)->clearFocusInScope(contentItem, focusItem, Qt::OtherFocusReason); - } - } - if (newCurrentItem) { - newCurrentItem->setHighlighted(true); - newCurrentItem->forceActiveFocus(reason); - } - currentItem = newCurrentItem; - } - - currentIndex = index; - emit q->currentIndexChanged(); -} - -bool QQuickMenuPrivate::activateNextItem() -{ - int index = currentIndex; + int index = currentIndex(); int count = contentModel->count(); while (++index < count) { QQuickItem *item = itemAt(index); - if (!item || !item->activeFocusOnTab() || !item->isEnabled()) + if (!item || !item->activeFocusOnTab()) continue; - setCurrentIndex(index, Qt::TabFocusReason); - return true; + item->forceActiveFocus(Qt::TabFocusReason); + break; } - return false; } -bool QQuickMenuPrivate::activatePreviousItem() +void QQuickMenuPrivate::activatePreviousItem() { - int index = currentIndex; + int index = currentIndex(); while (--index >= 0) { QQuickItem *item = itemAt(index); - if (!item || !item->activeFocusOnTab() || !item->isEnabled()) - continue; - setCurrentIndex(index, Qt::BacktabFocusReason); - return true; - } - return false; -} - -QQuickMenuItem *QQuickMenuPrivate::firstEnabledMenuItem() const -{ - for (int i = 0; i < contentModel->count(); ++i) { - QQuickItem *item = itemAt(i); - if (!item || !item->isEnabled()) + if (!item || !item->activeFocusOnTab()) continue; - - QQuickMenuItem *menuItem = qobject_cast(item); - if (!menuItem) - continue; - - return menuItem; + item->forceActiveFocus(Qt::BacktabFocusReason); + break; } - return nullptr; } void QQuickMenuPrivate::contentData_append(QQmlListProperty *prop, QObject *obj) { - QQuickMenu *q = qobject_cast(prop->object); - QQuickMenuPrivate *p = QQuickMenuPrivate::get(q); - + QQuickMenuPrivate *p = static_cast(prop->data); + QQuickMenu *q = static_cast(prop->object); QQuickItem *item = qobject_cast(obj); - if (!item) { - if (QQuickAction *action = qobject_cast(obj)) - item = p->createItem(action); - else if (QQuickMenu *menu = qobject_cast(obj)) - item = p->createItem(menu); - } - if (item) { if (QQuickItemPrivate::get(item)->isTransparentForPositioner()) { QQuickItemPrivate::get(item)->addItemChangeListener(p, QQuickItemPrivate::SiblingOrder); @@ -691,28 +299,26 @@ int QQuickMenuPrivate::contentData_count(QQmlListProperty *prop) { - QQuickMenu *q = static_cast(prop->object); - return QQuickMenuPrivate::get(q)->contentData.count(); + QQuickMenuPrivate *p = static_cast(prop->data); + return p->contentData.count(); } QObject *QQuickMenuPrivate::contentData_at(QQmlListProperty *prop, int index) { - QQuickMenu *q = static_cast(prop->object); - return QQuickMenuPrivate::get(q)->contentData.value(index); + QQuickMenuPrivate *p = static_cast(prop->data); + return p->contentData.value(index); } void QQuickMenuPrivate::contentData_clear(QQmlListProperty *prop) { - QQuickMenu *q = static_cast(prop->object); - QQuickMenuPrivate::get(q)->contentData.clear(); + QQuickMenuPrivate *p = static_cast(prop->data); + p->contentData.clear(); } QQuickMenu::QQuickMenu(QObject *parent) : QQuickPopup(*(new QQuickMenuPrivate), parent) { - Q_D(QQuickMenu); setFocus(true); - connect(d->contentModel, &QQmlObjectModel::countChanged, this, &QQuickMenu::countChanged); } /*! @@ -781,247 +387,22 @@ } /*! - \deprecated \qmlmethod void QtQuick.Controls::Menu::removeItem(int index) - Use Menu::removeItem(Item) or Menu::takeItem(int) instead. -*/ -void QQuickMenu::removeItem(const QVariant &var) -{ - if (var.userType() == QMetaType::Nullptr) - return; - - if (QQuickItem *item = var.value()) - removeItem(item); - else - takeItem(var.toInt()); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Menu::removeItem(Item item) - - Removes and destroys the specified \a item. -*/ -void QQuickMenu::removeItem(QQuickItem *item) -{ - Q_D(QQuickMenu); - if (!item) - return; - - const int index = d->contentModel->indexOf(item, nullptr); - if (index == -1) - return; - - d->removeItem(index, item); - item->deleteLater(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod MenuItem QtQuick.Controls::Menu::takeItem(int index) - - Removes and returns the item at \a index. + Removes the item at \a index. \note The ownership of the item is transferred to the caller. */ -QQuickItem *QQuickMenu::takeItem(int index) +void QQuickMenu::removeItem(int index) { Q_D(QQuickMenu); const int count = d->contentModel->count(); if (index < 0 || index >= count) - return nullptr; + return; QQuickItem *item = itemAt(index); if (item) d->removeItem(index, item); - return item; -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod Menu QtQuick.Controls::Menu::menuAt(int index) - - Returns the sub-menu at \a index, or \c null if the index is not valid or - there is no sub-menu at the specified index. -*/ -QQuickMenu *QQuickMenu::menuAt(int index) const -{ - Q_D(const QQuickMenu); - QQuickMenuItem *item = qobject_cast(d->itemAt(index)); - if (!item) - return nullptr; - - return item->subMenu(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Menu::addMenu(Menu menu) - - Adds \a menu as a sub-menu to the end of this menu. -*/ -void QQuickMenu::addMenu(QQuickMenu *menu) -{ - Q_D(QQuickMenu); - insertMenu(d->contentModel->count(), menu); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Menu::insertMenu(int index, Menu menu) - - Inserts \a menu as a sub-menu at \a index. The index is within all items in the menu. -*/ -void QQuickMenu::insertMenu(int index, QQuickMenu *menu) -{ - Q_D(QQuickMenu); - if (!menu) - return; - - insertItem(index, d->createItem(menu)); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Menu::removeMenu(Menu menu) - - Removes and destroys the specified \a menu. -*/ -void QQuickMenu::removeMenu(QQuickMenu *menu) -{ - Q_D(QQuickMenu); - if (!menu) - return; - - const int count = d->contentModel->count(); - for (int i = 0; i < count; ++i) { - QQuickMenuItem *item = qobject_cast(d->itemAt(i)); - if (!item || item->subMenu() != menu) - continue; - - removeItem(item); - break; - } - - menu->deleteLater(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod Menu QtQuick.Controls::Menu::takeMenu(int index) - - Removes and returns the menu at \a index. The index is within all items in the menu. - - \note The ownership of the menu is transferred to the caller. -*/ -QQuickMenu *QQuickMenu::takeMenu(int index) -{ - Q_D(QQuickMenu); - QQuickMenuItem *item = qobject_cast(d->itemAt(index)); - if (!item) - return nullptr; - - QQuickMenu *subMenu = item->subMenu(); - if (!subMenu) - return nullptr; - - d->removeItem(index, item); - item->deleteLater(); - return subMenu; -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod Action QtQuick.Controls::Menu::actionAt(int index) - - Returns the action at \a index, or \c null if the index is not valid or - there is no action at the specified index. -*/ -QQuickAction *QQuickMenu::actionAt(int index) const -{ - Q_D(const QQuickMenu); - QQuickAbstractButton *item = qobject_cast(d->itemAt(index)); - if (!item) - return nullptr; - - return item->action(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Menu::addAction(Action action) - - Adds \a action to the end of this menu. -*/ -void QQuickMenu::addAction(QQuickAction *action) -{ - Q_D(QQuickMenu); - insertAction(d->contentModel->count(), action); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Menu::insertAction(int index, Action action) - - Inserts \a action at \a index. The index is within all items in the menu. -*/ -void QQuickMenu::insertAction(int index, QQuickAction *action) -{ - Q_D(QQuickMenu); - if (!action) - return; - - insertItem(index, d->createItem(action)); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Menu::removeAction(Action action) - - Removes and destroys the specified \a action. -*/ -void QQuickMenu::removeAction(QQuickAction *action) -{ - Q_D(QQuickMenu); - if (!action) - return; - - const int count = d->contentModel->count(); - for (int i = 0; i < count; ++i) { - QQuickMenuItem *item = qobject_cast(d->itemAt(i)); - if (!item || item->action() != action) - continue; - - removeItem(item); - break; - } - - action->deleteLater(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod Action QtQuick.Controls::Menu::takeAction(int index) - - Removes and returns the action at \a index. The index is within all items in the menu. - - \note The ownership of the action is transferred to the caller. -*/ -QQuickAction *QQuickMenu::takeAction(int index) -{ - Q_D(QQuickMenu); - QQuickMenuItem *item = qobject_cast(d->itemAt(index)); - if (!item) - return nullptr; - - QQuickAction *action = item->action(); - if (!action) - return nullptr; - - d->removeItem(index, item); - item->deleteLater(); - return action; } /*! @@ -1071,7 +452,7 @@ Q_D(QQuickMenu); if (!d->contentItem) QQuickControlPrivate::get(d->popupItem)->executeContentItem(); - return QQmlListProperty(this, nullptr, + return QQmlListProperty(this, d, QQuickMenuPrivate::contentData_append, QQuickMenuPrivate::contentData_count, QQuickMenuPrivate::contentData_at, @@ -1099,300 +480,7 @@ if (title == d->title) return; d->title = title; - emit titleChanged(title); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::Menu::cascade - - This property holds whether the menu cascades its sub-menus. - - The default value is platform-specific. Menus are cascading by default on - desktop platforms that have a mouse cursor available. Non-cascading menus - are shown one menu at a time, and centered over the parent menu. - - \note Changing the value of the property has no effect while the menu is open. - - \sa overlap -*/ -bool QQuickMenu::cascade() const -{ - Q_D(const QQuickMenu); - return d->cascade; -} - -void QQuickMenu::setCascade(bool cascade) -{ - Q_D(QQuickMenu); - if (d->cascade == cascade) - return; - d->cascade = cascade; - if (d->parentMenu) - d->resolveParentItem(); - emit cascadeChanged(cascade); -} - -void QQuickMenu::resetCascade() -{ - Q_D(QQuickMenu); - if (d->parentMenu) - setCascade(d->parentMenu->cascade()); - else - setCascade(shouldCascade()); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty real QtQuick.Controls::Menu::overlap - - This property holds the amount of pixels by which the menu horizontally overlaps its parent menu. - - The property only has effect when the menu is used as a cascading sub-menu. - - The default value is style-specific. - - \note Changing the value of the property has no effect while the menu is open. - - \sa cascade -*/ -qreal QQuickMenu::overlap() const -{ - Q_D(const QQuickMenu); - return d->overlap; -} - -void QQuickMenu::setOverlap(qreal overlap) -{ - Q_D(QQuickMenu); - if (d->overlap == overlap) - return; - d->overlap = overlap; - emit overlapChanged(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty Component QtQuick.Controls::Menu::delegate - - This property holds the component that is used to create items - to present actions. - - \code - Menu { - Action { text: "Cut" } - Action { text: "Copy" } - Action { text: "Paste" } - } - \endcode - - \sa Action -*/ -QQmlComponent *QQuickMenu::delegate() const -{ - Q_D(const QQuickMenu); - return d->delegate; -} - -void QQuickMenu::setDelegate(QQmlComponent *delegate) -{ - Q_D(QQuickMenu); - if (d->delegate == delegate) - return; - - d->delegate = delegate; - emit delegateChanged(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty int QtQuick.Controls::Menu::currentIndex - - This property holds the index of the currently highlighted item. - - Menu items can be highlighted by mouse hover or keyboard navigation. - - \sa MenuItem::highlighted -*/ -int QQuickMenu::currentIndex() const -{ - Q_D(const QQuickMenu); - return d->currentIndex; -} - -void QQuickMenu::setCurrentIndex(int index) -{ - Q_D(QQuickMenu); - d->setCurrentIndex(index, Qt::OtherFocusReason); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty int QtQuick.Controls::Menu::count - \readonly - - This property holds the number of items. -*/ -int QQuickMenu::count() const -{ - Q_D(const QQuickMenu); - return d->contentModel->count(); -} - -void QQuickMenu::popup(QQuickItem *menuItem) -{ - Q_D(QQuickMenu); - // No position has been explicitly specified, so position the menu at the mouse cursor - // on desktop platforms that have a mouse cursor available and support multiple windows. - QQmlNullableValue pos; -#if QT_CONFIG(cursor) - if (d->parentItem && QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::MultipleWindows)) - pos = d->parentItem->mapFromGlobal(QCursor::pos()); -#endif - - // As a fallback, center the menu over its parent item. - if (pos.isNull && d->parentItem) - pos = QPointF((d->parentItem->width() - width()) / 2, (d->parentItem->height() - height()) / 2); - - popup(pos.isNull ? QPointF() : pos.value, menuItem); -} - -void QQuickMenu::popup(const QPointF &pos, QQuickItem *menuItem) -{ - Q_D(QQuickMenu); - qreal offset = 0; -#if QT_CONFIG(cursor) - if (menuItem) - offset = d->popupItem->mapFromItem(menuItem, QPointF(0, 0)).y(); -#endif - setPosition(pos - QPointF(0, offset)); - - if (menuItem) - d->setCurrentIndex(d->contentModel->indexOf(menuItem, nullptr), Qt::PopupFocusReason); - open(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Menu::popup(MenuItem item = null) - \qmlmethod void QtQuick.Controls::Menu::popup(Item parent, MenuItem item = null) - - Opens the menu at the mouse cursor on desktop platforms that have a mouse cursor - available, and otherwise centers the menu over its \a parent item. - - The menu can be optionally aligned to a specific menu \a item. - - \sa Popup::open() -*/ - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Menu::popup(point pos, MenuItem item = null) - \qmlmethod void QtQuick.Controls::Menu::popup(Item parent, point pos, MenuItem item = null) - - Opens the menu at the specified position \a pos in the popups coordinate system, - that is, a coordinate relative to its \a parent item. - - The menu can be optionally aligned to a specific menu \a item. - - \sa Popup::open() -*/ - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Menu::popup(real x, real y, MenuItem item = null) - \qmlmethod void QtQuick.Controls::Menu::popup(Item parent, real x, real y, MenuItem item = null) - - Opens the menu at the specified position \a x, \a y in the popups coordinate system, - that is, a coordinate relative to its \a parent item. - - The menu can be optionally aligned to a specific menu \a item. - - \sa dismiss(), Popup::open() -*/ -void QQuickMenu::popup(QQmlV4Function *args) -{ - Q_D(QQuickMenu); - const int len = args->length(); - if (len > 4) { - args->v4engine()->throwTypeError(); - return; - } - - QV4::ExecutionEngine *v4 = args->v4engine(); - QV4::Scope scope(v4); - - QQmlNullableValue pos; - QQuickItem *menuItem = nullptr; - QQuickItem *parentItem = nullptr; - - if (len > 0) { - // Item parent - QV4::ScopedValue firstArg(scope, (*args)[0]); - if (const QV4::QObjectWrapper *obj = firstArg->as()) { - QQuickItem *item = qobject_cast(obj->object()); - if (item && !d->popupItem->isAncestorOf(item)) - parentItem = item; - } else if (firstArg->isUndefined()) { - resetParentItem(); - parentItem = d->parentItem; - } - - // MenuItem item - QV4::ScopedValue lastArg(scope, (*args)[len - 1]); - if (const QV4::QObjectWrapper *obj = lastArg->as()) { - QQuickItem *item = qobject_cast(obj->object()); - if (item && d->popupItem->isAncestorOf(item)) - menuItem = item; - } - } - - if (len >= 3 || (!parentItem && len >= 2)) { - // real x, real y - QV4::ScopedValue xArg(scope, (*args)[parentItem ? 1 : 0]); - QV4::ScopedValue yArg(scope, (*args)[parentItem ? 2 : 1]); - if (xArg->isNumber() && yArg->isNumber()) - pos = QPointF(xArg->asDouble(), yArg->asDouble()); - } - - if (pos.isNull && (len >= 2 || (!parentItem && len >= 1))) { - // point pos - QV4::ScopedValue posArg(scope, (*args)[parentItem ? 1 : 0]); - const QVariant var = v4->toVariant(posArg, -1); - if (var.userType() == QMetaType::QPointF) - pos = var.toPointF(); - } - - if (parentItem) - setParentItem(parentItem); - - if (pos.isNull) - popup(menuItem); - else - popup(pos, menuItem); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlmethod void QtQuick.Controls::Menu::dismiss() - - Closes all menus in the hierarchy that this menu belongs to. - - \note Unlike \l {Popup::}{close()} that only closes a menu and its sub-menus, - \c dismiss() closes the whole hierarchy of menus, including the parent menus. - In practice, \c close() is suitable e.g. for implementing navigation in a - hierarchy of menus, and \c dismiss() is the appropriate method for closing - the whole hierarchy of menus. - - \sa popup(), Popup::close() -*/ -void QQuickMenu::dismiss() -{ - QQuickMenu *menu = this; - while (menu) { - menu->close(); - menu = QQuickMenuPrivate::get(menu)->parentMenu; - } + emit titleChanged(); } void QQuickMenu::componentComplete() @@ -1407,14 +495,10 @@ Q_D(QQuickMenu); QQuickPopup::contentItemChange(newItem, oldItem); - if (oldItem) { + if (oldItem) QQuickItemPrivate::get(oldItem)->removeItemChangeListener(d, QQuickItemPrivate::Children); - QQuickItemPrivate::get(oldItem)->removeItemChangeListener(d, QQuickItemPrivate::Geometry); - } - if (newItem) { + if (newItem) QQuickItemPrivate::get(newItem)->addItemChangeListener(d, QQuickItemPrivate::Children); - QQuickItemPrivate::get(newItem)->updateOrAddGeometryChangeListener(d, QQuickGeometryChange::Width); - } d->contentItem = newItem; } @@ -1425,18 +509,26 @@ QQuickPopup::itemChange(change, data); if (change == QQuickItem::ItemVisibleHasChanged) { - if (!data.boolValue && d->cascade) { + if (!data.boolValue) { // Ensure that when the menu isn't visible, there's no current item // the next time it's opened. - d->setCurrentIndex(-1, Qt::OtherFocusReason); + QQuickItem *focusItem = QQuickItemPrivate::get(d->contentItem)->subFocusItem; + if (focusItem) { + QQuickWindow *window = QQuickPopup::window(); + if (window) + QQuickWindowPrivate::get(window)->clearFocusInScope(d->contentItem, focusItem, Qt::OtherFocusReason); + } + d->setCurrentIndex(-1); } } } -void QQuickMenu::keyPressEvent(QKeyEvent *event) +void QQuickMenu::keyReleaseEvent(QKeyEvent *event) { Q_D(QQuickMenu); - QQuickPopup::keyPressEvent(event); + QQuickPopup::keyReleaseEvent(event); + if (d->contentModel->count() == 0) + return; // QTBUG-17051 // Work around the fact that ListView has no way of distinguishing between @@ -1446,58 +538,21 @@ // shown at once. switch (event->key()) { case Qt::Key_Up: - if (!d->activatePreviousItem()) - d->propagateKeyEvent(event); + d->activatePreviousItem(); break; case Qt::Key_Down: d->activateNextItem(); break; - case Qt::Key_Left: - case Qt::Key_Right: - event->ignore(); - if (d->popupItem->isMirrored() == (event->key() == Qt::Key_Right)) { - if (d->parentMenu && d->currentItem) { - if (!d->cascade) - d->parentMenu->open(); - close(); - event->accept(); - } - } else { - if (QQuickMenu *subMenu = d->currentSubMenu()) { - auto subMenuPrivate = QQuickMenuPrivate::get(subMenu); - subMenu->popup(subMenuPrivate->firstEnabledMenuItem()); - event->accept(); - } - } - if (!event->isAccepted()) - d->propagateKeyEvent(event); - break; - default: break; } } -void QQuickMenu::timerEvent(QTimerEvent *event) -{ - Q_D(QQuickMenu); - if (event->timerId() == d->hoverTimer) { - if (QQuickMenu *subMenu = d->currentSubMenu()) - subMenu->open(); - d->stopHoverTimer(); - } -} - QFont QQuickMenu::defaultFont() const { - return QQuickTheme::font(QQuickTheme::Menu); -} - -QPalette QQuickMenu::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::Menu); + return QQuickControlPrivate::themeFont(QPlatformTheme::MenuFont); } #if QT_CONFIG(accessibility) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenuitem.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenuitem.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenuitem.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenuitem.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -35,9 +35,7 @@ ****************************************************************************/ #include "qquickmenuitem_p.h" -#include "qquickmenuitem_p_p.h" -#include "qquickmenu_p.h" -#include "qquickdeferredexecute_p_p.h" +#include "qquickabstractbutton_p_p.h" #include #include @@ -57,10 +55,6 @@ providing a familiar way to respond to menu items being \l triggered, for example. - MenuItem inherits its API from AbstractButton. For instance, you can set - \l {AbstractButton::text}{text} and \l {Icons in Qt Quick Controls 2}{icon} - using the AbstractButton API. - \code Button { id: fileButton @@ -86,70 +80,22 @@ } \endcode - \sa {Customizing Menu}, Menu, {Menu Controls} + \sa {Customizing MenuItem}, {Menu Controls} */ -void QQuickMenuItemPrivate::setMenu(QQuickMenu *newMenu) -{ - Q_Q(QQuickMenuItem); - if (menu == newMenu) - return; - - menu = newMenu; - emit q->menuChanged(); -} - -void QQuickMenuItemPrivate::setSubMenu(QQuickMenu *newSubMenu) -{ - Q_Q(QQuickMenuItem); - if (subMenu == newSubMenu) - return; - - if (subMenu) { - QObject::disconnect(subMenu, &QQuickMenu::titleChanged, q, &QQuickAbstractButton::setText); - QObjectPrivate::disconnect(subMenu, &QQuickPopup::enabledChanged, this, &QQuickMenuItemPrivate::updateEnabled); - } - - if (newSubMenu) { - QObject::connect(newSubMenu, &QQuickMenu::titleChanged, q, &QQuickAbstractButton::setText); - QObjectPrivate::connect(newSubMenu, &QQuickPopup::enabledChanged, this, &QQuickMenuItemPrivate::updateEnabled); - q->setText(newSubMenu->title()); - } - - subMenu = newSubMenu; - updateEnabled(); - emit q->subMenuChanged(); -} - -void QQuickMenuItemPrivate::updateEnabled() -{ - Q_Q(QQuickMenuItem); - q->setEnabled(subMenu && subMenu->isEnabled()); -} - -static inline QString arrowName() { return QStringLiteral("arrow"); } - -void QQuickMenuItemPrivate::cancelArrow() +class QQuickMenuItemPrivate : public QQuickAbstractButtonPrivate { - Q_Q(QQuickAbstractButton); - quickCancelDeferred(q, arrowName()); -} + Q_DECLARE_PUBLIC(QQuickMenuItem) -void QQuickMenuItemPrivate::executeArrow(bool complete) -{ - Q_Q(QQuickMenuItem); - if (arrow.wasExecuted()) - return; +public: + QQuickMenuItemPrivate(); - if (!arrow || complete) - quickBeginDeferred(q, arrowName(), arrow); - if (complete) - quickCompleteDeferred(q, arrowName(), arrow); -} + bool highlighted; +}; -bool QQuickMenuItemPrivate::acceptKeyClick(Qt::Key key) const +QQuickMenuItemPrivate::QQuickMenuItemPrivate() + : highlighted(false) { - return key == Qt::Key_Space || key == Qt::Key_Return || key == Qt::Key_Enter; } /*! @@ -164,16 +110,20 @@ connect(this, &QQuickAbstractButton::clicked, this, &QQuickMenuItem::triggered); } +QFont QQuickMenuItem::defaultFont() const +{ + return QQuickControlPrivate::themeFont(QPlatformTheme::MenuItemFont); +} + /*! \qmlproperty bool QtQuick.Controls::MenuItem::highlighted - This property holds whether the menu item is highlighted by the user. + This property holds whether the menu item is highlighted. - A menu item can be highlighted by mouse hover or keyboard navigation. + A menu item can be highlighted in order to draw the user's attention + towards it. It has no effect on keyboard interaction. The default value is \c false. - - \sa Menu::currentIndex */ bool QQuickMenuItem::isHighlighted() const { @@ -191,84 +141,6 @@ emit highlightedChanged(); } -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty Item QtQuick.Controls::MenuItem::arrow - - This property holds the sub-menu arrow item. - - \sa {Customizing Menu} -*/ -QQuickItem *QQuickMenuItem::arrow() const -{ - QQuickMenuItemPrivate *d = const_cast(d_func()); - if (!d->arrow) - d->executeArrow(); - return d->arrow; -} - -void QQuickMenuItem::setArrow(QQuickItem *arrow) -{ - Q_D(QQuickMenuItem); - if (d->arrow == arrow) - return; - - if (!d->arrow.isExecuting()) - d->cancelArrow(); - - delete d->arrow; - d->arrow = arrow; - if (arrow && !arrow->parentItem()) - arrow->setParentItem(this); - if (!d->arrow.isExecuting()) - emit arrowChanged(); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty Menu QtQuick.Controls::MenuItem::menu - \readonly - - This property holds the menu that contains this menu item, - or \c null if the item is not in a menu. -*/ -QQuickMenu *QQuickMenuItem::menu() const -{ - Q_D(const QQuickMenuItem); - return d->menu; -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty Menu QtQuick.Controls::MenuItem::subMenu - \readonly - - This property holds the sub-menu that this item presents in - the parent menu, or \c null if this item is not a sub-menu item. -*/ -QQuickMenu *QQuickMenuItem::subMenu() const -{ - Q_D(const QQuickMenuItem); - return d->subMenu; -} - -void QQuickMenuItem::componentComplete() -{ - Q_D(QQuickMenuItem); - d->executeArrow(true); - QQuickAbstractButton::componentComplete(); -} - -QFont QQuickMenuItem::defaultFont() const -{ - return QQuickTheme::font(QQuickTheme::Menu); -} - -QPalette QQuickMenuItem::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::Menu); -} - #if QT_CONFIG(accessibility) QAccessible::Role QQuickMenuItem::accessibleRole() const { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenuitem_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenuitem_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenuitem_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenuitem_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -52,18 +52,12 @@ QT_BEGIN_NAMESPACE -class QQuickMenu; class QQuickMenuItemPrivate; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuItem : public QQuickAbstractButton { Q_OBJECT Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted NOTIFY highlightedChanged FINAL) - // 2.3 (Qt 5.10) - Q_PROPERTY(QQuickItem *arrow READ arrow WRITE setArrow NOTIFY arrowChanged FINAL REVISION 3) - Q_PROPERTY(QQuickMenu *menu READ menu NOTIFY menuChanged FINAL REVISION 3) - Q_PROPERTY(QQuickMenu *subMenu READ subMenu NOTIFY subMenuChanged FINAL REVISION 3) - Q_CLASSINFO("DeferredPropertyNames", "arrow,background,contentItem,indicator") public: explicit QQuickMenuItem(QQuickItem *parent = nullptr); @@ -71,26 +65,12 @@ bool isHighlighted() const; void setHighlighted(bool highlighted); - // 2.3 (Qt 5.10) - QQuickItem *arrow() const; - void setArrow(QQuickItem *arrow); - - QQuickMenu *menu() const; - QQuickMenu *subMenu() const; - Q_SIGNALS: void triggered(); void highlightedChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void arrowChanged(); - Q_REVISION(3) void menuChanged(); - Q_REVISION(3) void subMenuChanged(); protected: - void componentComplete() override; - QFont defaultFont() const override; - QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenuitem_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenuitem_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenuitem_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenuitem_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKMENUITEM_P_P_H -#define QQUICKMENUITEM_P_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickMenu; - -class QQuickMenuItemPrivate : public QQuickAbstractButtonPrivate -{ - Q_DECLARE_PUBLIC(QQuickMenuItem) - -public: - static QQuickMenuItemPrivate *get(QQuickMenuItem *item) - { - return item->d_func(); - } - - void setMenu(QQuickMenu *menu); - void setSubMenu(QQuickMenu *subMenu); - - void updateEnabled(); - - void cancelArrow(); - void executeArrow(bool complete = false); - - bool acceptKeyClick(Qt::Key key) const override; - - bool highlighted = false; - QQuickDeferredPointer arrow; - QQuickMenu *menu = nullptr; - QQuickMenu *subMenu = nullptr; -}; - -QT_END_NAMESPACE - -#endif // QQUICKMENUITEM_P_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenu_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenu_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenu_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenu_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -55,8 +55,6 @@ QT_BEGIN_NAMESPACE -class QQuickAction; -class QQmlComponent; class QQuickMenuItem; class QQuickMenuPrivate; @@ -65,13 +63,7 @@ Q_OBJECT Q_PROPERTY(QVariant contentModel READ contentModel CONSTANT FINAL) Q_PROPERTY(QQmlListProperty contentData READ contentData FINAL) - Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) - // 2.3 (Qt 5.10) - Q_PROPERTY(int count READ count NOTIFY countChanged FINAL REVISION 3) - Q_PROPERTY(bool cascade READ cascade WRITE setCascade RESET resetCascade NOTIFY cascadeChanged FINAL REVISION 3) - Q_PROPERTY(qreal overlap READ overlap WRITE setOverlap NOTIFY overlapChanged FINAL REVISION 3) - Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL REVISION 3) - Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL REVISION 3) + Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged) Q_CLASSINFO("DefaultProperty", "contentData") public: @@ -81,8 +73,7 @@ Q_INVOKABLE void addItem(QQuickItem *item); Q_INVOKABLE void insertItem(int index, QQuickItem *item); Q_INVOKABLE void moveItem(int from, int to); - Q_INVOKABLE void removeItem(const QVariant &item); // ### Qt 6: remove - void removeItem(QQuickItem *item); // ### Qt 6: Q_INVOKABLE + Q_INVOKABLE void removeItem(int index); QVariant contentModel() const; QQmlListProperty contentData(); @@ -90,61 +81,17 @@ QString title() const; void setTitle(QString &title); - bool cascade() const; - void setCascade(bool cascade); - void resetCascade(); - - qreal overlap() const; - void setOverlap(qreal overlap); - - QQmlComponent *delegate() const; - void setDelegate(QQmlComponent *delegate); - - int currentIndex() const; - void setCurrentIndex(int index); - - // 2.3 (Qt 5.10) - int count() const; - Q_REVISION(3) Q_INVOKABLE QQuickItem *takeItem(int index); - - Q_REVISION(3) Q_INVOKABLE QQuickMenu *menuAt(int index) const; - Q_REVISION(3) Q_INVOKABLE void addMenu(QQuickMenu *menu); - Q_REVISION(3) Q_INVOKABLE void insertMenu(int index, QQuickMenu *menu); - Q_REVISION(3) Q_INVOKABLE void removeMenu(QQuickMenu *menu); - Q_REVISION(3) Q_INVOKABLE QQuickMenu *takeMenu(int index); - - Q_REVISION(3) Q_INVOKABLE QQuickAction *actionAt(int index) const; - Q_REVISION(3) Q_INVOKABLE void addAction(QQuickAction *action); - Q_REVISION(3) Q_INVOKABLE void insertAction(int index, QQuickAction *action); - Q_REVISION(3) Q_INVOKABLE void removeAction(QQuickAction *action); - Q_REVISION(3) Q_INVOKABLE QQuickAction *takeAction(int index); - - void popup(QQuickItem *menuItem = nullptr); - void popup(const QPointF &pos, QQuickItem *menuItem = nullptr); - - Q_REVISION(3) Q_INVOKABLE void popup(QQmlV4Function *args); - Q_REVISION(3) Q_INVOKABLE void dismiss(); - protected: void componentComplete() override; void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) override; - void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; Q_SIGNALS: - void titleChanged(const QString &title); - // 2.3 (Qt 5.10) - Q_REVISION(3) void countChanged(); - Q_REVISION(3) void cascadeChanged(bool cascade); - Q_REVISION(3) void overlapChanged(); - Q_REVISION(3) void delegateChanged(); - Q_REVISION(3) void currentIndexChanged(); + void titleChanged(); protected: - void timerEvent(QTimerEvent *event) override; - QFont defaultFont() const override; - QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenu_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenu_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenu_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenu_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -51,15 +51,11 @@ #include #include -#include #include QT_BEGIN_NAMESPACE -class QQuickAction; -class QQmlComponent; class QQmlObjectModel; -class QQuickMenuItem; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate { @@ -68,22 +64,11 @@ public: QQuickMenuPrivate(); - static QQuickMenuPrivate *get(QQuickMenu *menu) - { - return menu->d_func(); - } - QQuickItem *itemAt(int index) const; void insertItem(int index, QQuickItem *item); void moveItem(int from, int to); void removeItem(int index, QQuickItem *item); - QQuickItem *beginCreateItem(); - void completeCreateItem(); - - QQuickItem *createItem(QQuickMenu *menu); - QQuickItem *createItem(QQuickAction *action); - void resizeItem(QQuickItem *item); void resizeItems(); @@ -93,45 +78,23 @@ void itemDestroyed(QQuickItem *item) override; void itemGeometryChanged(QQuickItem *, QQuickGeometryChange change, const QRectF &diff) override; - QQuickPopupPositioner *getPositioner() override; - bool prepareEnterTransition() override; - bool prepareExitTransition() override; - bool blockInput(QQuickItem *item, const QPointF &point) const override; - - void onItemHovered(); - void onItemTriggered(); + void onItemPressed(); void onItemActiveFocusChanged(); - QQuickMenu *currentSubMenu() const; - void setParentMenu(QQuickMenu *parent); - void resolveParentItem(); - - void propagateKeyEvent(QKeyEvent *event); - - void startHoverTimer(); - void stopHoverTimer(); - - void setCurrentIndex(int index, Qt::FocusReason reason); - bool activateNextItem(); - bool activatePreviousItem(); + int currentIndex() const; + void setCurrentIndex(int index); - QQuickMenuItem *firstEnabledMenuItem() const; + void activateNextItem(); + void activatePreviousItem(); static void contentData_append(QQmlListProperty *prop, QObject *obj); static int contentData_count(QQmlListProperty *prop); static QObject *contentData_at(QQmlListProperty *prop, int index); static void contentData_clear(QQmlListProperty *prop); - bool cascade = false; - int hoverTimer = 0; - int currentIndex = -1; - qreal overlap = 0; - QPointer parentMenu; - QPointer currentItem; - QQuickItem *contentItem = nullptr; // TODO: cleanup + QQuickItem *contentItem; // TODO: cleanup QVector contentData; QQmlObjectModel *contentModel; - QQmlComponent *delegate = nullptr; QString title; }; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenuseparator.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenuseparator.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenuseparator.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenuseparator.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -35,7 +35,6 @@ ****************************************************************************/ #include "qquickmenuseparator_p.h" -#include "qquickcontrol_p_p.h" QT_BEGIN_NAMESPACE @@ -54,8 +53,8 @@ \image qtquickcontrols2-menuseparator.png \quotefromfile qtquickcontrols2-menuseparator-custom.qml - \skipto import QtQuick - \printuntil import QtQuick.Controls + \skipto import QtQuick 2.6 + \printuntil import QtQuick.Controls 2.1 \skipto Menu \printto contentItem.parent: window \skipline contentItem.parent: window @@ -63,7 +62,7 @@ \printuntil } \printuntil } - \sa {Customizing Menu}, Menu, {Separator Controls} + \sa {Customizing MenuSeparator}, {Separator Controls} */ QQuickMenuSeparator::QQuickMenuSeparator(QQuickItem *parent) @@ -71,16 +70,6 @@ { } -QFont QQuickMenuSeparator::defaultFont() const -{ - return QQuickTheme::font(QQuickTheme::Menu); -} - -QPalette QQuickMenuSeparator::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::Menu); -} - #if QT_CONFIG(accessibility) QAccessible::Role QQuickMenuSeparator::accessibleRole() const { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenuseparator_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenuseparator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickmenuseparator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickmenuseparator_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -60,9 +60,6 @@ explicit QQuickMenuSeparator(QQuickItem *parent = nullptr); protected: - QFont defaultFont() const override; - QPalette defaultPalette() const override; - #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickoverlay.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickoverlay.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickoverlay.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickoverlay.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -47,25 +47,102 @@ QT_BEGIN_NAMESPACE -/*! - \qmltype Overlay - \inherits Item - \instantiates QQuickOverlay - \inqmlmodule QtQuick.Controls - \since 5.10 - \brief A window overlay for popups. - - Overlay provides a layer for popups, ensuring that popups are displayed above - other content and that the background is dimmed when a \l {Popup::}{modal} or - \l {Popup::dim}{dimmed} popup is visible. +void QQuickOverlayPrivate::popupAboutToShow() +{ + Q_Q(QQuickOverlay); + QQuickPopup *popup = qobject_cast(q->sender()); + if (!popup || !popup->dim()) + return; + + // use QQmlProperty instead of QQuickItem::setOpacity() to trigger QML Behaviors + QQuickPopupPrivate *p = QQuickPopupPrivate::get(popup); + if (p->dimmer) + QQmlProperty::write(p->dimmer, QStringLiteral("opacity"), 1.0); +} + +void QQuickOverlayPrivate::popupAboutToHide() +{ + Q_Q(QQuickOverlay); + QQuickPopup *popup = qobject_cast(q->sender()); + if (!popup || !popup->dim()) + return; + + // use QQmlProperty instead of QQuickItem::setOpacity() to trigger QML Behaviors + QQuickPopupPrivate *p = QQuickPopupPrivate::get(popup); + if (p->dimmer) + QQmlProperty::write(p->dimmer, QStringLiteral("opacity"), 0.0); +} + +static QQuickItem *createDimmer(QQmlComponent *component, QQuickPopup *popup, QQuickItem *parent) +{ + QQuickItem *item = nullptr; + if (component) { + QQmlContext *creationContext = component->creationContext(); + if (!creationContext) + creationContext = qmlContext(popup); + QQmlContext *context = new QQmlContext(creationContext, popup); + context->setContextObject(popup); + item = qobject_cast(component->beginCreate(context)); + } + + // when there is no overlay component available (with plain QQuickWindow), + // use a plain QQuickItem as a fallback to block hover events + if (!item && popup->isModal()) + item = new QQuickItem; + + if (item) { + item->setOpacity(popup->isVisible() ? 1.0 : 0.0); + item->setParentItem(parent); + item->stackBefore(popup->popupItem()); + item->setZ(popup->z()); + if (popup->isModal()) { + item->setAcceptedMouseButtons(Qt::AllButtons); +#if QT_CONFIG(cursor) + item->setCursor(Qt::ArrowCursor); +#endif +#if QT_CONFIG(quicktemplates2_hover) + // TODO: switch to QStyleHints::useHoverEffects in Qt 5.8 + item->setAcceptHoverEvents(true); + // item->setAcceptHoverEvents(QGuiApplication::styleHints()->useHoverEffects()); + // connect(QGuiApplication::styleHints(), &QStyleHints::useHoverEffectsChanged, item, &QQuickItem::setAcceptHoverEvents); +#endif + } + if (component) + component->completeCreate(); + } + return item; +} - The overlay is an ordinary Item that covers the entire window. It can be used - as a visual parent to position a popup in scene coordinates. +void QQuickOverlayPrivate::createOverlay(QQuickPopup *popup) +{ + Q_Q(QQuickOverlay); + QQuickPopupPrivate *p = QQuickPopupPrivate::get(popup); + if (!p->dimmer) + p->dimmer = createDimmer(popup->isModal() ? modal : modeless, popup, q); + p->resizeOverlay(); +} - \include qquickoverlay-popup-parent.qdocinc +void QQuickOverlayPrivate::destroyOverlay(QQuickPopup *popup) +{ + QQuickPopupPrivate *p = QQuickPopupPrivate::get(popup); + if (p->dimmer) { + p->dimmer->setParentItem(nullptr); + p->dimmer->deleteLater(); + p->dimmer = nullptr; + } +} + +void QQuickOverlayPrivate::toggleOverlay() +{ + Q_Q(QQuickOverlay); + QQuickPopup *popup = qobject_cast(q->sender()); + if (!popup) + return; - \sa ApplicationWindow -*/ + destroyOverlay(popup); + if (popup->dim()) + createOverlay(popup); +} QVector QQuickOverlayPrivate::stackingOrderPopups() const { @@ -97,6 +174,12 @@ updateGeometry(); } +QQuickOverlayPrivate::QQuickOverlayPrivate() + : modal(nullptr), + modeless(nullptr) +{ +} + bool QQuickOverlayPrivate::startDrag(QEvent *event, const QPointF &pos) { Q_Q(QQuickOverlay); @@ -370,7 +453,7 @@ QQuickItem *content = window->contentItem(); // Do not re-create the overlay if the window is being destroyed // and thus, its content item no longer has a window associated. - if (content && content->window()) { + if (content->window()) { overlay = new QQuickOverlay(window->contentItem()); window->setProperty(name, QVariant::fromValue(overlay)); } @@ -378,18 +461,37 @@ return overlay; } -QQuickOverlayAttached *QQuickOverlay::qmlAttachedProperties(QObject *object) -{ - return new QQuickOverlayAttached(object); -} - void QQuickOverlay::itemChange(ItemChange change, const ItemChangeData &data) { Q_D(QQuickOverlay); QQuickItem::itemChange(change, data); - if (change == ItemChildAddedChange || change == ItemChildRemovedChange) + QQuickPopup *popup = nullptr; + if (change == ItemChildAddedChange || change == ItemChildRemovedChange) { + popup = qobject_cast(data.item->parent()); setVisible(!d->allDrawers.isEmpty() || !childItems().isEmpty()); + } + if (!popup) + return; + + if (change == ItemChildAddedChange) { + if (popup->dim()) + d->createOverlay(popup); + QObjectPrivate::connect(popup, &QQuickPopup::dimChanged, d, &QQuickOverlayPrivate::toggleOverlay); + QObjectPrivate::connect(popup, &QQuickPopup::modalChanged, d, &QQuickOverlayPrivate::toggleOverlay); + if (!qobject_cast(popup)) { + QObjectPrivate::connect(popup, &QQuickPopup::aboutToShow, d, &QQuickOverlayPrivate::popupAboutToShow); + QObjectPrivate::connect(popup, &QQuickPopup::aboutToHide, d, &QQuickOverlayPrivate::popupAboutToHide); + } + } else if (change == ItemChildRemovedChange) { + d->destroyOverlay(popup); + QObjectPrivate::disconnect(popup, &QQuickPopup::dimChanged, d, &QQuickOverlayPrivate::toggleOverlay); + QObjectPrivate::disconnect(popup, &QQuickPopup::modalChanged, d, &QQuickOverlayPrivate::toggleOverlay); + if (!qobject_cast(popup)) { + QObjectPrivate::disconnect(popup, &QQuickPopup::aboutToShow, d, &QQuickOverlayPrivate::popupAboutToShow); + QObjectPrivate::disconnect(popup, &QQuickPopup::aboutToHide, d, &QQuickOverlayPrivate::popupAboutToHide); + } + } } void QQuickOverlay::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) @@ -552,152 +654,4 @@ return false; } -class QQuickOverlayAttachedPrivate : public QObjectPrivate -{ - Q_DECLARE_PUBLIC(QQuickOverlayAttached) - -public: - void setWindow(QQuickWindow *newWindow); - - QQuickWindow *window = nullptr; - QQmlComponent *modal = nullptr; - QQmlComponent *modeless = nullptr; -}; - -void QQuickOverlayAttachedPrivate::setWindow(QQuickWindow *newWindow) -{ - Q_Q(QQuickOverlayAttached); - if (window == newWindow) - return; - - if (QQuickOverlay *oldOverlay = QQuickOverlay::overlay(window)) { - QObject::disconnect(oldOverlay, &QQuickOverlay::pressed, q, &QQuickOverlayAttached::pressed); - QObject::disconnect(oldOverlay, &QQuickOverlay::released, q, &QQuickOverlayAttached::released); - } - - if (QQuickOverlay *newOverlay = QQuickOverlay::overlay(newWindow)) { - QObject::connect(newOverlay, &QQuickOverlay::pressed, q, &QQuickOverlayAttached::pressed); - QObject::connect(newOverlay, &QQuickOverlay::released, q, &QQuickOverlayAttached::released); - } - - window = newWindow; - emit q->overlayChanged(); -} - -/*! - \qmlattachedsignal QtQuick.Controls::Overlay::pressed() - - This attached signal is emitted when the overlay is pressed by the user while - a popup is visible. - - The signal can be attached to any item, popup, or window. When attached to an - item or a popup, the signal is only emitted if the item or popup is in a window. -*/ - -/*! - \qmlattachedsignal QtQuick.Controls::Overlay::released() - - This attached signal is emitted when the overlay is released by the user while - a popup is visible. - - The signal can be attached to any item, popup, or window. When attached to an - item or a popup, the signal is only emitted if the item or popup is in a window. -*/ - -QQuickOverlayAttached::QQuickOverlayAttached(QObject *parent) - : QObject(*(new QQuickOverlayAttachedPrivate), parent) -{ - Q_D(QQuickOverlayAttached); - if (QQuickItem *item = qobject_cast(parent)) { - d->setWindow(item->window()); - QObjectPrivate::connect(item, &QQuickItem::windowChanged, d, &QQuickOverlayAttachedPrivate::setWindow); - } else if (QQuickPopup *popup = qobject_cast(parent)) { - d->setWindow(popup->window()); - QObjectPrivate::connect(popup, &QQuickPopup::windowChanged, d, &QQuickOverlayAttachedPrivate::setWindow); - } else { - d->setWindow(qobject_cast(parent)); - } -} - -/*! - \qmlattachedproperty Overlay QtQuick.Controls::Overlay::overlay - \readonly - - This attached property holds the window overlay item. - - The property can be attached to any item, popup, or window. When attached to an - item or a popup, the value is \c null if the item or popup is not in a window. -*/ -QQuickOverlay *QQuickOverlayAttached::overlay() const -{ - Q_D(const QQuickOverlayAttached); - return QQuickOverlay::overlay(d->window); -} - -/*! - \qmlattachedproperty Component QtQuick.Controls::Overlay::modal - - This attached property holds a component to use as a visual item that implements - background dimming for modal popups. It is created for and stacked below visible - modal popups. - - The property can be attached to any popup. - - For example, to change the color of the background dimming for a modal - popup, the following code can be used: - - \snippet qtquickcontrols2-overlay-modal.qml 1 - - \sa Popup::modal -*/ -QQmlComponent *QQuickOverlayAttached::modal() const -{ - Q_D(const QQuickOverlayAttached); - return d->modal; -} - -void QQuickOverlayAttached::setModal(QQmlComponent *modal) -{ - Q_D(QQuickOverlayAttached); - if (d->modal == modal) - return; - - delete d->modal; - d->modal = modal; - emit modalChanged(); -} - -/*! - \qmlattachedproperty Component QtQuick.Controls::Overlay::modeless - - This attached property holds a component to use as a visual item that implements - background dimming for modeless popups. It is created for and stacked below visible - dimming popups. - - The property can be attached to any popup. - - For example, to change the color of the background dimming for a modeless - popup, the following code can be used: - - \snippet qtquickcontrols2-overlay-modeless.qml 1 - - \sa Popup::dim -*/ -QQmlComponent *QQuickOverlayAttached::modeless() const -{ - Q_D(const QQuickOverlayAttached); - return d->modeless; -} - -void QQuickOverlayAttached::setModeless(QQmlComponent *modeless) -{ - Q_D(QQuickOverlayAttached); - if (d->modeless == modeless) - return; - - delete d->modeless; - d->modeless = modeless; - emit modelessChanged(); -} - QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickoverlay_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickoverlay_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickoverlay_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickoverlay_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -55,8 +55,6 @@ class QQmlComponent; class QQuickOverlayPrivate; -class QQuickOverlayAttached; -class QQuickOverlayAttachedPrivate; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickOverlay : public QQuickItem { @@ -76,8 +74,6 @@ static QQuickOverlay *overlay(QQuickWindow *window); - static QQuickOverlayAttached *qmlAttachedProperties(QObject *object); - Q_SIGNALS: void modalChanged(); void modelessChanged(); @@ -105,39 +101,8 @@ Q_DECLARE_PRIVATE(QQuickOverlay) }; -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickOverlayAttached : public QObject -{ - Q_OBJECT - Q_PROPERTY(QQuickOverlay *overlay READ overlay NOTIFY overlayChanged FINAL) - Q_PROPERTY(QQmlComponent *modal READ modal WRITE setModal NOTIFY modalChanged FINAL) - Q_PROPERTY(QQmlComponent *modeless READ modeless WRITE setModeless NOTIFY modelessChanged FINAL) - -public: - explicit QQuickOverlayAttached(QObject *parent = nullptr); - - QQuickOverlay *overlay() const; - - QQmlComponent *modal() const; - void setModal(QQmlComponent *modal); - - QQmlComponent *modeless() const; - void setModeless(QQmlComponent *modeless); - -Q_SIGNALS: - void overlayChanged(); - void modalChanged(); - void modelessChanged(); - void pressed(); - void released(); - -private: - Q_DISABLE_COPY(QQuickOverlayAttached) - Q_DECLARE_PRIVATE(QQuickOverlayAttached) -}; - QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickOverlay) -QML_DECLARE_TYPEINFO(QQuickOverlay, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKOVERLAY_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickoverlay_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickoverlay_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickoverlay_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickoverlay_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ // We mean it. // -#include +#include "qquickoverlay_p.h" #include #include @@ -63,6 +63,8 @@ Q_DECLARE_PUBLIC(QQuickOverlay) public: + QQuickOverlayPrivate(); + static QQuickOverlayPrivate *get(QQuickOverlay *overlay) { return overlay->d_func(); @@ -82,6 +84,13 @@ void removePopup(QQuickPopup *popup); void setMouseGrabberPopup(QQuickPopup *popup); + void popupAboutToShow(); + void popupAboutToHide(); + + void createOverlay(QQuickPopup *popup); + void destroyOverlay(QQuickPopup *popup); + void toggleOverlay(); + QVector stackingOrderPopups() const; QVector stackingOrderDrawers() const; @@ -89,8 +98,8 @@ void updateGeometry(); - QQmlComponent *modal = nullptr; - QQmlComponent *modeless = nullptr; + QQmlComponent *modal; + QQmlComponent *modeless; QVector allPopups; QVector allDrawers; QPointer mouseGrabberPopup; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpage.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpage.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpage.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpage.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -35,21 +35,18 @@ ****************************************************************************/ #include "qquickpage_p.h" -#include "qquickpage_p_p.h" -#include "qquicktabbar_p.h" -#include "qquicktoolbar_p.h" -#include "qquickdialogbuttonbox_p.h" +#include "qquickcontrol_p_p.h" +#include "qquickpagelayout_p_p.h" QT_BEGIN_NAMESPACE /*! \qmltype Page - \inherits Pane + \inherits Control \instantiates QQuickPage \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes \brief Styled page control with support for a header and footer. Page is a container control which makes it convenient to add @@ -61,7 +58,7 @@ toolbar header and an application-wide tabbar footer. \qml - import QtQuick.Controls 2.12 + import QtQuick.Controls 2.1 ApplicationWindow { visible: true @@ -82,158 +79,48 @@ } \endqml - \sa ApplicationWindow, {Container Controls}, - {Focus Management in Qt Quick Controls 2} + \sa ApplicationWindow, {Container Controls} */ -static const QQuickItemPrivate::ChangeTypes LayoutChanges = QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | QQuickItemPrivate::Destroyed - | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight; - -namespace { - enum Position { - Header, - Footer - }; - - Q_STATIC_ASSERT(int(Header) == int(QQuickTabBar::Header)); - Q_STATIC_ASSERT(int(Footer) == int(QQuickTabBar::Footer)); - - Q_STATIC_ASSERT(int(Header) == int(QQuickToolBar::Header)); - Q_STATIC_ASSERT(int(Footer) == int(QQuickToolBar::Footer)); - - Q_STATIC_ASSERT(int(Header) == int(QQuickDialogButtonBox::Header)); - Q_STATIC_ASSERT(int(Footer) == int(QQuickDialogButtonBox::Footer)); - - static void setPos(QQuickItem *item, Position position) - { - if (QQuickToolBar *toolBar = qobject_cast(item)) - toolBar->setPosition(static_cast(position)); - else if (QQuickTabBar *tabBar = qobject_cast(item)) - tabBar->setPosition(static_cast(position)); - else if (QQuickDialogButtonBox *buttonBox = qobject_cast(item)) - buttonBox->setPosition(static_cast(position)); - } -} - -void QQuickPagePrivate::relayout() -{ - Q_Q(QQuickPage); - const qreal hh = header && header->isVisible() ? header->height() : 0; - const qreal fh = footer && footer->isVisible() ? footer->height() : 0; - const qreal hsp = hh > 0 ? spacing : 0; - const qreal fsp = fh > 0 ? spacing : 0; - - if (contentItem) { - contentItem->setY(q->topPadding() + hh + hsp); - contentItem->setX(q->leftPadding()); - contentItem->setWidth(q->availableWidth()); - contentItem->setHeight(q->availableHeight() - hh - fh - hsp - fsp); - } - - if (header) - header->setWidth(q->width()); - - if (footer) { - footer->setY(q->height() - footer->height()); - footer->setWidth(q->width()); - } -} - -void QQuickPagePrivate::resizeContent() -{ - relayout(); -} - -void QQuickPagePrivate::itemVisibilityChanged(QQuickItem *item) -{ - Q_Q(QQuickPage); - QQuickPanePrivate::itemVisibilityChanged(item); - if (item == header) { - QBoolBlocker signalGuard(emittingImplicitSizeChangedSignals); - emit q->implicitHeaderWidthChanged(); - emit q->implicitHeaderHeightChanged(); - relayout(); - } else if (item == footer) { - QBoolBlocker signalGuard(emittingImplicitSizeChangedSignals); - emit q->implicitFooterWidthChanged(); - emit q->implicitFooterHeightChanged(); - relayout(); - } -} - -void QQuickPagePrivate::itemImplicitWidthChanged(QQuickItem *item) +class QQuickPagePrivate : public QQuickControlPrivate { - Q_Q(QQuickPage); - QQuickPanePrivate::itemImplicitWidthChanged(item); - - // Avoid binding loops by skipping signal emission if we're already doing it. - if (emittingImplicitSizeChangedSignals) - return; + Q_DECLARE_PUBLIC(QQuickPage) - if (item == header) - emit q->implicitHeaderWidthChanged(); - else if (item == footer) - emit q->implicitFooterWidthChanged(); -} - -void QQuickPagePrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - Q_Q(QQuickPage); - QQuickPanePrivate::itemImplicitHeightChanged(item); +public: + QQuickPagePrivate(); - // Avoid binding loops by skipping signal emission if we're already doing it. - if (emittingImplicitSizeChangedSignals) - return; + QQuickItem *getContentItem() override; - if (item == header) - emit q->implicitHeaderHeightChanged(); - else if (item == footer) - emit q->implicitFooterHeightChanged(); -} + qreal contentWidth; + qreal contentHeight; + QString title; + QScopedPointer layout; +}; -void QQuickPagePrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF & diff) +QQuickPagePrivate::QQuickPagePrivate() + : contentWidth(0), + contentHeight(0) { - QQuickPanePrivate::itemGeometryChanged(item, change, diff); - if (item == header || item == footer) - relayout(); } -void QQuickPagePrivate::itemDestroyed(QQuickItem *item) +QQuickItem *QQuickPagePrivate::getContentItem() { Q_Q(QQuickPage); - QQuickPanePrivate::itemDestroyed(item); - if (item == header) { - header = nullptr; - relayout(); - emit q->implicitHeaderWidthChanged(); - emit q->implicitHeaderHeightChanged(); - emit q->headerChanged(); - } else if (item == footer) { - footer = nullptr; - relayout(); - emit q->implicitFooterWidthChanged(); - emit q->implicitFooterHeightChanged(); - emit q->footerChanged(); - } + if (QQuickItem *item = QQuickControlPrivate::getContentItem()) + return item; + return new QQuickItem(q); } QQuickPage::QQuickPage(QQuickItem *parent) - : QQuickPane(*(new QQuickPagePrivate), parent) -{ -} - -QQuickPage::QQuickPage(QQuickPagePrivate &dd, QQuickItem *parent) - : QQuickPane(dd, parent) -{ -} - -QQuickPage::~QQuickPage() + : QQuickControl(*(new QQuickPagePrivate), parent) { Q_D(QQuickPage); - if (d->header) - QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, LayoutChanges); - if (d->footer) - QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, LayoutChanges); + setFlag(ItemIsFocusScope); + setAcceptedMouseButtons(Qt::AllButtons); +#if QT_CONFIG(cursor) + setCursor(Qt::ArrowCursor); +#endif + d->layout.reset(new QQuickPageLayout(this)); } /*! @@ -304,29 +191,16 @@ QQuickItem *QQuickPage::header() const { Q_D(const QQuickPage); - return d->header; + return d->layout->header(); } void QQuickPage::setHeader(QQuickItem *header) { Q_D(QQuickPage); - if (d->header == header) + if (!d->layout->setHeader(header)) return; - - if (d->header) { - QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, LayoutChanges); - d->header->setParentItem(nullptr); - } - d->header = header; - if (header) { - header->setParentItem(this); - QQuickItemPrivate::get(header)->addItemChangeListener(d, LayoutChanges); - if (qFuzzyIsNull(header->z())) - header->setZ(1); - setPos(header, Header); - } if (isComponentComplete()) - d->relayout(); + d->layout->update(); emit headerChanged(); } @@ -345,120 +219,150 @@ QQuickItem *QQuickPage::footer() const { Q_D(const QQuickPage); - return d->footer; + return d->layout->footer(); } void QQuickPage::setFooter(QQuickItem *footer) { Q_D(QQuickPage); - if (d->footer == footer) + if (!d->layout->setFooter(footer)) return; - - if (d->footer) { - QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, LayoutChanges); - d->footer->setParentItem(nullptr); - } - d->footer = footer; - if (footer) { - footer->setParentItem(this); - QQuickItemPrivate::get(footer)->addItemChangeListener(d, LayoutChanges); - if (qFuzzyIsNull(footer->z())) - footer->setZ(1); - setPos(footer, Footer); - } if (isComponentComplete()) - d->relayout(); + d->layout->update(); emit footerChanged(); } /*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Page::implicitHeaderWidth - \readonly + \qmlproperty list QtQuick.Controls::Page::contentData + \default + + This property holds the list of content data. - This property holds the implicit header width. + The list contains all objects that have been declared in QML as children + of the container. - The value is equal to \c {header && header.visible ? header.implicitWidth : 0}. + \note Unlike \c contentChildren, \c contentData does include non-visual QML + objects. - \sa implicitHeaderHeight, implicitFooterWidth + \sa Item::data, contentChildren */ -qreal QQuickPage::implicitHeaderWidth() const +QQmlListProperty QQuickPage::contentData() { - Q_D(const QQuickPage); - if (!d->header || !d->header->isVisible()) - return 0; - return d->header->implicitWidth(); + return QQmlListProperty(contentItem(), nullptr, + QQuickItemPrivate::data_append, + QQuickItemPrivate::data_count, + QQuickItemPrivate::data_at, + QQuickItemPrivate::data_clear); } /*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Page::implicitHeaderHeight - \readonly + \qmlproperty list QtQuick.Controls::Page::contentChildren + + This property holds the list of content children. - This property holds the implicit header height. + The list contains all items that have been declared in QML as children + of the page. - The value is equal to \c {header && header.visible ? header.implicitHeight : 0}. + \note Unlike \c contentData, \c contentChildren does not include non-visual + QML objects. - \sa implicitHeaderWidth, implicitFooterHeight + \sa Item::children, contentData */ -qreal QQuickPage::implicitHeaderHeight() const +QQmlListProperty QQuickPage::contentChildren() { - Q_D(const QQuickPage); - if (!d->header || !d->header->isVisible()) - return 0; - return d->header->implicitHeight(); + return QQmlListProperty(contentItem(), nullptr, + QQuickItemPrivate::children_append, + QQuickItemPrivate::children_count, + QQuickItemPrivate::children_at, + QQuickItemPrivate::children_clear); } /*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Page::implicitFooterWidth - \readonly - - This property holds the implicit footer width. + \qmlproperty real QtQuick.Controls::Page::contentWidth + \since QtQuick.Controls 2.1 (Qt 5.8) - The value is equal to \c {footer && footer.visible ? footer.implicitWidth : 0}. + This property holds the content width. It is used for calculating the total + implicit width of the page. - \sa implicitFooterHeight, implicitHeaderWidth + \sa contentHeight */ -qreal QQuickPage::implicitFooterWidth() const +qreal QQuickPage::contentWidth() const { Q_D(const QQuickPage); - if (!d->footer || !d->footer->isVisible()) - return 0; - return d->footer->implicitWidth(); + return d->contentWidth; } -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Page::implicitFooterHeight - \readonly +void QQuickPage::setContentWidth(qreal width) +{ + Q_D(QQuickPage); + if (qFuzzyCompare(d->contentWidth, width)) + return; + + d->contentWidth = width; + emit contentWidthChanged(); +} - This property holds the implicit footer height. +/*! + \qmlproperty real QtQuick.Controls::Page::contentHeight + \since QtQuick.Controls 2.1 (Qt 5.8) - The value is equal to \c {footer && footer.visible ? footer.implicitHeight : 0}. + This property holds the content height. It is used for calculating the total + implicit height of the page. - \sa implicitFooterWidth, implicitHeaderHeight + \sa contentWidth */ -qreal QQuickPage::implicitFooterHeight() const +qreal QQuickPage::contentHeight() const { Q_D(const QQuickPage); - if (!d->footer || !d->footer->isVisible()) - return 0; - return d->footer->implicitHeight(); + return d->contentHeight; +} + +void QQuickPage::setContentHeight(qreal height) +{ + Q_D(QQuickPage); + if (qFuzzyCompare(d->contentHeight, height)) + return; + + d->contentHeight = height; + emit contentHeightChanged(); } void QQuickPage::componentComplete() { Q_D(QQuickPage); - QQuickPane::componentComplete(); - d->relayout(); + QQuickControl::componentComplete(); + d->layout->update(); +} + +void QQuickPage::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) +{ + QQuickControl::contentItemChange(newItem, oldItem); + if (oldItem) + disconnect(oldItem, &QQuickItem::childrenChanged, this, &QQuickPage::contentChildrenChanged); + if (newItem) + connect(newItem, &QQuickItem::childrenChanged, this, &QQuickPage::contentChildrenChanged); + emit contentChildrenChanged(); +} + +void QQuickPage::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +{ + Q_D(QQuickPage); + QQuickControl::geometryChanged(newGeometry, oldGeometry); + d->layout->update(); +} + +void QQuickPage::paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) +{ + Q_D(QQuickPage); + QQuickControl::paddingChange(newPadding, oldPadding); + d->layout->update(); } void QQuickPage::spacingChange(qreal newSpacing, qreal oldSpacing) { Q_D(QQuickPage); - QQuickPane::spacingChange(newSpacing, oldSpacing); - d->relayout(); + QQuickControl::spacingChange(newSpacing, oldSpacing); + d->layout->update(); } #if QT_CONFIG(accessibility) @@ -470,7 +374,7 @@ void QQuickPage::accessibilityActiveChanged(bool active) { Q_D(QQuickPage); - QQuickPane::accessibilityActiveChanged(active); + QQuickControl::accessibilityActiveChanged(active); if (active) setAccessibleName(d->title); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpageindicator.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpageindicator.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpageindicator.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpageindicator.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -39,6 +39,7 @@ #include #include +#include QT_BEGIN_NAMESPACE @@ -83,11 +84,20 @@ \sa SwipeView, {Customizing PageIndicator}, {Indicator Controls} */ -class QQuickPageIndicatorPrivate : public QQuickControlPrivate +class QQuickPageIndicatorPrivate : public QQuickControlPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickPageIndicator) public: + QQuickPageIndicatorPrivate() + : count(0), + currentIndex(0), + interactive(false), + delegate(nullptr), + pressedItem(nullptr) + { + } + void handlePress(const QPointF &point) override; void handleMove(const QPointF &point) override; void handleRelease(const QPointF &point) override; @@ -99,11 +109,11 @@ void itemChildAdded(QQuickItem *, QQuickItem *child) override; - int count = 0; - int currentIndex = 0; - bool interactive = false; - QQmlComponent *delegate = nullptr; - QQuickItem *pressedItem = nullptr; + int count; + int currentIndex; + bool interactive; + QQmlComponent *delegate; + QQuickItem *pressedItem; }; void QQuickPageIndicatorPrivate::handlePress(const QPointF &point) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpagelayout.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpagelayout.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpagelayout.cpp 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpagelayout.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,195 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qquickpagelayout_p_p.h" +#include "qquickcontrol_p.h" +#include "qquickcontrol_p_p.h" +#include "qquicktoolbar_p.h" +#include "qquicktabbar_p.h" +#include "qquickdialogbuttonbox_p.h" + +#include + +QT_BEGIN_NAMESPACE + +static const QQuickItemPrivate::ChangeTypes ItemChanges = QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | QQuickItemPrivate::Destroyed + | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight; + +namespace { + enum Position { + Header, + Footer + }; + + Q_STATIC_ASSERT(int(Header) == int(QQuickTabBar::Header)); + Q_STATIC_ASSERT(int(Footer) == int(QQuickTabBar::Footer)); + + Q_STATIC_ASSERT(int(Header) == int(QQuickToolBar::Header)); + Q_STATIC_ASSERT(int(Footer) == int(QQuickToolBar::Footer)); + + Q_STATIC_ASSERT(int(Header) == int(QQuickDialogButtonBox::Header)); + Q_STATIC_ASSERT(int(Footer) == int(QQuickDialogButtonBox::Footer)); +} + +static void setPosition(QQuickItem *item, Position position) +{ + if (QQuickToolBar *toolBar = qobject_cast(item)) + toolBar->setPosition(static_cast(position)); + else if (QQuickTabBar *tabBar = qobject_cast(item)) + tabBar->setPosition(static_cast(position)); + else if (QQuickDialogButtonBox *buttonBox = qobject_cast(item)) + buttonBox->setPosition(static_cast(position)); +} + +QQuickPageLayout::QQuickPageLayout(QQuickControl *control) + : m_header(nullptr), + m_footer(nullptr), + m_control(control) +{ +} + +QQuickPageLayout::~QQuickPageLayout() +{ + if (m_header) + QQuickItemPrivate::get(m_header)->removeItemChangeListener(this, ItemChanges); + if (m_footer) + QQuickItemPrivate::get(m_footer)->removeItemChangeListener(this, ItemChanges); +} + +QQuickItem *QQuickPageLayout::header() const +{ + return m_header; +} + +bool QQuickPageLayout::setHeader(QQuickItem *header) +{ + if (m_header == header) + return false; + + if (m_header) { + QQuickItemPrivate::get(m_header)->removeItemChangeListener(this, ItemChanges); + m_header->setParentItem(nullptr); + } + m_header = header; + if (header) { + header->setParentItem(m_control); + QQuickItemPrivate::get(header)->addItemChangeListener(this, ItemChanges); + if (qFuzzyIsNull(header->z())) + header->setZ(1); + setPosition(header, Header); + } + return true; +} + +QQuickItem *QQuickPageLayout::footer() const +{ + return m_footer; +} + +bool QQuickPageLayout::setFooter(QQuickItem *footer) +{ + if (m_footer == footer) + return false; + + if (m_footer) { + QQuickItemPrivate::get(m_footer)->removeItemChangeListener(this, ItemChanges); + m_footer->setParentItem(nullptr); + } + m_footer = footer; + if (footer) { + footer->setParentItem(m_control); + QQuickItemPrivate::get(footer)->addItemChangeListener(this, ItemChanges); + if (qFuzzyIsNull(footer->z())) + footer->setZ(1); + setPosition(footer, Footer); + } + return true; +} + +void QQuickPageLayout::update() +{ + QQuickItem *content = QQuickControlPrivate::get(m_control)->contentItem; + + const qreal hh = m_header && m_header->isVisible() ? m_header->height() : 0; + const qreal fh = m_footer && m_footer->isVisible() ? m_footer->height() : 0; + const qreal hsp = hh > 0 ? m_control->spacing() : 0; + const qreal fsp = fh > 0 ? m_control->spacing() : 0; + + if (content) { + content->setY(m_control->topPadding() + hh + hsp); + content->setX(m_control->leftPadding()); + content->setWidth(m_control->availableWidth()); + content->setHeight(m_control->availableHeight() - hh - fh - hsp - fsp); + } + + if (m_header) + m_header->setWidth(m_control->width()); + + if (m_footer) { + m_footer->setY(m_control->height() - m_footer->height()); + m_footer->setWidth(m_control->width()); + } +} + +void QQuickPageLayout::itemVisibilityChanged(QQuickItem *) +{ + update(); +} + +void QQuickPageLayout::itemImplicitWidthChanged(QQuickItem *) +{ + update(); +} + +void QQuickPageLayout::itemImplicitHeightChanged(QQuickItem *) +{ + update(); +} + +void QQuickPageLayout::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &) +{ + update(); +} + +void QQuickPageLayout::itemDestroyed(QQuickItem *item) +{ + if (item == m_header) + m_header = nullptr; + else if (item == m_footer) + m_footer = nullptr; +} + +QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpagelayout_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpagelayout_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpagelayout_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpagelayout_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKPAGELAYOUT_P_P_H +#define QQUICKPAGELAYOUT_P_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include + +QT_BEGIN_NAMESPACE + +class QQuickControl; + +class QQuickPageLayout : public QQuickItemChangeListener +{ +public: + explicit QQuickPageLayout(QQuickControl *control); + ~QQuickPageLayout(); + + QQuickItem *header() const; + bool setHeader(QQuickItem *header); + + QQuickItem *footer() const; + bool setFooter(QQuickItem *footer); + + void update(); + +protected: + void itemVisibilityChanged(QQuickItem *item) override; + void itemImplicitWidthChanged(QQuickItem *item) override; + void itemImplicitHeightChanged(QQuickItem *item) override; + void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) override; + void itemDestroyed(QQuickItem *item) override; + +private: + QQuickItem *m_header; + QQuickItem *m_footer; + QQuickControl *m_control; +}; + +QT_END_NAMESPACE + +#endif // QQUICKPAGELAYOUT_P_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpage_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpage_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpage_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpage_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,31 +48,28 @@ // We mean it. // -#include +#include #include QT_BEGIN_NAMESPACE class QQuickPagePrivate; -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPage : public QQuickPane +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPage : public QQuickControl { Q_OBJECT Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) + Q_PROPERTY(QQmlListProperty contentData READ contentData FINAL) + Q_PROPERTY(QQmlListProperty contentChildren READ contentChildren NOTIFY contentChildrenChanged FINAL) // 2.1 (Qt 5.8) Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL REVISION 1) Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged FINAL REVISION 1) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal implicitHeaderWidth READ implicitHeaderWidth NOTIFY implicitHeaderWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitHeaderHeight READ implicitHeaderHeight NOTIFY implicitHeaderHeightChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitFooterWidth READ implicitFooterWidth NOTIFY implicitFooterWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitFooterHeight READ implicitFooterHeight NOTIFY implicitFooterHeightChanged FINAL REVISION 5) + Q_CLASSINFO("DefaultProperty", "contentData") public: explicit QQuickPage(QQuickItem *parent = nullptr); - ~QQuickPage(); QString title() const; void setTitle(const QString &title); @@ -83,28 +80,31 @@ QQuickItem *footer() const; void setFooter(QQuickItem *footer); - // 2.5 (Qt 5.12) - qreal implicitHeaderWidth() const; - qreal implicitHeaderHeight() const; + QQmlListProperty contentData(); + QQmlListProperty contentChildren(); - qreal implicitFooterWidth() const; - qreal implicitFooterHeight() const; + // 2.1 (Qt 5.8) + qreal contentWidth() const; + void setContentWidth(qreal width); + + qreal contentHeight() const; + void setContentHeight(qreal height); Q_SIGNALS: void titleChanged(); void headerChanged(); void footerChanged(); - // 2.5 (Qt 5.12) - void implicitHeaderWidthChanged(); - void implicitHeaderHeightChanged(); - void implicitFooterWidthChanged(); - void implicitFooterHeightChanged(); + void contentChildrenChanged(); + // 2.1 (Qt 5.8) + Q_REVISION(1) void contentWidthChanged(); + Q_REVISION(1) void contentHeightChanged(); protected: - QQuickPage(QQuickPagePrivate &dd, QQuickItem *parent); - void componentComplete() override; + void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; void spacingChange(qreal newSpacing, qreal oldSpacing) override; #if QT_CONFIG(accessibility) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpage_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpage_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpage_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpage_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKPAGE_P_P_H -#define QQUICKPAGE_P_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -QT_BEGIN_NAMESPACE - -class QQuickPane; - -class QQuickPagePrivate : public QQuickPanePrivate -{ - Q_DECLARE_PUBLIC(QQuickPage) - -public: - void relayout(); - void resizeContent() override; - - void itemVisibilityChanged(QQuickItem *item) override; - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF & diff) override; - void itemDestroyed(QQuickItem *item) override; - - QString title; - QQuickItem *header = nullptr; - QQuickItem *footer = nullptr; - bool emittingImplicitSizeChangedSignals = false; -}; - -QT_END_NAMESPACE - -#endif // QQUICKPAGE_P_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpalette.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpalette.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpalette.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpalette.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,326 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickpalette_p.h" - -QT_BEGIN_NAMESPACE - -QColor QQuickPalette::alternateBase() const -{ - return v.color(QPalette::AlternateBase); -} - -void QQuickPalette::setAlternateBase(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::AlternateBase, color); -} - -void QQuickPalette::resetAlternateBase() -{ - v.resolve(v.resolve() & ~(1 << QPalette::AlternateBase)); -} - -QColor QQuickPalette::base() const -{ - return v.color(QPalette::Base); -} - -void QQuickPalette::setBase(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::Base, color); -} - -void QQuickPalette::resetBase() -{ - v.resolve(v.resolve() & ~(1 << QPalette::Base)); -} - -QColor QQuickPalette::brightText() const -{ - return v.color(QPalette::BrightText); -} - -void QQuickPalette::setBrightText(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::BrightText, color); -} - -void QQuickPalette::resetBrightText() -{ - v.resolve(v.resolve() & ~(1 << QPalette::BrightText)); -} - -QColor QQuickPalette::button() const -{ - return v.color(QPalette::Button); -} - -void QQuickPalette::setButton(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::Button, color); -} - -void QQuickPalette::resetButton() -{ - v.resolve(v.resolve() & ~(1 << QPalette::Button)); -} - -QColor QQuickPalette::buttonText() const -{ - return v.color(QPalette::ButtonText); -} - -void QQuickPalette::setButtonText(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::ButtonText, color); -} - -void QQuickPalette::resetButtonText() -{ - v.resolve(v.resolve() & ~(1 << QPalette::ButtonText)); -} - -QColor QQuickPalette::dark() const -{ - return v.color(QPalette::Dark); -} - -void QQuickPalette::setDark(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::Dark, color); -} - -void QQuickPalette::resetDark() -{ - v.resolve(v.resolve() & ~(1 << QPalette::Dark)); -} - -QColor QQuickPalette::highlight() const -{ - return v.color(QPalette::Highlight); -} - -void QQuickPalette::setHighlight(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::Highlight, color); -} - -void QQuickPalette::resetHighlight() -{ - v.resolve(v.resolve() & ~(1 << QPalette::Highlight)); -} - -QColor QQuickPalette::highlightedText() const -{ - return v.color(QPalette::HighlightedText); -} - -void QQuickPalette::setHighlightedText(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::HighlightedText, color); -} - -void QQuickPalette::resetHighlightedText() -{ - v.resolve(v.resolve() & ~(1 << QPalette::HighlightedText)); -} - -QColor QQuickPalette::light() const -{ - return v.color(QPalette::Light); -} - -void QQuickPalette::setLight(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::Light, color); -} - -void QQuickPalette::resetLight() -{ - v.resolve(v.resolve() & ~(1 << QPalette::Light)); -} - -QColor QQuickPalette::link() const -{ - return v.color(QPalette::Link); -} - -void QQuickPalette::setLink(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::Link, color); -} - -void QQuickPalette::resetLink() -{ - v.resolve(v.resolve() & ~(1 << QPalette::Link)); -} - -QColor QQuickPalette::linkVisited() const -{ - return v.color(QPalette::LinkVisited); -} - -void QQuickPalette::setLinkVisited(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::LinkVisited, color); -} - -void QQuickPalette::resetLinkVisited() -{ - v.resolve(v.resolve() & ~(1 << QPalette::LinkVisited)); -} - -QColor QQuickPalette::mid() const -{ - return v.color(QPalette::Mid); -} - -void QQuickPalette::setMid(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::Mid, color); -} - -void QQuickPalette::resetMid() -{ - v.resolve(v.resolve() & ~(1 << QPalette::Mid)); -} - -QColor QQuickPalette::midlight() const -{ - return v.color(QPalette::Midlight); -} - -void QQuickPalette::setMidlight(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::Midlight, color); -} - -void QQuickPalette::resetMidlight() -{ - v.resolve(v.resolve() & ~(1 << QPalette::Midlight)); -} - -QColor QQuickPalette::shadow() const -{ - return v.color(QPalette::Shadow); -} - -void QQuickPalette::setShadow(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::Shadow, color); -} - -void QQuickPalette::resetShadow() -{ - v.resolve(v.resolve() & ~(1 << QPalette::Shadow)); -} - -QColor QQuickPalette::text() const -{ - return v.color(QPalette::Text); -} - -void QQuickPalette::setText(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::Text, color); -} - -void QQuickPalette::resetText() -{ - v.resolve(v.resolve() & ~(1 << QPalette::Text)); -} - -QColor QQuickPalette::toolTipBase() const -{ - return v.color(QPalette::ToolTipBase); -} - -void QQuickPalette::setToolTipBase(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::ToolTipBase, color); -} - -void QQuickPalette::resetToolTipBase() -{ - v.resolve(v.resolve() & ~(1 << QPalette::ToolTipBase)); -} - -QColor QQuickPalette::toolTipText() const -{ - return v.color(QPalette::ToolTipText); -} - -void QQuickPalette::setToolTipText(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::ToolTipText, color); -} - -void QQuickPalette::resetToolTipText() -{ - v.resolve(v.resolve() & ~(1 << QPalette::ToolTipText)); -} - -QColor QQuickPalette::window() const -{ - return v.color(QPalette::Window); -} - -void QQuickPalette::setWindow(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::Window, color); -} - -void QQuickPalette::resetWindow() -{ - v.resolve(v.resolve() & ~(1 << QPalette::Window)); -} - -QColor QQuickPalette::windowText() const -{ - return v.color(QPalette::WindowText); -} - -void QQuickPalette::setWindowText(const QColor &color) -{ - v.setColor(QPalette::All, QPalette::WindowText, color); -} - -void QQuickPalette::resetWindowText() -{ - v.resolve(v.resolve() & ~(1 << QPalette::WindowText)); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpalette_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpalette_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpalette_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpalette_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKPALETTE_P_H -#define QQUICKPALETTE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPalette -{ - Q_GADGET - Q_PROPERTY(QColor alternateBase READ alternateBase WRITE setAlternateBase RESET resetAlternateBase FINAL) - Q_PROPERTY(QColor base READ base WRITE setBase RESET resetBase FINAL) - Q_PROPERTY(QColor brightText READ brightText WRITE setBrightText RESET resetBrightText FINAL) - Q_PROPERTY(QColor button READ button WRITE setButton RESET resetButton FINAL) - Q_PROPERTY(QColor buttonText READ buttonText WRITE setButtonText RESET resetButtonText FINAL) - Q_PROPERTY(QColor dark READ dark WRITE setDark RESET resetDark FINAL) - Q_PROPERTY(QColor highlight READ highlight WRITE setHighlight RESET resetHighlight FINAL) - Q_PROPERTY(QColor highlightedText READ highlightedText WRITE setHighlightedText RESET resetHighlightedText FINAL) - Q_PROPERTY(QColor light READ light WRITE setLight RESET resetLight FINAL) - Q_PROPERTY(QColor link READ link WRITE setLink RESET resetLink FINAL) - Q_PROPERTY(QColor linkVisited READ linkVisited WRITE setLinkVisited RESET resetLinkVisited FINAL) - Q_PROPERTY(QColor mid READ mid WRITE setMid RESET resetMid FINAL) - Q_PROPERTY(QColor midlight READ midlight WRITE setMidlight RESET resetMidlight FINAL) - Q_PROPERTY(QColor shadow READ shadow WRITE setShadow RESET resetShadow FINAL) - Q_PROPERTY(QColor text READ text WRITE setText RESET resetText FINAL) - Q_PROPERTY(QColor toolTipBase READ toolTipBase WRITE setToolTipBase RESET resetToolTipBase FINAL) - Q_PROPERTY(QColor toolTipText READ toolTipText WRITE setToolTipText RESET resetToolTipText FINAL) - Q_PROPERTY(QColor window READ window WRITE setWindow RESET resetWindow FINAL) - Q_PROPERTY(QColor windowText READ windowText WRITE setWindowText RESET resetWindowText FINAL) - -public: - QColor alternateBase() const; - void setAlternateBase(const QColor &color); - void resetAlternateBase(); - - QColor base() const; - void setBase(const QColor &color); - void resetBase(); - - QColor brightText() const; - void setBrightText(const QColor &color); - void resetBrightText(); - - QColor button() const; - void setButton(const QColor &color); - void resetButton(); - - QColor buttonText() const; - void setButtonText(const QColor &color); - void resetButtonText(); - - QColor dark() const; - void setDark(const QColor &color); - void resetDark(); - - QColor highlight() const; - void setHighlight(const QColor &color); - void resetHighlight(); - - QColor highlightedText() const; - void setHighlightedText(const QColor &color); - void resetHighlightedText(); - - QColor light() const; - void setLight(const QColor &color); - void resetLight(); - - QColor link() const; - void setLink(const QColor &color); - void resetLink(); - - QColor linkVisited() const; - void setLinkVisited(const QColor &color); - void resetLinkVisited(); - - QColor mid() const; - void setMid(const QColor &color); - void resetMid(); - - QColor midlight() const; - void setMidlight(const QColor &color); - void resetMidlight(); - - QColor shadow() const; - void setShadow(const QColor &color); - void resetShadow(); - - QColor text() const; - void setText(const QColor &color); - void resetText(); - - QColor toolTipBase() const; - void setToolTipBase(const QColor &color); - void resetToolTipBase(); - - QColor toolTipText() const; - void setToolTipText(const QColor &color); - void resetToolTipText(); - - QColor window() const; - void setWindow(const QColor &color); - void resetWindow(); - - QColor windowText() const; - void setWindowText(const QColor &color); - void resetWindowText(); - -private: - QPalette v; -}; - -QT_END_NAMESPACE - -#endif // QQUICKPALETTE_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpaletteprovider.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpaletteprovider.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpaletteprovider.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpaletteprovider.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,175 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickpaletteprovider_p.h" -#include "qquickpalette_p.h" - -#include - -QT_BEGIN_NAMESPACE - -static QQmlValueTypeProvider *instance() -{ - static QQuickPaletteProvider provider; - return &provider; -} - -void QQuickPaletteProvider::init() -{ - QQml_addValueTypeProvider(instance()); -} - -void QQuickPaletteProvider::cleanup() -{ - QQml_removeValueTypeProvider(instance()); -} - -#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) - #define ASSERT_VALID_SIZE(size, min) Q_UNUSED(size) -#else - #define ASSERT_VALID_SIZE(size, min) Q_ASSERT(size >= min) -#endif - -const QMetaObject *QQuickPaletteProvider::getMetaObjectForMetaType(int type) -{ - switch (type) { - case QMetaType::QPalette: - return &QQuickPalette::staticMetaObject; - default: - break; - } - - return nullptr; -} - -bool QQuickPaletteProvider::init(int type, QVariant& dst) -{ - switch (type) { - case QMetaType::QPalette: - dst.setValue(QPalette()); - return true; - default: break; - } - - return false; -} - -template -bool typedEqual(const void *lhs, const QVariant& rhs) -{ - return (*(reinterpret_cast(lhs)) == rhs.value()); -} - -bool QQuickPaletteProvider::equal(int type, const void *lhs, const QVariant &rhs) -{ - switch (type) { - case QMetaType::QPalette: - return typedEqual(lhs, rhs); - default: break; - } - - return false; -} - -template -bool typedStore(const void *src, void *dst, size_t dstSize) -{ - ASSERT_VALID_SIZE(dstSize, sizeof(T)); - const T *srcT = reinterpret_cast(src); - T *dstT = reinterpret_cast(dst); - new (dstT) T(*srcT); - return true; -} - -bool QQuickPaletteProvider::store(int type, const void *src, void *dst, size_t dstSize) -{ - switch (type) { - case QMetaType::QPalette: - return typedStore(src, dst, dstSize); - default: break; - } - - return false; -} - -template -bool typedRead(const QVariant& src, int dstType, void *dst) -{ - T *dstT = reinterpret_cast(dst); - if (src.type() == static_cast(dstType)) { - *dstT = src.value(); - } else { - *dstT = T(); - } - return true; -} - -bool QQuickPaletteProvider::read(const QVariant &src, void *dst, int dstType) -{ - switch (dstType) { - case QMetaType::QPalette: - return typedRead(src, dstType, dst); - default: break; - } - - return false; -} - -template -bool typedWrite(const void *src, QVariant& dst) -{ - const T *srcT = reinterpret_cast(src); - if (dst.value() != *srcT) { - dst = *srcT; - return true; - } - return false; -} - -bool QQuickPaletteProvider::write(int type, const void *src, QVariant& dst) -{ - switch (type) { - case QMetaType::QPalette: - return typedWrite(src, dst); - default: break; - } - - return false; -} - -#undef ASSERT_VALID_SIZE - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpaletteprovider_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpaletteprovider_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpaletteprovider_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpaletteprovider_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKPALETTEPROVIDER_P_H -#define QQUICKPALETTEPROVIDER_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPaletteProvider : public QQmlValueTypeProvider -{ -public: - static void init(); - static void cleanup(); - - const QMetaObject *getMetaObjectForMetaType(int type) override; - bool init(int type, QVariant& dst) override; - bool equal(int type, const void *lhs, const QVariant &rhs) override; - bool store(int type, const void *src, void *dst, size_t dstSize) override; - bool read(const QVariant &src, void *dst, int dstType) override; - bool write(int type, const void *src, QVariant& dst) override; -}; - -QT_END_NAMESPACE - -#endif // QQUICKTEMPLATES2VALUETYPEPROVIDER_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpane.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpane.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpane.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpane.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -36,7 +36,6 @@ #include "qquickpane_p.h" #include "qquickpane_p_p.h" -#include "qquickcontentitem_p.h" QT_BEGIN_NAMESPACE @@ -47,7 +46,6 @@ \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes \brief Provides a background matching with the application style and theme. Pane provides a background color that matches with the application style @@ -103,44 +101,13 @@ } \endcode - If the \l contentItem has no implicit size and only one child, Pane will - use the implicit size of that child. For example, in the following code, - the Pane will assume the size of the Rectangle: - - \code - Pane { - Item { - Rectangle { - implicitWidth: 200 - implicitHeight: 200 - color: "salmon" - } - } - } - \endcode - - \sa {Customizing Pane}, {Container Controls}, - {Focus Management in Qt Quick Controls 2}, {Event Handling} + \sa {Customizing Pane}, {Container Controls} */ -void QQuickPanePrivate::init() -{ - Q_Q(QQuickPane); - q->setFlag(QQuickItem::ItemIsFocusScope); - q->setAcceptedMouseButtons(Qt::AllButtons); -#if QT_CONFIG(cursor) - q->setCursor(Qt::ArrowCursor); -#endif - connect(q, &QQuickControl::implicitContentWidthChanged, this, &QQuickPanePrivate::updateContentWidth); - connect(q, &QQuickControl::implicitContentHeightChanged, this, &QQuickPanePrivate::updateContentHeight); -} - -QList QQuickPanePrivate::contentChildItems() const +QQuickPanePrivate::QQuickPanePrivate() + : contentWidth(0), + contentHeight(0) { - if (!contentItem) - return QList(); - - return contentItem->childItems(); } QQuickItem *QQuickPanePrivate::getContentItem() @@ -148,117 +115,27 @@ Q_Q(QQuickPane); if (QQuickItem *item = QQuickControlPrivate::getContentItem()) return item; - - return new QQuickContentItem(q); -} - -void QQuickPanePrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - QQuickControlPrivate::itemImplicitWidthChanged(item); - - if (item == firstChild) - updateImplicitContentWidth(); -} - -void QQuickPanePrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - QQuickControlPrivate::itemImplicitHeightChanged(item); - - if (item == firstChild) - updateImplicitContentHeight(); -} - -void QQuickPanePrivate::contentChildrenChange() -{ - Q_Q(QQuickPane); - QQuickItem *newFirstChild = contentChildItems().value(0); - if (newFirstChild != firstChild) { - if (firstChild) - removeImplicitSizeListener(firstChild); - if (newFirstChild) - addImplicitSizeListener(newFirstChild); - firstChild = newFirstChild; - } - - updateImplicitContentSize(); - emit q->contentChildrenChanged(); -} - -qreal QQuickPanePrivate::getContentWidth() const -{ - if (!contentItem) - return 0; - - const qreal cw = contentItem->implicitWidth(); - if (!qFuzzyIsNull(cw)) - return cw; - - const auto contentChildren = contentChildItems(); - if (contentChildren.count() == 1) - return contentChildren.first()->implicitWidth(); - - return 0; -} - -qreal QQuickPanePrivate::getContentHeight() const -{ - if (!contentItem) - return 0; - - const qreal ch = contentItem->implicitHeight(); - if (!qFuzzyIsNull(ch)) - return ch; - - const auto contentChildren = contentChildItems(); - if (contentChildren.count() == 1) - return contentChildren.first()->implicitHeight(); - - return 0; -} - -void QQuickPanePrivate::updateContentWidth() -{ - Q_Q(QQuickPane); - if (hasContentWidth || qFuzzyCompare(contentWidth, implicitContentWidth)) - return; - - const qreal oldContentWidth = contentWidth; - contentWidth = implicitContentWidth; - q->contentSizeChange(QSizeF(contentWidth, contentHeight), QSizeF(oldContentWidth, contentHeight)); - emit q->contentWidthChanged(); -} - -void QQuickPanePrivate::updateContentHeight() -{ - Q_Q(QQuickPane); - if (hasContentHeight || qFuzzyCompare(contentHeight, implicitContentHeight)) - return; - - const qreal oldContentHeight = contentHeight; - contentHeight = implicitContentHeight; - q->contentSizeChange(QSizeF(contentWidth, contentHeight), QSizeF(contentWidth, oldContentHeight)); - emit q->contentHeightChanged(); + return new QQuickItem(q); } QQuickPane::QQuickPane(QQuickItem *parent) : QQuickControl(*(new QQuickPanePrivate), parent) { - Q_D(QQuickPane); - d->init(); -} - -QQuickPane::~QQuickPane() -{ - Q_D(QQuickPane); - d->removeImplicitSizeListener(d->contentItem); - d->removeImplicitSizeListener(d->firstChild); + setFlag(QQuickItem::ItemIsFocusScope); + setAcceptedMouseButtons(Qt::AllButtons); +#if QT_CONFIG(cursor) + setCursor(Qt::ArrowCursor); +#endif } QQuickPane::QQuickPane(QQuickPanePrivate &dd, QQuickItem *parent) : QQuickControl(dd, parent) { - Q_D(QQuickPane); - d->init(); + setFlag(QQuickItem::ItemIsFocusScope); + setAcceptedMouseButtons(Qt::AllButtons); +#if QT_CONFIG(cursor) + setCursor(Qt::ArrowCursor); +#endif } /*! @@ -280,26 +157,13 @@ void QQuickPane::setContentWidth(qreal width) { Q_D(QQuickPane); - d->hasContentWidth = true; if (qFuzzyCompare(d->contentWidth, width)) return; - const qreal oldWidth = d->contentWidth; d->contentWidth = width; - contentSizeChange(QSizeF(width, d->contentHeight), QSizeF(oldWidth, d->contentHeight)); emit contentWidthChanged(); } -void QQuickPane::resetContentWidth() -{ - Q_D(QQuickPane); - if (!d->hasContentWidth) - return; - - d->hasContentHeight = false; - d->updateContentWidth(); -} - /*! \qmlproperty real QtQuick.Controls::Pane::contentHeight @@ -319,26 +183,13 @@ void QQuickPane::setContentHeight(qreal height) { Q_D(QQuickPane); - d->hasContentHeight = true; if (qFuzzyCompare(d->contentHeight, height)) return; - const qreal oldHeight = d->contentHeight; d->contentHeight = height; - contentSizeChange(QSizeF(d->contentWidth, height), QSizeF(d->contentWidth, oldHeight)); emit contentHeightChanged(); } -void QQuickPane::resetContentHeight() -{ - Q_D(QQuickPane); - if (!d->hasContentHeight) - return; - - d->hasContentHeight = false; - d->updateContentHeight(); -} - /*! \qmlproperty list QtQuick.Controls::Pane::contentData \default @@ -353,10 +204,9 @@ \sa Item::data, contentChildren */ -QQmlListProperty QQuickPanePrivate::contentData() +QQmlListProperty QQuickPane::contentData() { - Q_Q(QQuickPane); - return QQmlListProperty(q->contentItem(), nullptr, + return QQmlListProperty(contentItem(), nullptr, QQuickItemPrivate::data_append, QQuickItemPrivate::data_count, QQuickItemPrivate::data_at, @@ -376,42 +226,23 @@ \sa Item::children, contentData */ -QQmlListProperty QQuickPanePrivate::contentChildren() +QQmlListProperty QQuickPane::contentChildren() { - Q_Q(QQuickPane); - return QQmlListProperty(q->contentItem(), nullptr, + return QQmlListProperty(contentItem(), nullptr, QQuickItemPrivate::children_append, QQuickItemPrivate::children_count, QQuickItemPrivate::children_at, QQuickItemPrivate::children_clear); } -void QQuickPane::componentComplete() -{ - Q_D(QQuickPane); - QQuickControl::componentComplete(); - d->updateImplicitContentSize(); -} - void QQuickPane::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) { - Q_D(QQuickPane); QQuickControl::contentItemChange(newItem, oldItem); - if (oldItem) { - d->removeImplicitSizeListener(oldItem); - QObjectPrivate::disconnect(oldItem, &QQuickItem::childrenChanged, d, &QQuickPanePrivate::contentChildrenChange); - } - if (newItem) { - d->addImplicitSizeListener(newItem); - QObjectPrivate::connect(newItem, &QQuickItem::childrenChanged, d, &QQuickPanePrivate::contentChildrenChange); - } - d->contentChildrenChange(); -} - -void QQuickPane::contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize) -{ - Q_UNUSED(newSize) - Q_UNUSED(oldSize) + if (oldItem) + disconnect(oldItem, &QQuickItem::childrenChanged, this, &QQuickPane::contentChildrenChanged); + if (newItem) + connect(newItem, &QQuickItem::childrenChanged, this, &QQuickPane::contentChildrenChanged); + emit contentChildrenChanged(); } #if QT_CONFIG(accessibility) @@ -422,5 +253,3 @@ #endif QT_END_NAMESPACE - -#include "moc_qquickpane_p.cpp" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpane_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpane_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpane_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpane_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -58,23 +58,23 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPane : public QQuickControl { Q_OBJECT - Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth RESET resetContentWidth NOTIFY contentWidthChanged FINAL) - Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight RESET resetContentHeight NOTIFY contentHeightChanged FINAL) - Q_PRIVATE_PROPERTY(QQuickPane::d_func(), QQmlListProperty contentData READ contentData FINAL) - Q_PRIVATE_PROPERTY(QQuickPane::d_func(), QQmlListProperty contentChildren READ contentChildren NOTIFY contentChildrenChanged FINAL) + Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL) + Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged FINAL) + Q_PROPERTY(QQmlListProperty contentData READ contentData FINAL) + Q_PROPERTY(QQmlListProperty contentChildren READ contentChildren NOTIFY contentChildrenChanged FINAL) Q_CLASSINFO("DefaultProperty", "contentData") public: explicit QQuickPane(QQuickItem *parent = nullptr); - ~QQuickPane(); qreal contentWidth() const; void setContentWidth(qreal width); - void resetContentWidth(); qreal contentHeight() const; void setContentHeight(qreal height); - void resetContentHeight(); + + QQmlListProperty contentData(); + QQmlListProperty contentChildren(); Q_SIGNALS: void contentWidthChanged(); @@ -84,10 +84,7 @@ protected: QQuickPane(QQuickPanePrivate &dd, QQuickItem *parent); - void componentComplete() override; - void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; - virtual void contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize); #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpane_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpane_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpane_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpane_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -59,30 +59,12 @@ Q_DECLARE_PUBLIC(QQuickPane) public: - void init(); - - virtual QQmlListProperty contentData(); - virtual QQmlListProperty contentChildren(); - virtual QList contentChildItems() const; + QQuickPanePrivate(); QQuickItem *getContentItem() override; - qreal getContentWidth() const override; - qreal getContentHeight() const override; - - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - - void contentChildrenChange(); - - void updateContentWidth(); - void updateContentHeight(); - - bool hasContentWidth = false; - bool hasContentHeight = false; - qreal contentWidth = 0; - qreal contentHeight = 0; - QQuickItem *firstChild = nullptr; + qreal contentWidth; + qreal contentHeight; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopupanchors.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopupanchors.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopupanchors.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopupanchors.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickpopupanchors_p.h" -#include "qquickpopupanchors_p_p.h" -#include "qquickpopup_p_p.h" - -QT_BEGIN_NAMESPACE - -QQuickPopupAnchors::QQuickPopupAnchors(QQuickPopup *popup) - : QObject(*(new QQuickPopupAnchorsPrivate), popup) -{ - Q_D(QQuickPopupAnchors); - d->popup = popup; -} - -QQuickItem *QQuickPopupAnchors::centerIn() const -{ - Q_D(const QQuickPopupAnchors); - return d->centerIn; -} - -void QQuickPopupAnchors::setCenterIn(QQuickItem *item) -{ - Q_D(QQuickPopupAnchors); - if (item == d->centerIn) - return; - - d->centerIn = item; - QQuickPopupPrivate::get(d->popup)->reposition(); - emit centerInChanged(); -} - -void QQuickPopupAnchors::resetCenterIn() -{ - setCenterIn(nullptr); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopupanchors_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopupanchors_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopupanchors_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopupanchors_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKPOPUPANCHORS_P_H -#define QQUICKPOPUPANCHORS_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickItem; -class QQuickPopupAnchorsPrivate; -class QQuickPopup; - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopupAnchors : public QObject -{ - Q_OBJECT - Q_PROPERTY(QQuickItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn NOTIFY centerInChanged) - -public: - explicit QQuickPopupAnchors(QQuickPopup *popup); - - QQuickItem *centerIn() const; - void setCenterIn(QQuickItem *item); - void resetCenterIn(); - -Q_SIGNALS: - void centerInChanged(); - -private: - Q_DISABLE_COPY(QQuickPopupAnchors) - Q_DECLARE_PRIVATE(QQuickPopupAnchors) -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QQuickPopupAnchors) - -#endif // QQUICKPOPUPANCHORS_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopupanchors_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopupanchors_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopupanchors_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopupanchors_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKPOPUPANCHORS_P_P_H -#define QQUICKPOPUPANCHORS_P_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickItem; -class QQuickPopup; - -class QQuickPopupAnchorsPrivate : public QObjectPrivate -{ - Q_DECLARE_PUBLIC(QQuickPopupAnchors) - -public: - static QQuickPopupAnchorsPrivate *get(QQuickPopupAnchors *popupAnchors) - { - return popupAnchors->d_func(); - } - - QQuickPopup *popup = nullptr; - QQuickItem *centerIn = nullptr; -}; - -QT_END_NAMESPACE - -#endif // QQUICKPOPUPANCHORS_P_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopup.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopup.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopup.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopup.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -36,7 +36,6 @@ #include "qquickpopup_p.h" #include "qquickpopup_p_p.h" -#include "qquickpopupanchors_p.h" #include "qquickpopupitem_p_p.h" #include "qquickpopuppositioner_p_p.h" #include "qquickapplicationwindow_p.h" @@ -58,7 +57,6 @@ \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-popups - \ingroup qtquickcontrols2-focusscopes \brief Base type of popup-like user interface controls. Popup is the base type of popup-like user interface controls. It can be @@ -66,7 +64,7 @@ \qml import QtQuick.Window 2.2 - import QtQuick.Controls 2.12 + import QtQuick.Controls 2.1 ApplicationWindow { id: window @@ -110,42 +108,14 @@ \image qtquickcontrols2-popup.png The \l implicitWidth and \l implicitHeight of a popup are typically based - on the implicit sizes of the background and the content item plus any insets - and paddings. These properties determine how large the popup will be when no + on the implicit sizes of the background and the content item plus any + \l padding. These properties determine how large the popup will be when no explicit \l width or \l height is specified. - The geometry of the \l contentItem is determined by the padding. The following - example reserves 10px padding between the boundaries of the popup and its content: - - \code - Popup { - padding: 10 - - contentItem: Text { - text: "Content" - } - } - \endcode - The \l background item fills the entire width and height of the popup, - unless insets or an explicit size have been given for it. - - Negative insets can be used to make the background larger than the popup. - The following example uses negative insets to place a shadow outside the - popup's boundaries: - - \code - Popup { - topInset: -2 - leftInset: -2 - rightInset: -6 - bottomInset: -6 + unless an explicit size has been given for it. - background: BorderImage { - source: ":/images/shadowed-background.png" - } - } - \endcode + The geometry of the \l contentItem is determined by the \l padding. \section1 Popup Sizing @@ -198,23 +168,6 @@ } \endcode - \section1 Popup Positioning - - Similar to items in Qt Quick, Popup's \l x and \l y coordinates are - relative to its parent. This means that opening a popup that is a - child of a \l Button, for example, will cause the popup to be positioned - relative to the button. - - \include qquickoverlay-popup-parent.qdocinc - - Another way to center a popup in the window regardless of its parent item - is to use \l {anchors.centerIn}: - - \snippet qtquickcontrols2-popup.qml centerIn - - To ensure that the popup is positioned within the bounds of the enclosing - window, the \l margins property can be set to a non-negative value. - \sa {Popup Controls}, {Customizing Popup}, ApplicationWindow */ @@ -250,10 +203,54 @@ \sa closed() */ -const QQuickPopup::ClosePolicy QQuickPopupPrivate::DefaultClosePolicy = QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside; - QQuickPopupPrivate::QQuickPopupPrivate() - : transitionManager(this) + : focus(false), + modal(false), + dim(false), + hasDim(false), + visible(false), + complete(true), + positioning(false), + hasWidth(false), + hasHeight(false), + hasTopMargin(false), + hasLeftMargin(false), + hasRightMargin(false), + hasBottomMargin(false), + allowVerticalFlip(false), + allowHorizontalFlip(false), + allowVerticalMove(true), + allowHorizontalMove(true), + allowVerticalResize(true), + allowHorizontalResize(true), + hadActiveFocusBeforeExitTransition(false), + interactive(true), + touchId(-1), + x(0), + y(0), + effectiveX(0), + effectiveY(0), + margins(-1), + topMargin(0), + leftMargin(0), + rightMargin(0), + bottomMargin(0), + contentWidth(0), + contentHeight(0), + transitionState(QQuickPopupPrivate::NoTransition), + closePolicy(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside), + parentItem(nullptr), + dimmer(nullptr), + window(nullptr), + enter(nullptr), + exit(nullptr), + popupItem(nullptr), + positioner(nullptr), + transitionManager(this) +{ +} + +QQuickPopupPrivate::~QQuickPopupPrivate() { } @@ -266,10 +263,7 @@ QObject::connect(popupItem, &QQuickControl::paddingChanged, q, &QQuickPopup::paddingChanged); QObject::connect(popupItem, &QQuickControl::backgroundChanged, q, &QQuickPopup::backgroundChanged); QObject::connect(popupItem, &QQuickControl::contentItemChanged, q, &QQuickPopup::contentItemChanged); - QObject::connect(popupItem, &QQuickControl::implicitContentWidthChanged, q, &QQuickPopup::implicitContentWidthChanged); - QObject::connect(popupItem, &QQuickControl::implicitContentHeightChanged, q, &QQuickPopup::implicitContentHeightChanged); - QObject::connect(popupItem, &QQuickControl::implicitBackgroundWidthChanged, q, &QQuickPopup::implicitBackgroundWidthChanged); - QObject::connect(popupItem, &QQuickControl::implicitBackgroundHeightChanged, q, &QQuickPopup::implicitBackgroundHeightChanged); + positioner = new QQuickPopupPositioner(q); } void QQuickPopupPrivate::closeOrReject() @@ -432,14 +426,11 @@ if (transitionState != EnterTransition) { popupItem->setParentItem(QQuickOverlay::overlay(window)); - if (dim) - createOverlay(); - showOverlay(); emit q->aboutToShow(); visible = true; transitionState = EnterTransition; popupItem->setVisible(true); - getPositioner()->setParentItem(parentItem); + positioner->setParentItem(parentItem); emit q->visibleChanged(); } return true; @@ -458,9 +449,7 @@ if (focus) popupItem->setFocus(false); transitionState = ExitTransition; - hideOverlay(); emit q->aboutToHide(); - emit q->openedChanged(); } return true; } @@ -471,17 +460,15 @@ if (focus) popupItem->setFocus(true); transitionState = NoTransition; - emit q->openedChanged(); emit q->opened(); } void QQuickPopupPrivate::finalizeExitTransition() { Q_Q(QQuickPopup); - getPositioner()->setParentItem(nullptr); + positioner->setParentItem(nullptr); popupItem->setParentItem(nullptr); popupItem->setVisible(false); - destroyOverlay(); if (hadActiveFocusBeforeExitTransition && window) { // restore focus to the next popup in chain, or to the window content if there are no other popups open @@ -564,55 +551,6 @@ } } -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlpropertygroup QtQuick.Controls::Popup::anchors - \qmlproperty Object QtQuick.Controls::Popup::anchors.centerIn - - Anchors provide a way to position an item by specifying its - relationship with other items. - - A common use case is to center a popup within its parent. One way to do - this is with the \l {Item::}{x} and \l {Item::}{y} properties. Anchors offer - a more convenient approach: - - \qml - Pane { - // ... - - Popup { - anchors.centerIn: parent - } - } - \endqml - - It is also possible to center the popup in the window by using \l Overlay: - - \snippet qtquickcontrols2-popup.qml centerIn - - This makes it easy to center a popup in the window from any component. - - \note Popups can only be centered within their immediate parent or - the window overlay; trying to center in other items will produce a warning. - - \sa {Popup Positioning}, {Item::anchors} -*/ -QQuickPopupAnchors *QQuickPopupPrivate::getAnchors() -{ - Q_Q(QQuickPopup); - if (!anchors) - anchors = new QQuickPopupAnchors(q); - return anchors; -} - -QQuickPopupPositioner *QQuickPopupPrivate::getPositioner() -{ - Q_Q(QQuickPopup); - if (!positioner) - positioner = new QQuickPopupPositioner(q); - return positioner; -} - void QQuickPopupPrivate::setWindow(QQuickWindow *newWindow) { Q_Q(QQuickPopup); @@ -634,7 +572,6 @@ QQuickControlPrivate *p = QQuickControlPrivate::get(popupItem); p->resolveFont(); - p->resolvePalette(); if (QQuickApplicationWindow *appWindow = qobject_cast(newWindow)) p->updateLocale(appWindow->locale(), false); // explicit=false } @@ -654,97 +591,7 @@ void QQuickPopupPrivate::reposition() { - getPositioner()->reposition(); -} - -static QQuickItem *createDimmer(QQmlComponent *component, QQuickPopup *popup, QQuickItem *parent) -{ - QQuickItem *item = nullptr; - if (component) { - QQmlContext *creationContext = component->creationContext(); - if (!creationContext) - creationContext = qmlContext(popup); - QQmlContext *context = new QQmlContext(creationContext, popup); - context->setContextObject(popup); - item = qobject_cast(component->beginCreate(context)); - } - - // when there is no overlay component available (with plain QQuickWindow), - // use a plain QQuickItem as a fallback to block hover events - if (!item && popup->isModal()) - item = new QQuickItem; - - if (item) { - item->setOpacity(popup->isVisible() ? 1.0 : 0.0); - item->setParentItem(parent); - item->stackBefore(popup->popupItem()); - item->setZ(popup->z()); - if (popup->isModal()) { - item->setAcceptedMouseButtons(Qt::AllButtons); -#if QT_CONFIG(cursor) - item->setCursor(Qt::ArrowCursor); -#endif -#if QT_CONFIG(quicktemplates2_hover) - // TODO: switch to QStyleHints::useHoverEffects in Qt 5.8 - item->setAcceptHoverEvents(true); - // item->setAcceptHoverEvents(QGuiApplication::styleHints()->useHoverEffects()); - // connect(QGuiApplication::styleHints(), &QStyleHints::useHoverEffectsChanged, item, &QQuickItem::setAcceptHoverEvents); -#endif - } - if (component) - component->completeCreate(); - } - return item; -} - -void QQuickPopupPrivate::createOverlay() -{ - Q_Q(QQuickPopup); - QQuickOverlay *overlay = QQuickOverlay::overlay(window); - if (!overlay) - return; - - QQmlComponent *component = nullptr; - QQuickOverlayAttached *overlayAttached = qobject_cast(qmlAttachedPropertiesObject(q, false)); - if (overlayAttached) - component = modal ? overlayAttached->modal() : overlayAttached->modeless(); - - if (!component) - component = modal ? overlay->modal() : overlay->modeless(); - - if (!dimmer) - dimmer = createDimmer(component, q, overlay); - resizeOverlay(); -} - -void QQuickPopupPrivate::destroyOverlay() -{ - if (dimmer) { - dimmer->setParentItem(nullptr); - dimmer->deleteLater(); - dimmer = nullptr; - } -} - -void QQuickPopupPrivate::toggleOverlay() -{ - destroyOverlay(); - if (dim) - createOverlay(); -} - -void QQuickPopupPrivate::showOverlay() -{ - // use QQmlProperty instead of QQuickItem::setOpacity() to trigger QML Behaviors - if (dim && dimmer) - QQmlProperty::write(dimmer, QStringLiteral("opacity"), 1.0); -} - -void QQuickPopupPrivate::hideOverlay() -{ - // use QQmlProperty instead of QQuickItem::setOpacity() to trigger QML Behaviors - if (dim && dimmer) - QQmlProperty::write(dimmer, QStringLiteral("opacity"), 0.0); + positioner->reposition(); } void QQuickPopupPrivate::resizeOverlay() @@ -758,7 +605,7 @@ } QQuickPopupTransitionManager::QQuickPopupTransitionManager(QQuickPopupPrivate *popup) - : popup(popup) + : QQuickTransitionManager(), popup(popup) { } @@ -815,9 +662,6 @@ setParentItem(nullptr); d->popupItem->ungrabShortcut(); delete d->popupItem; - d->popupItem = nullptr; - delete d->positioner; - d->positioner = nullptr; } /*! @@ -1043,13 +887,17 @@ qreal QQuickPopup::contentWidth() const { Q_D(const QQuickPopup); - return d->popupItem->contentWidth(); + return d->contentWidth; } void QQuickPopup::setContentWidth(qreal width) { Q_D(QQuickPopup); - d->popupItem->setContentWidth(width); + if (qFuzzyCompare(d->contentWidth, width)) + return; + + d->contentWidth = width; + emit contentWidthChanged(); } /*! @@ -1065,13 +913,17 @@ qreal QQuickPopup::contentHeight() const { Q_D(const QQuickPopup); - return d->popupItem->contentHeight(); + return d->contentHeight; } void QQuickPopup::setContentHeight(qreal height) { Q_D(QQuickPopup); - d->popupItem->setContentHeight(height); + if (qFuzzyCompare(d->contentHeight, height)) + return; + + d->contentHeight = height; + emit contentHeightChanged(); } /*! @@ -1329,12 +1181,11 @@ /*! \qmlproperty real QtQuick.Controls::Popup::topPadding - This property holds the top padding. Unless explicitly set, the value - is equal to \c verticalPadding. + This property holds the top padding. \include qquickpopup-padding.qdocinc - \sa padding, bottomPadding, verticalPadding, availableHeight + \sa padding, bottomPadding, availableHeight */ qreal QQuickPopup::topPadding() const { @@ -1357,12 +1208,11 @@ /*! \qmlproperty real QtQuick.Controls::Popup::leftPadding - This property holds the left padding. Unless explicitly set, the value - is equal to \c horizontalPadding. + This property holds the left padding. \include qquickpopup-padding.qdocinc - \sa padding, rightPadding, horizontalPadding, availableWidth + \sa padding, rightPadding, availableWidth */ qreal QQuickPopup::leftPadding() const { @@ -1385,12 +1235,11 @@ /*! \qmlproperty real QtQuick.Controls::Popup::rightPadding - This property holds the right padding. Unless explicitly set, the value - is equal to \c horizontalPadding. + This property holds the right padding. \include qquickpopup-padding.qdocinc - \sa padding, leftPadding, horizontalPadding, availableWidth + \sa padding, leftPadding, availableWidth */ qreal QQuickPopup::rightPadding() const { @@ -1413,12 +1262,11 @@ /*! \qmlproperty real QtQuick.Controls::Popup::bottomPadding - This property holds the bottom padding. Unless explicitly set, the value - is equal to \c verticalPadding. + This property holds the bottom padding. \include qquickpopup-padding.qdocinc - \sa padding, topPadding, verticalPadding, availableHeight + \sa padding, topPadding, availableHeight */ qreal QQuickPopup::bottomPadding() const { @@ -1443,7 +1291,7 @@ This property holds the locale of the popup. - \sa mirrored, {LayoutMirroring}{LayoutMirroring} + \sa {LayoutMirroring}{LayoutMirroring} */ QLocale QQuickPopup::locale() const { @@ -1464,25 +1312,6 @@ } /*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::Popup::mirrored - \readonly - - This property holds whether the popup is mirrored. - - This property is provided for convenience. A popup is considered mirrored - when its visual layout direction is right-to-left; that is, when using a - right-to-left locale. - - \sa locale, {Right-to-left User Interfaces} -*/ -bool QQuickPopup::isMirrored() const -{ - Q_D(const QQuickPopup); - return d->popupItem->isMirrored(); -} - -/*! \qmlproperty font QtQuick.Controls::Popup::font This property holds the font currently set for the popup. @@ -1527,53 +1356,6 @@ d->popupItem->resetFont(); } - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty palette QtQuick.Controls::Popup::palette - - This property holds the palette currently set for the popup. - - Popup propagates explicit palette properties to its children. If you change a specific - property on a popup's palette, that property propagates to all of the popup's children, - overriding any system defaults for that property. - - \code - Popup { - palette.text: "red" - - Column { - Label { - text: qsTr("This will use red color...") - } - - Switch { - text: qsTr("... and so will this") - } - } - } - \endcode - - \sa Control::palette, ApplicationWindow::palette, {qtquickcontrols2-palette}{palette QML Basic Type} -*/ -QPalette QQuickPopup::palette() const -{ - Q_D(const QQuickPopup); - return d->popupItem->palette(); -} - -void QQuickPopup::setPalette(const QPalette &palette) -{ - Q_D(QQuickPopup); - d->popupItem->setPalette(palette); -} - -void QQuickPopup::resetPalette() -{ - Q_D(QQuickPopup); - d->popupItem->resetPalette(); -} - QQuickWindow *QQuickPopup::window() const { Q_D(const QQuickPopup); @@ -1608,9 +1390,8 @@ QQuickItemPrivate::get(d->parentItem)->removeItemChangeListener(d, QQuickItemPrivate::Destroyed); } d->parentItem = parent; - QQuickPopupPositioner *positioner = d->getPositioner(); - if (positioner->parentItem()) - positioner->setParentItem(parent); + if (d->positioner->parentItem()) + d->positioner->setParentItem(parent); if (parent) { QObjectPrivate::connect(parent, &QQuickItem::windowChanged, d, &QQuickPopupPrivate::setWindow); QQuickItemPrivate::get(d->parentItem)->addItemChangeListener(d, QQuickItemPrivate::Destroyed); @@ -1621,14 +1402,6 @@ emit parentChanged(); } -void QQuickPopup::resetParentItem() -{ - if (QQuickWindow *window = qobject_cast(parent())) - setParentItem(window->contentItem()); - else - setParentItem(qobject_cast(parent())); -} - /*! \qmlproperty Item QtQuick.Controls::Popup::background @@ -1665,7 +1438,8 @@ The content item is the visual implementation of the popup. When the popup is made visible, the content item is automatically reparented to - the \l {Overlay::overlay}{overlay item}. + the \l {ApplicationWindow::overlay}{overlay item} of its application + window. \note The content item is automatically resized to fit within the \l padding of the popup. @@ -1704,12 +1478,13 @@ \sa Item::data, contentChildren */ -QQmlListProperty QQuickPopupPrivate::contentData() +QQmlListProperty QQuickPopup::contentData() { - QQuickControlPrivate *p = QQuickControlPrivate::get(popupItem); + Q_D(QQuickPopup); + QQuickControlPrivate *p = QQuickControlPrivate::get(d->popupItem); if (!p->contentItem) p->executeContentItem(); - return QQmlListProperty(popupItem->contentItem(), nullptr, + return QQmlListProperty(d->popupItem->contentItem(), nullptr, QQuickItemPrivate::data_append, QQuickItemPrivate::data_count, QQuickItemPrivate::data_at, @@ -1729,9 +1504,10 @@ \sa Item::children, contentData */ -QQmlListProperty QQuickPopupPrivate::contentChildren() +QQmlListProperty QQuickPopup::contentChildren() { - return QQmlListProperty(popupItem->contentItem(), nullptr, + Q_D(QQuickPopup); + return QQmlListProperty(d->popupItem->contentItem(), nullptr, QQuickItemPrivate::children_append, QQuickItemPrivate::children_count, QQuickItemPrivate::children_at, @@ -1805,20 +1581,14 @@ This property holds whether the popup is modal. Modal popups often have a distinctive background dimming effect defined - in \l {Overlay::modal}{Overlay.modal}, and do not allow press - or release events through to items beneath them. For example, if the user - accidentally clicks outside of a popup, any item beneath that popup at - the location of the click will not receive the event. + in \l {ApplicationWindow::overlay}{overlay.modal}, and do not allow press + or release events through to items beneath them. On desktop platforms, it is common for modal popups to be closed only when the escape key is pressed. To achieve this behavior, set - \l closePolicy to \c Popup.CloseOnEscape. By default, \c closePolicy - is set to \c {Popup.CloseOnEscape | Popup.CloseOnPressOutside}, which - means that clicking outside of a modal popup will close it. + \l closePolicy to \c Popup.CloseOnEscape. The default value is \c false. - - \sa dim */ bool QQuickPopup::isModal() const { @@ -1832,8 +1602,6 @@ if (d->modal == modal) return; d->modal = modal; - if (d->complete && d->visible) - d->toggleOverlay(); emit modalChanged(); if (!d->hasDim) { @@ -1850,7 +1618,7 @@ Unless explicitly set, this property follows the value of \l modal. To return to the default value, set this property to \c undefined. - \sa modal, {Overlay::modeless}{Overlay.modeless} + \sa modal */ bool QQuickPopup::dim() const { @@ -1867,8 +1635,6 @@ return; d->dim = dim; - if (d->complete && d->visible) - d->toggleOverlay(); emit dimChanged(); } @@ -1887,7 +1653,7 @@ This property holds whether the popup is visible. The default value is \c false. - \sa open(), close(), opened + \sa open(), close() */ bool QQuickPopup::isVisible() const { @@ -1912,41 +1678,6 @@ } /*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::Popup::enabled - - This property holds whether the popup is enabled. The default value is \c true. - - \sa visible, Item::enabled -*/ -bool QQuickPopup::isEnabled() const -{ - Q_D(const QQuickPopup); - return d->popupItem->isEnabled(); -} - -void QQuickPopup::setEnabled(bool enabled) -{ - Q_D(QQuickPopup); - d->popupItem->setEnabled(enabled); -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::Popup::opened - - This property holds whether the popup is fully open. The popup is considered opened - when it's visible and neither the \l enter nor \l exit transitions are running. - - \sa open(), close(), visible -*/ -bool QQuickPopup::isOpened() const -{ - Q_D(const QQuickPopup); - return d->transitionState == QQuickPopupPrivate::NoTransition && isVisible(); -} - -/*! \qmlproperty real QtQuick.Controls::Popup::opacity This property holds the opacity of the popup. Opacity is specified as a number between @@ -1972,8 +1703,8 @@ This property holds the scale factor of the popup. The default value is \c 1.0. A scale of less than \c 1.0 causes the popup to be rendered at a smaller size, - and a scale greater than \c 1.0 renders the popup at a larger size. Negative - scales are not supported. + and a scale greater than \c 1.0 renders the popup at a larger size. A negative + scale causes the popup to be mirrored when rendered. */ qreal QQuickPopup::scale() const { @@ -2020,7 +1751,6 @@ void QQuickPopup::setClosePolicy(ClosePolicy policy) { Q_D(QQuickPopup); - d->hasClosePolicy = true; if (d->closePolicy == policy) return; d->closePolicy = policy; @@ -2033,13 +1763,6 @@ emit closePolicyChanged(); } -void QQuickPopup::resetClosePolicy() -{ - Q_D(QQuickPopup); - setClosePolicy(QQuickPopupPrivate::DefaultClosePolicy); - d->hasClosePolicy = false; -} - /*! \qmlproperty enumeration QtQuick.Controls::Popup::transformOrigin @@ -2130,236 +1853,6 @@ emit exitChanged(); } -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Popup::horizontalPadding - - This property holds the horizontal padding. Unless explicitly set, the value - is equal to \c padding. - - \include qquickpopup-padding.qdocinc - - \sa padding, leftPadding, rightPadding, verticalPadding -*/ -qreal QQuickPopup::horizontalPadding() const -{ - Q_D(const QQuickPopup); - return d->popupItem->horizontalPadding(); -} - -void QQuickPopup::setHorizontalPadding(qreal padding) -{ - Q_D(QQuickPopup); - d->popupItem->setHorizontalPadding(padding); -} - -void QQuickPopup::resetHorizontalPadding() -{ - Q_D(QQuickPopup); - d->popupItem->resetHorizontalPadding(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Popup::verticalPadding - - This property holds the vertical padding. Unless explicitly set, the value - is equal to \c padding. - - \include qquickpopup-padding.qdocinc - - \sa padding, topPadding, bottomPadding, horizontalPadding -*/ -qreal QQuickPopup::verticalPadding() const -{ - Q_D(const QQuickPopup); - return d->popupItem->verticalPadding(); -} - -void QQuickPopup::setVerticalPadding(qreal padding) -{ - Q_D(QQuickPopup); - d->popupItem->setVerticalPadding(padding); -} - -void QQuickPopup::resetVerticalPadding() -{ - Q_D(QQuickPopup); - d->popupItem->resetVerticalPadding(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Popup::implicitContentWidth - \readonly - - This property holds the implicit content width. - - The value is calculated based on the content children. - - \sa implicitContentHeight, implicitBackgroundWidth -*/ -qreal QQuickPopup::implicitContentWidth() const -{ - Q_D(const QQuickPopup); - return d->popupItem->implicitContentWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Popup::implicitContentHeight - \readonly - - This property holds the implicit content height. - - The value is calculated based on the content children. - - \sa implicitContentWidth, implicitBackgroundHeight -*/ -qreal QQuickPopup::implicitContentHeight() const -{ - Q_D(const QQuickPopup); - return d->popupItem->implicitContentHeight(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Popup::implicitBackgroundWidth - \readonly - - This property holds the implicit background width. - - The value is equal to \c {background ? background.implicitWidth : 0}. - - \sa implicitBackgroundHeight, implicitContentWidth -*/ -qreal QQuickPopup::implicitBackgroundWidth() const -{ - Q_D(const QQuickPopup); - return d->popupItem->implicitBackgroundWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Popup::implicitBackgroundHeight - \readonly - - This property holds the implicit background height. - - The value is equal to \c {background ? background.implicitHeight : 0}. - - \sa implicitBackgroundWidth, implicitContentHeight -*/ -qreal QQuickPopup::implicitBackgroundHeight() const -{ - Q_D(const QQuickPopup); - return d->popupItem->implicitBackgroundHeight(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Popup::topInset - - This property holds the top inset for the background. - - \sa {Popup Layout}, bottomInset -*/ -qreal QQuickPopup::topInset() const -{ - Q_D(const QQuickPopup); - return d->popupItem->topInset(); -} - -void QQuickPopup::setTopInset(qreal inset) -{ - Q_D(QQuickPopup); - d->popupItem->setTopInset(inset); -} - -void QQuickPopup::resetTopInset() -{ - Q_D(QQuickPopup); - d->popupItem->resetTopInset(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Popup::leftInset - - This property holds the left inset for the background. - - \sa {Popup Layout}, rightInset -*/ -qreal QQuickPopup::leftInset() const -{ - Q_D(const QQuickPopup); - return d->popupItem->leftInset(); -} - -void QQuickPopup::setLeftInset(qreal inset) -{ - Q_D(QQuickPopup); - d->popupItem->setLeftInset(inset); -} - -void QQuickPopup::resetLeftInset() -{ - Q_D(QQuickPopup); - d->popupItem->resetLeftInset(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Popup::rightInset - - This property holds the right inset for the background. - - \sa {Popup Layout}, leftInset -*/ -qreal QQuickPopup::rightInset() const -{ - Q_D(const QQuickPopup); - return d->popupItem->rightInset(); -} - -void QQuickPopup::setRightInset(qreal inset) -{ - Q_D(QQuickPopup); - d->popupItem->setRightInset(inset); -} - -void QQuickPopup::resetRightInset() -{ - Q_D(QQuickPopup); - d->popupItem->resetRightInset(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Popup::bottomInset - - This property holds the bottom inset for the background. - - \sa {Popup Layout}, topInset -*/ -qreal QQuickPopup::bottomInset() const -{ - Q_D(const QQuickPopup); - return d->popupItem->bottomInset(); -} - -void QQuickPopup::setBottomInset(qreal inset) -{ - Q_D(QQuickPopup); - d->popupItem->setBottomInset(inset); -} - -void QQuickPopup::resetBottomInset() -{ - Q_D(QQuickPopup); - d->popupItem->resetBottomInset(); -} - bool QQuickPopup::filtersChildMouseEvents() const { Q_D(const QQuickPopup); @@ -2401,8 +1894,12 @@ void QQuickPopup::componentComplete() { Q_D(QQuickPopup); - if (!parentItem()) - resetParentItem(); + if (!parentItem()) { + if (QQuickItem *item = qobject_cast(parent())) + setParentItem(item); + else if (QQuickWindow *window = qobject_cast(parent())) + setParentItem(window->contentItem()); + } if (d->visible && d->window) d->transitionManager.transitionEnter(); @@ -2535,14 +2032,6 @@ Q_UNUSED(oldItem); } -void QQuickPopup::contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize) -{ - if (!qFuzzyCompare(newSize.width(), oldSize.width())) - emit contentWidthChanged(); - if (!qFuzzyCompare(newSize.height(), oldSize.height())) - emit contentHeightChanged(); -} - void QQuickPopup::fontChange(const QFont &newFont, const QFont &oldFont) { Q_UNUSED(newFont); @@ -2618,21 +2107,10 @@ if (bp) emit bottomPaddingChanged(); - if (lp || rp) { - emit horizontalPaddingChanged(); + if (lp || rp) emit availableWidthChanged(); - } - if (tp || bp) { - emit verticalPaddingChanged(); + if (tp || bp) emit availableHeightChanged(); - } -} - -void QQuickPopup::paletteChange(const QPalette &newPalette, const QPalette &oldPalette) -{ - Q_UNUSED(newPalette); - Q_UNUSED(oldPalette); - emit paletteChanged(); } void QQuickPopup::spacingChange(qreal newSpacing, qreal oldSpacing) @@ -2642,26 +2120,9 @@ emit spacingChanged(); } -void QQuickPopup::insetChange(const QMarginsF &newInset, const QMarginsF &oldInset) -{ - if (!qFuzzyCompare(newInset.top(), oldInset.top())) - emit topInsetChanged(); - if (!qFuzzyCompare(newInset.left(), oldInset.left())) - emit leftInsetChanged(); - if (!qFuzzyCompare(newInset.right(), oldInset.right())) - emit rightInsetChanged(); - if (!qFuzzyCompare(newInset.bottom(), oldInset.bottom())) - emit bottomInsetChanged(); -} - QFont QQuickPopup::defaultFont() const { - return QQuickTheme::font(QQuickTheme::System); -} - -QPalette QQuickPopup::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::System); + return QQuickControlPrivate::themeFont(QPlatformTheme::SystemFont); } #if QT_CONFIG(accessibility) @@ -2701,5 +2162,3 @@ } QT_END_NAMESPACE - -#include "moc_qquickpopup_p.cpp" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopupitem.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopupitem.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopupitem.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopupitem.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -37,8 +37,7 @@ #include "qquickpopupitem_p_p.h" #include "qquickapplicationwindow_p.h" #include "qquickshortcutcontext_p_p.h" -#include "qquickpage_p_p.h" -#include "qquickcontentitem_p.h" +#include "qquickcontrol_p_p.h" #include "qquickpopup_p_p.h" #include "qquickdeferredexecute_p_p.h" @@ -47,7 +46,7 @@ QT_BEGIN_NAMESPACE -class QQuickPopupItemPrivate : public QQuickPagePrivate +class QQuickPopupItemPrivate : public QQuickControlPrivate { Q_DECLARE_PUBLIC(QQuickPopupItem) @@ -58,7 +57,6 @@ void implicitHeightChanged() override; void resolveFont() override; - void resolvePalette() override; QQuickItem *getContentItem() override; @@ -68,26 +66,28 @@ void cancelBackground() override; void executeBackground(bool complete = false) override; - int backId = 0; - int escapeId = 0; - QQuickPopup *popup = nullptr; + int backId; + int escapeId; + QQuickPopup *popup; }; QQuickPopupItemPrivate::QQuickPopupItemPrivate(QQuickPopup *popup) - : popup(popup) + : backId(0), + escapeId(0), + popup(popup) { isTabFence = true; } void QQuickPopupItemPrivate::implicitWidthChanged() { - QQuickPagePrivate::implicitWidthChanged(); + QQuickControlPrivate::implicitWidthChanged(); emit popup->implicitWidthChanged(); } void QQuickPopupItemPrivate::implicitHeightChanged() { - QQuickPagePrivate::implicitHeightChanged(); + QQuickControlPrivate::implicitHeightChanged(); emit popup->implicitHeightChanged(); } @@ -96,24 +96,15 @@ if (QQuickApplicationWindow *window = qobject_cast(popup->window())) inheritFont(window->font()); else - inheritFont(QQuickTheme::font(QQuickTheme::System)); -} - -void QQuickPopupItemPrivate::resolvePalette() -{ - if (QQuickApplicationWindow *window = qobject_cast(popup->window())) - inheritPalette(window->palette()); - else - inheritPalette(QQuickTheme::palette(QQuickTheme::System)); + inheritFont(themeFont(QPlatformTheme::SystemFont)); } QQuickItem *QQuickPopupItemPrivate::getContentItem() { Q_Q(QQuickPopupItem); - if (QQuickItem *item = QQuickPagePrivate::getContentItem()) + if (QQuickItem *item = QQuickControlPrivate::getContentItem()) return item; - - return new QQuickContentItem(popup, q); + return new QQuickItem(q); } static inline QString contentItemName() { return QStringLiteral("contentItem"); } @@ -153,7 +144,7 @@ } QQuickPopupItem::QQuickPopupItem(QQuickPopup *popup) - : QQuickPage(*(new QQuickPopupItemPrivate(popup)), nullptr) + : QQuickControl(*(new QQuickPopupItemPrivate(popup)), nullptr) { setParent(popup); setFlag(ItemIsFocusScope); @@ -307,90 +298,51 @@ void QQuickPopupItem::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) { Q_D(QQuickPopupItem); - QQuickPage::contentItemChange(newItem, oldItem); + QQuickControl::contentItemChange(newItem, oldItem); d->popup->contentItemChange(newItem, oldItem); } -void QQuickPopupItem::contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize) -{ - Q_D(QQuickPopupItem); - QQuickPage::contentSizeChange(newSize, oldSize); - d->popup->contentSizeChange(newSize, oldSize); -} - void QQuickPopupItem::fontChange(const QFont &newFont, const QFont &oldFont) { Q_D(QQuickPopupItem); - QQuickPage::fontChange(newFont, oldFont); + QQuickControl::fontChange(newFont, oldFont); d->popup->fontChange(newFont, oldFont); } void QQuickPopupItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickPopupItem); - QQuickPage::geometryChanged(newGeometry, oldGeometry); + QQuickControl::geometryChanged(newGeometry, oldGeometry); d->popup->geometryChanged(newGeometry, oldGeometry); } void QQuickPopupItem::localeChange(const QLocale &newLocale, const QLocale &oldLocale) { Q_D(QQuickPopupItem); - QQuickPage::localeChange(newLocale, oldLocale); + QQuickControl::localeChange(newLocale, oldLocale); d->popup->localeChange(newLocale, oldLocale); } -void QQuickPopupItem::mirrorChange() -{ - Q_D(QQuickPopupItem); - emit d->popup->mirroredChanged(); -} - void QQuickPopupItem::itemChange(ItemChange change, const ItemChangeData &data) { Q_D(QQuickPopupItem); - QQuickPage::itemChange(change, data); + QQuickControl::itemChange(change, data); d->popup->itemChange(change, data); } void QQuickPopupItem::paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) { Q_D(QQuickPopupItem); - QQuickPage::paddingChange(newPadding, oldPadding); + QQuickControl::paddingChange(newPadding, oldPadding); d->popup->paddingChange(newPadding, oldPadding); } -void QQuickPopupItem::paletteChange(const QPalette &newPalette, const QPalette &oldPalette) -{ - Q_D(QQuickPopupItem); - QQuickPage::paletteChange(newPalette, oldPalette); - d->popup->paletteChange(newPalette, oldPalette); -} - -void QQuickPopupItem::enabledChange() -{ - Q_D(QQuickPopupItem); - // Just having QQuickPopup connect our QQuickItem::enabledChanged() signal - // to its enabledChanged() signal is enough for the enabled property to work, - // but we must also ensure that its paletteChanged() signal is emitted - // so that bindings to palette are re-evaluated, because QQuickControl::palette() - // returns a different palette depending on whether or not the control is enabled. - // To save a connection, we also emit enabledChanged here. - emit d->popup->enabledChanged(); - emit d->popup->paletteChanged(); -} - QFont QQuickPopupItem::defaultFont() const { Q_D(const QQuickPopupItem); return d->popup->defaultFont(); } -QPalette QQuickPopupItem::defaultPalette() const -{ - Q_D(const QQuickPopupItem); - return d->popup->defaultPalette(); -} - #if QT_CONFIG(accessibility) QAccessible::Role QQuickPopupItem::accessibleRole() const { @@ -401,7 +353,7 @@ void QQuickPopupItem::accessibilityActiveChanged(bool active) { Q_D(const QQuickPopupItem); - QQuickPage::accessibilityActiveChanged(active); + QQuickControl::accessibilityActiveChanged(active); d->popup->accessibilityActiveChanged(active); } #endif diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopupitem_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopupitem_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopupitem_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopupitem_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,13 +48,14 @@ // We mean it. // -#include +#include "qquickcontrol_p.h" QT_BEGIN_NAMESPACE class QQuickPopup; class QQuickPopupItemPrivate; -class QQuickPopupItem : public QQuickPage + +class QQuickPopupItem : public QQuickControl { Q_OBJECT @@ -87,18 +88,13 @@ #endif void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; - void contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize) override; void fontChange(const QFont &newFont, const QFont &oldFont) override; void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override; - void mirrorChange() override; void itemChange(ItemChange change, const ItemChangeData &data) override; void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; - void paletteChange(const QPalette &newPalette, const QPalette &oldPalette) override; - void enabledChange() override; QFont defaultFont() const override; - QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopup_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopup_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopup_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopup_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -67,7 +66,6 @@ QT_BEGIN_NAMESPACE class QQuickWindow; -class QQuickPopupAnchors; class QQuickPopupPrivate; class QQuickTransition; @@ -98,11 +96,11 @@ Q_PROPERTY(qreal bottomPadding READ bottomPadding WRITE setBottomPadding RESET resetBottomPadding NOTIFY bottomPaddingChanged FINAL) Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL) Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL) - Q_PROPERTY(QQuickItem *parent READ parentItem WRITE setParentItem RESET resetParentItem NOTIFY parentChanged FINAL) + Q_PROPERTY(QQuickItem *parent READ parentItem WRITE setParentItem NOTIFY parentChanged FINAL) Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL) - Q_PRIVATE_PROPERTY(QQuickPopup::d_func(), QQmlListProperty contentData READ contentData FINAL) - Q_PRIVATE_PROPERTY(QQuickPopup::d_func(), QQmlListProperty contentChildren READ contentChildren NOTIFY contentChildrenChanged FINAL) + Q_PROPERTY(QQmlListProperty contentData READ contentData FINAL) + Q_PROPERTY(QQmlListProperty contentChildren READ contentChildren NOTIFY contentChildrenChanged FINAL) Q_PROPERTY(bool clip READ clip WRITE setClip NOTIFY clipChanged FINAL) Q_PROPERTY(bool focus READ hasFocus WRITE setFocus NOTIFY focusChanged FINAL) Q_PROPERTY(bool activeFocus READ hasActiveFocus NOTIFY activeFocusChanged FINAL) @@ -111,29 +109,12 @@ Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL) Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged FINAL) Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged FINAL) - Q_PROPERTY(ClosePolicy closePolicy READ closePolicy WRITE setClosePolicy RESET resetClosePolicy NOTIFY closePolicyChanged FINAL) - Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin FINAL) + Q_PROPERTY(ClosePolicy closePolicy READ closePolicy WRITE setClosePolicy NOTIFY closePolicyChanged FINAL) + Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin) Q_PROPERTY(QQuickTransition *enter READ enter WRITE setEnter NOTIFY enterChanged FINAL) Q_PROPERTY(QQuickTransition *exit READ exit WRITE setExit NOTIFY exitChanged FINAL) // 2.1 (Qt 5.8) Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL REVISION 1) - // 2.3 (Qt 5.10) - Q_PROPERTY(bool opened READ isOpened NOTIFY openedChanged FINAL REVISION 3) - Q_PROPERTY(bool mirrored READ isMirrored NOTIFY mirroredChanged FINAL REVISION 3) - Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL REVISION 3) - Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal horizontalPadding READ horizontalPadding WRITE setHorizontalPadding RESET resetHorizontalPadding NOTIFY horizontalPaddingChanged FINAL) - Q_PROPERTY(qreal verticalPadding READ verticalPadding WRITE setVerticalPadding RESET resetVerticalPadding NOTIFY verticalPaddingChanged FINAL) - Q_PRIVATE_PROPERTY(QQuickPopup::d_func(), QQuickPopupAnchors *anchors READ getAnchors DESIGNABLE false CONSTANT FINAL REVISION 5) - Q_PROPERTY(qreal implicitContentWidth READ implicitContentWidth NOTIFY implicitContentWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitContentHeight READ implicitContentHeight NOTIFY implicitContentHeightChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitBackgroundWidth READ implicitBackgroundWidth NOTIFY implicitBackgroundWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitBackgroundHeight READ implicitBackgroundHeight NOTIFY implicitBackgroundHeightChanged FINAL REVISION 5) - Q_PROPERTY(qreal topInset READ topInset WRITE setTopInset RESET resetTopInset NOTIFY topInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal leftInset READ leftInset WRITE setLeftInset RESET resetLeftInset NOTIFY leftInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal rightInset READ rightInset WRITE setRightInset RESET resetRightInset NOTIFY rightInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal bottomInset READ bottomInset WRITE setBottomInset RESET resetBottomInset NOTIFY bottomInsetChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "background,contentItem") Q_CLASSINFO("DefaultProperty", "contentData") @@ -229,7 +210,6 @@ QQuickItem *parentItem() const; void setParentItem(QQuickItem *parent); - void resetParentItem(); QQuickItem *background() const; void setBackground(QQuickItem *background); @@ -237,6 +217,9 @@ QQuickItem *contentItem() const; void setContentItem(QQuickItem *item); + QQmlListProperty contentData(); + QQmlListProperty contentChildren(); + bool clip() const; void setClip(bool clip); @@ -274,7 +257,6 @@ ClosePolicy closePolicy() const; void setClosePolicy(ClosePolicy policy); - void resetClosePolicy(); // keep in sync with Item.TransformOrigin enum TransformOrigin { @@ -303,48 +285,6 @@ void setSpacing(qreal spacing); void resetSpacing(); - // 2.3 (Qt 5.10) - bool isOpened() const; - bool isMirrored() const; - - bool isEnabled() const; - void setEnabled(bool enabled); - - QPalette palette() const; - void setPalette(const QPalette &palette); - void resetPalette(); - - // 2.5 (Qt 5.12) - qreal horizontalPadding() const; - void setHorizontalPadding(qreal padding); - void resetHorizontalPadding(); - - qreal verticalPadding() const; - void setVerticalPadding(qreal padding); - void resetVerticalPadding(); - - qreal implicitContentWidth() const; - qreal implicitContentHeight() const; - - qreal implicitBackgroundWidth() const; - qreal implicitBackgroundHeight() const; - - qreal topInset() const; - void setTopInset(qreal inset); - void resetTopInset(); - - qreal leftInset() const; - void setLeftInset(qreal inset); - void resetLeftInset(); - - qreal rightInset() const; - void setRightInset(qreal inset); - void resetRightInset(); - - qreal bottomInset() const; - void setBottomInset(qreal inset); - void resetBottomInset(); - public Q_SLOTS: void open(); void close(); @@ -395,22 +335,6 @@ void windowChanged(QQuickWindow *window); // 2.1 (Qt 5.8) Q_REVISION(1) void spacingChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void openedChanged(); - Q_REVISION(3) void mirroredChanged(); - Q_REVISION(3) void enabledChanged(); - Q_REVISION(3) void paletteChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void horizontalPaddingChanged(); - Q_REVISION(5) void verticalPaddingChanged(); - Q_REVISION(5) void implicitContentWidthChanged(); - Q_REVISION(5) void implicitContentHeightChanged(); - Q_REVISION(5) void implicitBackgroundWidthChanged(); - Q_REVISION(5) void implicitBackgroundHeightChanged(); - Q_REVISION(5) void topInsetChanged(); - Q_REVISION(5) void leftInsetChanged(); - Q_REVISION(5) void rightInsetChanged(); - Q_REVISION(5) void bottomInsetChanged(); protected: QQuickPopup(QQuickPopupPrivate &dd, QObject *parent); @@ -439,19 +363,15 @@ #endif virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem); - virtual void contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize); virtual void fontChange(const QFont &newFont, const QFont &oldFont); virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); virtual void localeChange(const QLocale &newLocale, const QLocale &oldLocale); virtual void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data); virtual void marginsChange(const QMarginsF &newMargins, const QMarginsF &oldMargins); virtual void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding); - virtual void paletteChange(const QPalette &newPalette, const QPalette &oldPalette); virtual void spacingChange(qreal newSpacing, qreal oldSpacing); - virtual void insetChange(const QMarginsF &newInset, const QMarginsF &oldInset); virtual QFont defaultFont() const; - virtual QPalette defaultPalette() const; #if QT_CONFIG(accessibility) virtual QAccessible::Role accessibleRole() const; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopuppositioner.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopuppositioner.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopuppositioner.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopuppositioner.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -34,13 +34,10 @@ ** ****************************************************************************/ -#include "qquickoverlay_p.h" #include "qquickpopuppositioner_p_p.h" -#include "qquickpopupanchors_p.h" #include "qquickpopupitem_p_p.h" #include "qquickpopup_p_p.h" -#include #include QT_BEGIN_NAMESPACE @@ -53,7 +50,9 @@ | QQuickItemPrivate::Parent; QQuickPopupPositioner::QQuickPopupPositioner(QQuickPopup *popup) - : m_popup(popup) + : m_positioning(false), + m_parentItem(nullptr), + m_popup(popup) { } @@ -65,11 +64,6 @@ } } -QQuickPopup *QQuickPopupPositioner::popup() const -{ - return m_popup; -} - QQuickItem *QQuickPopupPositioner::parentItem() const { return m_parentItem; @@ -117,31 +111,12 @@ bool heightAdjusted = false; QQuickPopupPrivate *p = QQuickPopupPrivate::get(m_popup); - const QQuickItem *centerInParent = p->anchors ? p->getAnchors()->centerIn() : nullptr; - const QQuickOverlay *centerInOverlay = qobject_cast(centerInParent); - QRectF rect(!centerInParent ? p->allowHorizontalMove ? p->x : popupItem->x() : 0, - !centerInParent ? p->allowVerticalMove ? p->y : popupItem->y() : 0, + QRectF rect(p->allowHorizontalMove ? p->x : popupItem->x(), + p->allowVerticalMove ? p->y : popupItem->y(), !p->hasWidth && iw > 0 ? iw : w, !p->hasHeight && ih > 0 ? ih : h); if (m_parentItem) { - // m_parentItem is the parent that the popup should open in, - // and popupItem()->parentItem() is the overlay, so the mapToItem() calls below - // effectively map the rect to scene coordinates. - if (centerInParent) { - if (centerInParent != parentItem() && !centerInOverlay) { - qmlWarning(m_popup) << "Popup can only be centered within its immediate parent or Overlay.overlay"; - return; - } - - if (centerInOverlay) { - rect.moveCenter(QPointF(qRound(centerInOverlay->width() / 2.0), qRound(centerInOverlay->height() / 2.0))); - } else { - const QPointF parentItemCenter = QPointF(qRound(m_parentItem->width() / 2), qRound(m_parentItem->height() / 2)); - rect.moveCenter(m_parentItem->mapToItem(popupItem->parentItem(), parentItemCenter)); - } - } else { - rect.moveTopLeft(m_parentItem->mapToItem(popupItem->parentItem(), rect.topLeft())); - } + rect.moveTopLeft(m_parentItem->mapToItem(popupItem->parentItem(), rect.topLeft())); if (p->window) { const QMarginsF margins = p->getMargins(); @@ -242,11 +217,7 @@ popupItem->setPosition(rect.topLeft()); - // If the popup was assigned a parent, rect will be in scene coordinates, - // so we need to map its top left back to item coordinates. - // However, if centering within the overlay, the coordinates will be relative - // to the window, so we don't need to do anything. - const QPointF effectivePos = m_parentItem && !centerInOverlay ? m_parentItem->mapFromScene(rect.topLeft()) : rect.topLeft(); + const QPointF effectivePos = m_parentItem ? m_parentItem->mapFromScene(rect.topLeft()) : rect.topLeft(); if (!qFuzzyCompare(p->effectiveX, effectivePos.x())) { p->effectiveX = effectivePos.x(); emit m_popup->xChanged(); @@ -277,7 +248,7 @@ void QQuickPopupPositioner::itemChildRemoved(QQuickItem *item, QQuickItem *child) { - if (child == m_parentItem || child->isAncestorOf(m_parentItem)) + if (child->isAncestorOf(m_parentItem)) removeAncestorListeners(item); } @@ -300,7 +271,7 @@ QQuickItem *p = item; while (p) { - QQuickItemPrivate::get(p)->updateOrAddItemChangeListener(this, AncestorChangeTypes); + QQuickItemPrivate::get(p)->addItemChangeListener(this, AncestorChangeTypes); p = p->parentItem(); } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopuppositioner_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopuppositioner_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopuppositioner_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopuppositioner_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -61,8 +61,6 @@ explicit QQuickPopupPositioner(QQuickPopup *popup); ~QQuickPopupPositioner(); - QQuickPopup *popup() const; - QQuickItem *parentItem() const; void setParentItem(QQuickItem *parent); @@ -73,12 +71,13 @@ void itemParentChanged(QQuickItem *, QQuickItem *parent) override; void itemChildRemoved(QQuickItem *, QQuickItem *child) override; +private: void removeAncestorListeners(QQuickItem *item); void addAncestorListeners(QQuickItem *item); - bool m_positioning = false; - QQuickItem *m_parentItem = nullptr; - QQuickPopup *m_popup = nullptr; + bool m_positioning; + QQuickItem *m_parentItem; + QQuickPopup *m_popup; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopup_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopup_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpopup_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpopup_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ // We mean it. // -#include -#include +#include "qquickpopup_p.h" +#include "qquickcontrol_p.h" #include #include @@ -61,7 +61,6 @@ class QQuickTransition; class QQuickTransitionManager; class QQuickPopup; -class QQuickPopupAnchors; class QQuickPopupItem; class QQuickPopupPrivate; class QQuickPopupPositioner; @@ -78,7 +77,7 @@ void finished() override; private: - QQuickPopupPrivate *popup = nullptr; + QQuickPopupPrivate *popup; }; class Q_AUTOTEST_EXPORT QQuickPopupPrivate : public QObjectPrivate, public QQuickItemChangeListener @@ -87,15 +86,13 @@ public: QQuickPopupPrivate(); + ~QQuickPopupPrivate(); static QQuickPopupPrivate *get(QQuickPopup *popup) { return popup->d_func(); } - QQmlListProperty contentData(); - QQmlListProperty contentChildren(); - void init(); void closeOrReject(); bool tryClose(const QPointF &pos, QQuickPopup::ClosePolicy flags); @@ -117,13 +114,7 @@ bool handleTouchEvent(QQuickItem *item, QTouchEvent *event); #endif - void reposition(); - - void createOverlay(); - void destroyOverlay(); - void toggleOverlay(); - virtual void showOverlay(); - virtual void hideOverlay(); + virtual void reposition(); virtual void resizeOverlay(); virtual bool prepareEnterTransition(); @@ -138,9 +129,6 @@ void setRightMargin(qreal value, bool reset = false); void setBottomMargin(qreal value, bool reset = false); - QQuickPopupAnchors *getAnchors(); - virtual QQuickPopupPositioner *getPositioner(); - void setWindow(QQuickWindow *window); void itemDestroyed(QQuickItem *item) override; @@ -148,54 +136,52 @@ NoTransition, EnterTransition, ExitTransition }; - static const QQuickPopup::ClosePolicy DefaultClosePolicy; - - bool focus = false; - bool modal = false; - bool dim = false; - bool hasDim = false; - bool visible = false; - bool complete = true; - bool positioning = false; - bool hasWidth = false; - bool hasHeight = false; - bool hasTopMargin = false; - bool hasLeftMargin = false; - bool hasRightMargin = false; - bool hasBottomMargin = false; - bool allowVerticalFlip = false; - bool allowHorizontalFlip = false; - bool allowVerticalMove = true; - bool allowHorizontalMove = true; - bool allowVerticalResize = true; - bool allowHorizontalResize = true; - bool hadActiveFocusBeforeExitTransition = false; - bool interactive = true; - bool hasClosePolicy = false; - int touchId = -1; - qreal x = 0; - qreal y = 0; - qreal effectiveX = 0; - qreal effectiveY = 0; - qreal margins = -1; - qreal topMargin = 0; - qreal leftMargin = 0; - qreal rightMargin = 0; - qreal bottomMargin = 0; + bool focus; + bool modal; + bool dim; + bool hasDim; + bool visible; + bool complete; + bool positioning; + bool hasWidth; + bool hasHeight; + bool hasTopMargin; + bool hasLeftMargin; + bool hasRightMargin; + bool hasBottomMargin; + bool allowVerticalFlip; + bool allowHorizontalFlip; + bool allowVerticalMove; + bool allowHorizontalMove; + bool allowVerticalResize; + bool allowHorizontalResize; + bool hadActiveFocusBeforeExitTransition; + bool interactive; + int touchId; + qreal x; + qreal y; + qreal effectiveX; + qreal effectiveY; + qreal margins; + qreal topMargin; + qreal leftMargin; + qreal rightMargin; + qreal bottomMargin; + qreal contentWidth; + qreal contentHeight; QPointF pressPoint; - TransitionState transitionState = NoTransition; - QQuickPopup::ClosePolicy closePolicy = DefaultClosePolicy; - QQuickItem *parentItem = nullptr; - QQuickItem *dimmer = nullptr; - QQuickWindow *window = nullptr; - QQuickTransition *enter = nullptr; - QQuickTransition *exit = nullptr; - QQuickPopupItem *popupItem = nullptr; - QQuickPopupPositioner *positioner = nullptr; + TransitionState transitionState; + QQuickPopup::ClosePolicy closePolicy; + QQuickItem *parentItem; + QQuickItem *dimmer; + QQuickWindow *window; + QQuickTransition *enter; + QQuickTransition *exit; + QQuickPopupItem *popupItem; + QQuickPopupPositioner *positioner; QList enterActions; QList exitActions; QQuickPopupTransitionManager transitionManager; - QQuickPopupAnchors *anchors = nullptr; friend class QQuickPopupTransitionManager; }; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpresshandler.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpresshandler.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpresshandler.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpresshandler.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -44,6 +44,16 @@ QT_BEGIN_NAMESPACE +QQuickPressHandler::QQuickPressHandler() + : control(nullptr), + longPress(false), + pressAndHoldSignalIndex(-1), + pressedSignalIndex(-1), + releasedSignalIndex(-1), + delayedMousePressEvent(nullptr) +{ +} + void QQuickPressHandler::mousePressEvent(QMouseEvent *event) { longPress = false; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpresshandler_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpresshandler_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickpresshandler_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickpresshandler_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -59,6 +59,8 @@ struct QQuickPressHandler { + QQuickPressHandler(); + void mousePressEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event); @@ -67,14 +69,14 @@ void clearDelayedMouseEvent(); bool isActive(); - QQuickItem *control = nullptr; + QQuickItem *control; QBasicTimer timer; QPointF pressPos; - bool longPress = false; - int pressAndHoldSignalIndex = -1; - int pressedSignalIndex = -1; - int releasedSignalIndex = -1; - QMouseEvent *delayedMousePressEvent = nullptr; + bool longPress; + int pressAndHoldSignalIndex; + int pressedSignalIndex; + int releasedSignalIndex; + QMouseEvent *delayedMousePressEvent; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickprogressbar.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickprogressbar.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickprogressbar.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickprogressbar.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -89,10 +89,18 @@ class QQuickProgressBarPrivate : public QQuickControlPrivate { public: - qreal from = 0; - qreal to = 1; - qreal value = 0; - bool indeterminate = false; + QQuickProgressBarPrivate() + : from(0), + to(1.0), + value(0), + indeterminate(false) + { + } + + qreal from; + qreal to; + qreal value; + bool indeterminate; }; QQuickProgressBar::QQuickProgressBar(QQuickItem *parent) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickradiobutton.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickradiobutton.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickradiobutton.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickradiobutton.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -99,12 +99,7 @@ QFont QQuickRadioButton::defaultFont() const { - return QQuickTheme::font(QQuickTheme::RadioButton); -} - -QPalette QQuickRadioButton::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::RadioButton); + return QQuickControlPrivate::themeFont(QPlatformTheme::RadioButtonFont); } #if QT_CONFIG(accessibility) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickradiobutton_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickradiobutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickradiobutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickradiobutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -61,7 +61,6 @@ protected: QFont defaultFont() const override; - QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickradiodelegate.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickradiodelegate.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickradiodelegate.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickradiodelegate.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -100,12 +100,7 @@ QFont QQuickRadioDelegate::defaultFont() const { - return QQuickTheme::font(QQuickTheme::ListView); -} - -QPalette QQuickRadioDelegate::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ListView); + return QQuickControlPrivate::themeFont(QPlatformTheme::ListViewFont); } #if QT_CONFIG(accessibility) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickradiodelegate_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickradiodelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickradiodelegate_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickradiodelegate_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -63,7 +63,6 @@ protected: QFont defaultFont() const override; - QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickrangeslider.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickrangeslider.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickrangeslider.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickrangeslider.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -50,7 +50,6 @@ \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-input - \ingroup qtquickcontrols2-focusscopes \brief Used to select a range of values by sliding two handles along a track. \image qtquickcontrols2-rangeslider.gif @@ -74,7 +73,7 @@ use the following syntax: \code - first.onMoved: console.log("first.value changed to " + first.value) + first.onValueChanged: console.log("first.value changed to " + first.value) \endcode The \l {first.position} and \l {second.position} properties are expressed as @@ -86,10 +85,7 @@ RangeSlider. In the example above, \l {first.visualPosition} will be \c 0.24 in a left-to-right application, and \c 0.76 in a right-to-left application. - For a slider that allows the user to select a single value, see \l Slider. - - \sa {Customizing RangeSlider}, {Input Controls}, - {Focus Management in Qt Quick Controls 2} + \sa {Customizing RangeSlider}, {Input Controls} */ class QQuickRangeSliderNodePrivate : public QObjectPrivate @@ -98,7 +94,14 @@ public: QQuickRangeSliderNodePrivate(qreal value, QQuickRangeSlider *slider) : value(value), - slider(slider) + isPendingValue(false), + pendingValue(0), + position(0), + handle(nullptr), + slider(slider), + pressed(false), + hovered(false), + touchId(-1) { } @@ -112,15 +115,15 @@ static QQuickRangeSliderNodePrivate *get(QQuickRangeSliderNode *node); - qreal value = 0; - bool isPendingValue = false; - qreal pendingValue = 0; - qreal position = 0; + qreal value; + bool isPendingValue; + qreal pendingValue; + qreal position; QQuickDeferredPointer handle; - QQuickRangeSlider *slider = nullptr; - bool pressed = false; - bool hovered = false; - int touchId = -1; + QQuickRangeSlider *slider; + bool pressed; + bool hovered; + int touchId; }; bool QQuickRangeSliderNodePrivate::isFirst() const @@ -263,13 +266,8 @@ if (!d->handle.isExecuting()) d->cancelHandle(); - const qreal oldImplicitHandleWidth = implicitHandleWidth(); - const qreal oldImplicitHandleHeight = implicitHandleHeight(); - - QQuickControlPrivate::get(d->slider)->removeImplicitSizeListener(d->handle); delete d->handle; d->handle = handle; - if (handle) { if (!handle->parentItem()) handle->setParentItem(d->slider); @@ -293,13 +291,7 @@ } handle->setActiveFocusOnTab(true); - QQuickControlPrivate::get(d->slider)->addImplicitSizeListener(handle); } - - if (!qFuzzyCompare(oldImplicitHandleWidth, implicitHandleWidth())) - emit implicitHandleWidthChanged(); - if (!qFuzzyCompare(oldImplicitHandleHeight, implicitHandleHeight())) - emit implicitHandleHeightChanged(); if (!d->handle.isExecuting()) emit handleChanged(); } @@ -337,22 +329,6 @@ emit hoveredChanged(); } -qreal QQuickRangeSliderNode::implicitHandleWidth() const -{ - Q_D(const QQuickRangeSliderNode); - if (!d->handle) - return 0; - return d->handle->implicitWidth(); -} - -qreal QQuickRangeSliderNode::implicitHandleHeight() const -{ - Q_D(const QQuickRangeSliderNode); - if (!d->handle) - return 0; - return d->handle->implicitHeight(); -} - void QQuickRangeSliderNode::increase() { Q_D(QQuickRangeSliderNode); @@ -375,6 +351,18 @@ Q_DECLARE_PUBLIC(QQuickRangeSlider) public: + QQuickRangeSliderPrivate() + : live(true), + from(defaultFrom), + to(defaultTo), + stepSize(0), + first(nullptr), + second(nullptr), + orientation(Qt::Horizontal), + snapMode(QQuickRangeSlider::NoSnap) + { + } + QQuickRangeSliderNode *pressedNode(int touchId = -1) const; #if QT_CONFIG(quicktemplates2_multitouch) @@ -387,19 +375,15 @@ void updateHover(const QPointF &pos); - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - - bool live = true; - qreal from = defaultFrom; - qreal to = defaultTo; - qreal stepSize = 0; - qreal touchDragThreshold = -1; - QQuickRangeSliderNode *first = nullptr; - QQuickRangeSliderNode *second = nullptr; + bool live; + qreal from; + qreal to; + qreal stepSize; + QQuickRangeSliderNode *first; + QQuickRangeSliderNode *second; QPointF pressPoint; - Qt::Orientation orientation = Qt::Horizontal; - QQuickRangeSlider::SnapMode snapMode = QQuickRangeSlider::NoSnap; + Qt::Orientation orientation; + QQuickRangeSlider::SnapMode snapMode; }; static qreal valueAt(const QQuickRangeSlider *slider, qreal position) @@ -534,7 +518,6 @@ QQuickControlPrivate::handleMove(point); QQuickRangeSliderNode *pressedNode = QQuickRangeSliderPrivate::pressedNode(touchId); if (pressedNode) { - const qreal oldPos = pressedNode->position(); qreal pos = positionAt(q, pressedNode->handle(), point); if (snapMode == QQuickRangeSlider::SnapAlways) pos = snapPosition(q, pos); @@ -542,9 +525,6 @@ pressedNode->setValue(valueAt(q, pos)); else QQuickRangeSliderNodePrivate::get(pressedNode)->setPosition(pos); - - if (!qFuzzyCompare(pressedNode->position(), oldPos)) - emit pressedNode->moved(); } } @@ -560,7 +540,6 @@ QQuickRangeSliderNodePrivate *pressedNodePrivate = QQuickRangeSliderNodePrivate::get(pressedNode); if (q->keepMouseGrab() || q->keepTouchGrab()) { - const qreal oldPos = pressedNode->position(); qreal pos = positionAt(q, pressedNode->handle(), point); if (snapMode != QQuickRangeSlider::NoSnap) pos = snapPosition(q, pos); @@ -571,9 +550,6 @@ pressedNodePrivate->setPosition(pos); q->setKeepMouseGrab(false); q->setKeepTouchGrab(false); - - if (!qFuzzyCompare(pressedNode->position(), oldPos)) - emit pressedNode->moved(); } pressedNode->setPressed(false); pressedNodePrivate->touchId = -1; @@ -598,24 +574,6 @@ second->setHovered(secondHandle && secondHandle->isEnabled() && secondHandle->contains(q->mapToItem(secondHandle, pos))); } -void QQuickRangeSliderPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - QQuickControlPrivate::itemImplicitWidthChanged(item); - if (item == first->handle()) - emit first->implicitHandleWidthChanged(); - else if (item == second->handle()) - emit second->implicitHandleWidthChanged(); -} - -void QQuickRangeSliderPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - QQuickControlPrivate::itemImplicitHeightChanged(item); - if (item == first->handle()) - emit first->implicitHandleHeightChanged(); - else if (item == second->handle()) - emit second->implicitHandleHeightChanged(); -} - QQuickRangeSlider::QQuickRangeSlider(QQuickItem *parent) : QQuickControl(*(new QQuickRangeSliderPrivate), parent) { @@ -630,13 +588,6 @@ #endif } -QQuickRangeSlider::~QQuickRangeSlider() -{ - Q_D(QQuickRangeSlider); - d->removeImplicitSizeListener(d->first->handle()); - d->removeImplicitSizeListener(d->second->handle()); -} - /*! \qmlproperty real QtQuick.Controls::RangeSlider::from @@ -694,55 +645,6 @@ } /*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty qreal QtQuick.Controls::RangeSlider::touchDragThreshold - - This property holds the threshold (in logical pixels) at which a touch drag event will be initiated. - The mouse drag threshold won't be affected. - The default value is \c Qt.styleHints.startDragDistance. - - \sa QStyleHints - -*/ -qreal QQuickRangeSlider::touchDragThreshold() const -{ - Q_D(const QQuickRangeSlider); - return d->touchDragThreshold; -} - -void QQuickRangeSlider::setTouchDragThreshold(qreal touchDragThreshold) -{ - Q_D(QQuickRangeSlider); - if (d->touchDragThreshold == touchDragThreshold) - return; - - d->touchDragThreshold = touchDragThreshold; - emit touchDragThresholdChanged(); -} - -void QQuickRangeSlider::resetTouchDragThreshold() -{ - setTouchDragThreshold(-1); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlmethod real QtQuick.Controls::RangeSlider::valueAt(real position) - - Returns the value for the given \a position. - - \sa first.value, second.value, first.position, second.position, live -*/ -qreal QQuickRangeSlider::valueAt(qreal position) const -{ - Q_D(const QQuickRangeSlider); - const qreal value = (d->to - d->from) * position; - if (qFuzzyIsNull(d->stepSize)) - return d->from + value; - return d->from + qRound(value / d->stepSize) * d->stepSize; -} - -/*! \qmlpropertygroup QtQuick.Controls::RangeSlider::first \qmlproperty real QtQuick.Controls::RangeSlider::first.value \qmlproperty real QtQuick.Controls::RangeSlider::first.position @@ -750,8 +652,6 @@ \qmlproperty Item QtQuick.Controls::RangeSlider::first.handle \qmlproperty bool QtQuick.Controls::RangeSlider::first.pressed \qmlproperty bool QtQuick.Controls::RangeSlider::first.hovered - \qmlproperty real QtQuick.Controls::RangeSlider::first.implicitHandleWidth - \qmlproperty real QtQuick.Controls::RangeSlider::first.implicitHandleHeight \table \header @@ -786,23 +686,14 @@ \l {first.visualPosition}{visualPosition} should be used instead. \row \li pressed - \li This property holds whether the first handle is pressed by either touch, - mouse, or keys. + \li This property holds whether the first handle is pressed. \row \li hovered \li This property holds whether the first handle is hovered. This property was introduced in QtQuick.Controls 2.1. - \row - \li implicitHandleWidth - \li This property holds the implicit width of the first handle. - This property was introduced in QtQuick.Controls 2.5. - \row - \li implicitHandleHeight - \li This property holds the implicit height of the first handle. - This property was introduced in QtQuick.Controls 2.5. \endtable - \sa first.moved(), first.increase(), first.decrease() + \sa first.increase(), first.decrease() */ QQuickRangeSliderNode *QQuickRangeSlider::first() const { @@ -811,17 +702,6 @@ } /*! - \qmlsignal void QtQuick.Controls::RangeSlider::first.moved() - \qmlsignal void QtQuick.Controls::RangeSlider::second.moved() - \since QtQuick.Controls 2.5 - - This signal is emitted when either the first or second handle has been - interactively moved by the user by either touch, mouse, or keys. - - \sa first, second -*/ - -/*! \qmlpropertygroup QtQuick.Controls::RangeSlider::second \qmlproperty real QtQuick.Controls::RangeSlider::second.value \qmlproperty real QtQuick.Controls::RangeSlider::second.position @@ -829,8 +709,6 @@ \qmlproperty Item QtQuick.Controls::RangeSlider::second.handle \qmlproperty bool QtQuick.Controls::RangeSlider::second.pressed \qmlproperty bool QtQuick.Controls::RangeSlider::second.hovered - \qmlproperty real QtQuick.Controls::RangeSlider::second.implicitHandleWidth - \qmlproperty real QtQuick.Controls::RangeSlider::second.implicitHandleHeight \table \header @@ -865,23 +743,14 @@ \l {second.visualPosition}{visualPosition} should be used instead. \row \li pressed - \li This property holds whether the second handle is pressed by either touch, - mouse, or keys. + \li This property holds whether the second handle is pressed. \row \li hovered \li This property holds whether the second handle is hovered. This property was introduced in QtQuick.Controls 2.1. - \row - \li implicitHandleWidth - \li This property holds the implicit width of the second handle. - This property was introduced in QtQuick.Controls 2.5. - \row - \li implicitHandleHeight - \li This property holds the implicit height of the second handle. - This property was introduced in QtQuick.Controls 2.5. \endtable - \sa second.moved(), second.increase(), second.decrease() + \sa second.increase(), second.decrease() */ QQuickRangeSliderNode *QQuickRangeSlider::second() const { @@ -917,9 +786,6 @@ This property holds the snap mode. - The snap mode determines how the slider handles behave with - regards to the \l stepSize. - Possible values: \value RangeSlider.NoSnap The slider does not snap (default). \value RangeSlider.SnapAlways The slider snaps while the handle is dragged. @@ -954,8 +820,6 @@ Possible values: \value Qt.Horizontal Horizontal (default) \value Qt.Vertical Vertical - - \sa horizontal, vertical */ Qt::Orientation QQuickRangeSlider::orientation() const { @@ -1057,36 +921,6 @@ emit liveChanged(); } -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::RangeSlider::horizontal - \readonly - - This property holds whether the slider is horizontal. - - \sa orientation -*/ -bool QQuickRangeSlider::isHorizontal() const -{ - Q_D(const QQuickRangeSlider); - return d->orientation == Qt::Horizontal; -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::RangeSlider::vertical - \readonly - - This property holds whether the slider is vertical. - - \sa orientation -*/ -bool QQuickRangeSlider::isVertical() const -{ - Q_D(const QQuickRangeSlider); - return d->orientation == Qt::Vertical; -} - void QQuickRangeSlider::focusInEvent(QFocusEvent *event) { Q_D(QQuickRangeSlider); @@ -1115,7 +949,6 @@ if (!focusNode) return; - const qreal oldValue = focusNode->value(); if (d->orientation == Qt::Horizontal) { if (event->key() == Qt::Key_Left) { focusNode->setPressed(true); @@ -1143,8 +976,6 @@ event->accept(); } } - if (!qFuzzyCompare(focusNode->value(), oldValue)) - emit focusNode->moved(); } void QQuickRangeSlider::hoverEnterEvent(QHoverEvent *event) @@ -1182,7 +1013,18 @@ Q_D(QQuickRangeSlider); QQuickControl::mousePressEvent(event); d->handleMove(event->localPos()); - setKeepMouseGrab(true); +} + +void QQuickRangeSlider::mouseMoveEvent(QMouseEvent *event) +{ + Q_D(QQuickRangeSlider); + if (!keepMouseGrab()) { + if (d->orientation == Qt::Horizontal) + setKeepMouseGrab(QQuickWindowPrivate::dragOverThreshold(event->localPos().x() - d->pressPoint.x(), Qt::XAxis, event)); + else + setKeepMouseGrab(QQuickWindowPrivate::dragOverThreshold(event->localPos().y() - d->pressPoint.y(), Qt::YAxis, event)); + } + QQuickControl::mouseMoveEvent(event); } #if QT_CONFIG(quicktemplates2_multitouch) @@ -1202,9 +1044,9 @@ case Qt::TouchPointMoved: if (!keepTouchGrab()) { if (d->orientation == Qt::Horizontal) - setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.pos().x() - point.startPos().x(), Qt::XAxis, &point, qRound(d->touchDragThreshold))); + setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.pos().x() - point.startPos().x(), Qt::XAxis, &point)); else - setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.pos().y() - point.startPos().y(), Qt::YAxis, &point, qRound(d->touchDragThreshold))); + setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.pos().y() - point.startPos().y(), Qt::YAxis, &point)); } if (keepTouchGrab()) d->handleMove(point.pos()); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickrangeslider_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickrangeslider_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickrangeslider_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickrangeslider_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -60,22 +60,16 @@ Q_OBJECT Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL) Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged FINAL) - Q_PROPERTY(QQuickRangeSliderNode *first READ first CONSTANT FINAL) - Q_PROPERTY(QQuickRangeSliderNode *second READ second CONSTANT FINAL) + Q_PROPERTY(QQuickRangeSliderNode *first READ first CONSTANT) + Q_PROPERTY(QQuickRangeSliderNode *second READ second CONSTANT) Q_PROPERTY(qreal stepSize READ stepSize WRITE setStepSize NOTIFY stepSizeChanged FINAL) Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged FINAL) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL) // 2.2 (Qt 5.9) Q_PROPERTY(bool live READ live WRITE setLive NOTIFY liveChanged FINAL REVISION 2) - Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) - // 2.3 (Qt 5.10) - Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal touchDragThreshold READ touchDragThreshold WRITE setTouchDragThreshold RESET resetTouchDragThreshold NOTIFY touchDragThresholdChanged FINAL REVISION 5) public: explicit QQuickRangeSlider(QQuickItem *parent = nullptr); - ~QQuickRangeSlider(); qreal from() const; void setFrom(qreal from); @@ -108,16 +102,6 @@ bool live() const; void setLive(bool live); - // 2.3 (Qt 5.10) - bool isHorizontal() const; - bool isVertical() const; - - // 2.5 (Qt 5.12) - qreal touchDragThreshold() const; - void setTouchDragThreshold(qreal touchDragThreshold); - void resetTouchDragThreshold(); - Q_REVISION(5) Q_INVOKABLE qreal valueAt(qreal position) const; - Q_SIGNALS: void fromChanged(); void toChanged(); @@ -126,8 +110,6 @@ void orientationChanged(); // 2.2 (Qt 5.9) Q_REVISION(2) void liveChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void touchDragThresholdChanged(); protected: void focusInEvent(QFocusEvent *event) override; @@ -137,6 +119,7 @@ void keyPressEvent(QKeyEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override; void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; #if QT_CONFIG(quicktemplates2_multitouch) void touchEvent(QTouchEvent *event) override; #endif @@ -167,9 +150,6 @@ Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL) // 2.1 (Qt 5.8) Q_PROPERTY(bool hovered READ isHovered WRITE setHovered NOTIFY hoveredChanged FINAL REVISION 1) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal implicitHandleWidth READ implicitHandleWidth NOTIFY implicitHandleWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitHandleHeight READ implicitHandleHeight NOTIFY implicitHandleHeightChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "handle") public: @@ -192,10 +172,6 @@ bool isHovered() const; void setHovered(bool hovered); - // 2.5 (Qt 5.12) - qreal implicitHandleWidth() const; - qreal implicitHandleHeight() const; - public Q_SLOTS: void increase(); void decrease(); @@ -208,10 +184,6 @@ void pressedChanged(); // 2.1 (Qt 5.8) Q_REVISION(1) void hoveredChanged(); - // 2.5 (Qt 5.12) - /*Q_REVISION(5)*/ void moved(); - /*Q_REVISION(5)*/ void implicitHandleWidthChanged(); - /*Q_REVISION(5)*/ void implicitHandleHeightChanged(); private: Q_DISABLE_COPY(QQuickRangeSliderNode) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickroundbutton.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickroundbutton.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickroundbutton.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickroundbutton.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -65,12 +65,20 @@ Q_DECLARE_PUBLIC(QQuickRoundButton) public: - void setRadius(qreal newRadius = -1.0); + QQuickRoundButtonPrivate(); + + qreal radius; + bool explicitRadius; - qreal radius = 0; - bool explicitRadius = false; + void setRadius(qreal newRadius = -1.0); }; +QQuickRoundButtonPrivate::QQuickRoundButtonPrivate() + : radius(0), + explicitRadius(false) +{ +} + void QQuickRoundButtonPrivate::setRadius(qreal newRadius) { Q_Q(QQuickRoundButton); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollbar.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollbar.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollbar.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollbar.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -40,9 +40,6 @@ #include #include -#if QT_CONFIG(accessibility) -#include -#endif QT_BEGIN_NAMESPACE @@ -132,7 +129,7 @@ It is possible to create an instance of ScrollBar without using the attached property API. This is useful when the behavior of the attached - scroll bar is not sufficient or a \l Flickable is not in use. In the + scoll bar is not sufficient or a \l Flickable is not in use. In the following example, horizontal and vertical scroll bars are used to scroll over the text without using \l Flickable: @@ -158,24 +155,20 @@ static const QQuickItemPrivate::ChangeTypes horizontalChangeTypes = changeTypes | QQuickItemPrivate::ImplicitHeight; static const QQuickItemPrivate::ChangeTypes verticalChangeTypes = changeTypes | QQuickItemPrivate::ImplicitWidth; -QQuickScrollBarPrivate::VisualArea QQuickScrollBarPrivate::visualArea() const -{ - qreal visualPos = position; - if (minimumSize > size) - visualPos = position / (1.0 - size) * (1.0 - minimumSize); - - qreal visualSize = qBound(0, qMax(size, minimumSize) + qMin(0, visualPos), 1.0 - visualPos); - - visualPos = qBound(0, visualPos, 1.0 - visualSize); - - return VisualArea(visualPos, visualSize); -} - -qreal QQuickScrollBarPrivate::logicalPosition(qreal position) const +QQuickScrollBarPrivate::QQuickScrollBarPrivate() + : size(0), + position(0), + stepSize(0), + offset(0), + active(false), + pressed(false), + moving(false), + interactive(true), + explicitInteractive(false), + orientation(Qt::Vertical), + snapMode(QQuickScrollBar::NoSnap), + policy(QQuickScrollBar::AsNeeded) { - if (minimumSize > size) - return position * (1.0 - size) / (1.0 - minimumSize); - return position; } qreal QQuickScrollBarPrivate::snapPosition(qreal position) const @@ -191,9 +184,9 @@ { Q_Q(const QQuickScrollBar); if (orientation == Qt::Horizontal) - return logicalPosition(point.x() - q->leftPadding()) / q->availableWidth(); + return (point.x() - q->leftPadding()) / q->availableWidth(); else - return logicalPosition(point.y() - q->topPadding()) / q->availableHeight(); + return (point.y() - q->topPadding()) / q->availableHeight(); } void QQuickScrollBarPrivate::setInteractive(bool enabled) @@ -237,14 +230,15 @@ // - negative overshoot (pos < 0): clamp the pos to 0, and deduct the overshoot from the size // - positive overshoot (pos + size > 1): clamp the size to 1-pos - const VisualArea visual = visualArea(); + const qreal clampedSize = qBound(0, size + qMin(0, position), 1.0 - position); + const qreal clampedPos = qBound(0, position, 1.0 - clampedSize); if (orientation == Qt::Horizontal) { - contentItem->setPosition(QPointF(q->leftPadding() + visual.position * q->availableWidth(), q->topPadding())); - contentItem->setSize(QSizeF(q->availableWidth() * visual.size, q->availableHeight())); + contentItem->setPosition(QPointF(q->leftPadding() + clampedPos * q->availableWidth(), q->topPadding())); + contentItem->setSize(QSizeF(q->availableWidth() * clampedSize, q->availableHeight())); } else { - contentItem->setPosition(QPointF(q->leftPadding(), q->topPadding() + visual.position * q->availableHeight())); - contentItem->setSize(QSizeF(q->availableWidth(), q->availableHeight() * visual.size)); + contentItem->setPosition(QPointF(q->leftPadding(), q->topPadding() + clampedPos * q->availableHeight())); + contentItem->setSize(QSizeF(q->availableWidth(), q->availableHeight() * clampedSize)); } } @@ -253,9 +247,8 @@ Q_Q(QQuickScrollBar); QQuickControlPrivate::handlePress(point); offset = positionAt(point) - position; - qreal sz = qMax(size, logicalPosition(minimumSize)); - if (offset < 0 || offset > sz) - offset = sz / 2; + if (offset < 0 || offset > size) + offset = size / 2; q->setPressed(true); } @@ -289,15 +282,6 @@ q->setPressed(false); } -void QQuickScrollBarPrivate::visualAreaChange(const VisualArea &newVisualArea, const VisualArea &oldVisualArea) -{ - Q_Q(QQuickScrollBar); - if (!qFuzzyCompare(newVisualArea.size, oldVisualArea.size)) - emit q->visualSizeChanged(); - if (!qFuzzyCompare(newVisualArea.position, oldVisualArea.position)) - emit q->visualPositionChanged(); -} - QQuickScrollBar::QQuickScrollBar(QQuickItem *parent) : QQuickControl(*(new QQuickScrollBarPrivate), parent) { @@ -322,8 +306,6 @@ This property is automatically set when the scroll bar is \l {Attaching ScrollBar to a Flickable}{attached to a flickable}. - - \sa minimumSize, visualSize */ qreal QQuickScrollBar::size() const { @@ -337,12 +319,10 @@ if (qFuzzyCompare(d->size, size)) return; - auto oldVisualArea = d->visualArea(); d->size = size; if (isComponentComplete()) d->resizeContent(); emit sizeChanged(); - d->visualAreaChange(d->visualArea(), oldVisualArea); } /*! @@ -354,8 +334,6 @@ This property is automatically set when the scroll bar is \l {Attaching ScrollBar to a Flickable}{attached to a flickable}. - - \sa visualPosition */ qreal QQuickScrollBar::position() const { @@ -369,12 +347,10 @@ if (qFuzzyCompare(d->position, position)) return; - auto oldVisualArea = d->visualArea(); d->position = position; if (isComponentComplete()) d->resizeContent(); emit positionChanged(); - d->visualAreaChange(d->visualArea(), oldVisualArea); } /*! @@ -462,8 +438,6 @@ This property is automatically set when the scroll bar is \l {Attaching ScrollBar to a Flickable}{attached to a flickable}. - - \sa horizontal, vertical */ Qt::Orientation QQuickScrollBar::orientation() const { @@ -585,94 +559,6 @@ } /*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::ScrollBar::horizontal - \readonly - - This property holds whether the scroll bar is horizontal. - - \sa orientation -*/ -bool QQuickScrollBar::isHorizontal() const -{ - Q_D(const QQuickScrollBar); - return d->orientation == Qt::Horizontal; -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::ScrollBar::vertical - \readonly - - This property holds whether the scroll bar is vertical. - - \sa orientation -*/ -bool QQuickScrollBar::isVertical() const -{ - Q_D(const QQuickScrollBar); - return d->orientation == Qt::Vertical; -} - -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty real QtQuick.Controls::ScrollBar::minimumSize - - This property holds the minimum size of the scroll bar, scaled to \c {0.0 - 1.0}. - - \sa size, visualSize, visualPosition -*/ -qreal QQuickScrollBar::minimumSize() const -{ - Q_D(const QQuickScrollBar); - return d->minimumSize; -} - -void QQuickScrollBar::setMinimumSize(qreal minimumSize) -{ - Q_D(QQuickScrollBar); - if (qFuzzyCompare(d->minimumSize, minimumSize)) - return; - - auto oldVisualArea = d->visualArea(); - d->minimumSize = minimumSize; - if (isComponentComplete()) - d->resizeContent(); - emit minimumSizeChanged(); - d->visualAreaChange(d->visualArea(), oldVisualArea); -} - -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty real QtQuick.Controls::ScrollBar::visualSize - - This property holds the effective visual size of the scroll bar, - which may be limited by the \l {minimumSize}{minimum size}. - - \sa size, minimumSize -*/ -qreal QQuickScrollBar::visualSize() const -{ - Q_D(const QQuickScrollBar); - return d->visualArea().size; -} - -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty real QtQuick.Controls::ScrollBar::visualPosition - - This property holds the effective visual position of the scroll bar, - which may be limited by the \l {minimumSize}{minimum size}. - - \sa position, minimumSize -*/ -qreal QQuickScrollBar::visualPosition() const -{ - Q_D(const QQuickScrollBar); - return d->visualArea().position; -} - -/*! \qmlmethod void QtQuick.Controls::ScrollBar::increase() Increases the position by \l stepSize or \c 0.1 if stepSize is \c 0.0. @@ -727,19 +613,8 @@ QQuickControl::accessibilityActiveChanged(active); Q_D(QQuickScrollBar); - if (active) { + if (active) setAccessibleProperty("pressed", d->pressed); - - if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(this)) { - connect(accessibleAttached, &QQuickAccessibleAttached::increaseAction, this, &QQuickScrollBar::increase); - connect(accessibleAttached, &QQuickAccessibleAttached::decreaseAction, this, &QQuickScrollBar::decrease); - } - } else { - if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(this)) { - disconnect(accessibleAttached, &QQuickAccessibleAttached::increaseAction, this, &QQuickScrollBar::increase); - disconnect(accessibleAttached, &QQuickAccessibleAttached::decreaseAction, this, &QQuickScrollBar::decrease); - } - } } QAccessible::Role QQuickScrollBar::accessibleRole() const @@ -748,6 +623,13 @@ } #endif +QQuickScrollBarAttachedPrivate::QQuickScrollBarAttachedPrivate() + : flickable(nullptr), + horizontal(nullptr), + vertical(nullptr) +{ +} + void QQuickScrollBarAttachedPrivate::setFlickable(QQuickFlickable *item) { if (flickable) { @@ -864,8 +746,7 @@ const qreal viewwidth = f->width(); const qreal maxxextent = -f->maxXExtent() + f->minXExtent(); - const qreal cx = horizontal->position() * (maxxextent + viewwidth) - f->minXExtent(); - + qreal cx = horizontal->position() * (maxxextent + viewwidth) - f->minXExtent(); if (!qIsNaN(cx) && !qFuzzyCompare(cx, flickable->contentX())) flickable->setContentX(cx); } @@ -876,8 +757,7 @@ const qreal viewheight = f->height(); const qreal maxyextent = -f->maxYExtent() + f->minYExtent(); - const qreal cy = vertical->position() * (maxyextent + viewheight) - f->minYExtent(); - + qreal cy = vertical->position() * (maxyextent + viewheight) - f->minYExtent(); if (!qIsNaN(cy) && !qFuzzyCompare(cy, flickable->contentY())) flickable->setContentY(cy); } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollbar_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollbar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollbar_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -68,13 +68,6 @@ Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged FINAL REVISION 2) Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive RESET resetInteractive NOTIFY interactiveChanged FINAL REVISION 2) Q_PROPERTY(Policy policy READ policy WRITE setPolicy NOTIFY policyChanged FINAL REVISION 2) - // 2.3 (Qt 5.10) - Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) - Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) - // 2.4 (Qt 5.11) - Q_PROPERTY(qreal minimumSize READ minimumSize WRITE setMinimumSize NOTIFY minimumSizeChanged FINAL REVISION 4) - Q_PROPERTY(qreal visualSize READ visualSize NOTIFY visualSizeChanged FINAL REVISION 4) - Q_PROPERTY(qreal visualPosition READ visualPosition NOTIFY visualPositionChanged FINAL REVISION 4) public: explicit QQuickScrollBar(QQuickItem *parent = nullptr); @@ -121,17 +114,6 @@ Policy policy() const; void setPolicy(Policy policy); - // 2.3 (Qt 5.10) - bool isHorizontal() const; - bool isVertical() const; - - // 2.4 (Qt 5.11) - qreal minimumSize() const; - void setMinimumSize(qreal minimumSize); - - qreal visualSize() const; - qreal visualPosition() const; - public Q_SLOTS: void increase(); void decrease(); @@ -149,10 +131,6 @@ Q_REVISION(2) void snapModeChanged(); Q_REVISION(2) void interactiveChanged(); Q_REVISION(2) void policyChanged(); - // 2.4 (Qt 5.11) - Q_REVISION(4) void minimumSizeChanged(); - Q_REVISION(4) void visualSizeChanged(); - Q_REVISION(4) void visualPositionChanged(); protected: void mousePressEvent(QMouseEvent *event) override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollbar_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollbar_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollbar_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollbar_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -61,22 +61,13 @@ Q_DECLARE_PUBLIC(QQuickScrollBar) public: + QQuickScrollBarPrivate(); + static QQuickScrollBarPrivate *get(QQuickScrollBar *bar) { return bar->d_func(); } - struct VisualArea - { - VisualArea(qreal pos, qreal sz) - : position(pos), size(sz) { } - qreal position = 0; - qreal size = 0; - }; - VisualArea visualArea() const; - - qreal logicalPosition(qreal position) const; - qreal snapPosition(qreal position) const; qreal positionAt(const QPointF &point) const; void setInteractive(bool interactive); @@ -88,26 +79,25 @@ void handleRelease(const QPointF &point) override; void handleUngrab() override; - void visualAreaChange(const VisualArea &newVisualArea, const VisualArea &oldVisualArea); - - qreal size = 0; - qreal position = 0; - qreal stepSize = 0; - qreal offset = 0; - qreal minimumSize = 0; - bool active = false; - bool pressed = false; - bool moving = false; - bool interactive = true; - bool explicitInteractive = false; - Qt::Orientation orientation = Qt::Vertical; - QQuickScrollBar::SnapMode snapMode = QQuickScrollBar::NoSnap; - QQuickScrollBar::Policy policy = QQuickScrollBar::AsNeeded; + qreal size; + qreal position; + qreal stepSize; + qreal offset; + bool active; + bool pressed; + bool moving; + bool interactive; + bool explicitInteractive; + Qt::Orientation orientation; + QQuickScrollBar::SnapMode snapMode; + QQuickScrollBar::Policy policy; }; class QQuickScrollBarAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener { public: + QQuickScrollBarAttachedPrivate(); + static QQuickScrollBarAttachedPrivate *get(QQuickScrollBarAttached *attached) { return attached->d_func(); @@ -133,9 +123,9 @@ void itemImplicitHeightChanged(QQuickItem *item) override; void itemDestroyed(QQuickItem *item) override; - QQuickFlickable *flickable = nullptr; - QQuickScrollBar *horizontal = nullptr; - QQuickScrollBar *vertical = nullptr; + QQuickFlickable *flickable; + QQuickScrollBar *horizontal; + QQuickScrollBar *vertical; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollindicator.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollindicator.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollindicator.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollindicator.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -135,47 +135,22 @@ Q_DECLARE_PUBLIC(QQuickScrollIndicator) public: - struct VisualArea + QQuickScrollIndicatorPrivate() + : size(0), + position(0), + active(false), + orientation(Qt::Vertical) { - VisualArea(qreal pos, qreal sz) - : position(pos), size(sz) { } - qreal position = 0; - qreal size = 0; - }; - VisualArea visualArea() const; - void visualAreaChange(const VisualArea &newVisualArea, const VisualArea &oldVisualArea); + } void resizeContent() override; - qreal size = 0; - qreal minimumSize = 0; - qreal position = 0; - bool active = false; - Qt::Orientation orientation = Qt::Vertical; + qreal size; + qreal position; + bool active; + Qt::Orientation orientation; }; -QQuickScrollIndicatorPrivate::VisualArea QQuickScrollIndicatorPrivate::visualArea() const -{ - qreal visualPos = position; - if (minimumSize > size) - visualPos = position / (1.0 - size) * (1.0 - minimumSize); - - qreal visualSize = qBound(0, qMax(size, minimumSize) + qMin(0, visualPos), 1.0 - visualPos); - - visualPos = qBound(0, visualPos, 1.0 - visualSize); - - return VisualArea(visualPos, visualSize); -} - -void QQuickScrollIndicatorPrivate::visualAreaChange(const VisualArea &newVisualArea, const VisualArea &oldVisualArea) -{ - Q_Q(QQuickScrollIndicator); - if (!qFuzzyCompare(newVisualArea.size, oldVisualArea.size)) - emit q->visualSizeChanged(); - if (!qFuzzyCompare(newVisualArea.position, oldVisualArea.position)) - emit q->visualPositionChanged(); -} - void QQuickScrollIndicatorPrivate::resizeContent() { Q_Q(QQuickScrollIndicator); @@ -184,14 +159,15 @@ // - negative overshoot (pos < 0): clamp the pos to 0, and deduct the overshoot from the size // - positive overshoot (pos + size > 1): clamp the size to 1-pos - const VisualArea visual = visualArea(); + const qreal clampedSize = qBound(0, size + qMin(0, position), 1.0 - position); + const qreal clampedPos = qBound(0, position, 1.0 - clampedSize); if (orientation == Qt::Horizontal) { - contentItem->setPosition(QPointF(q->leftPadding() + visual.position * q->availableWidth(), q->topPadding())); - contentItem->setSize(QSizeF(q->availableWidth() * visual.size, q->availableHeight())); + contentItem->setPosition(QPointF(q->leftPadding() + clampedPos * q->availableWidth(), q->topPadding())); + contentItem->setSize(QSizeF(q->availableWidth() * clampedSize, q->availableHeight())); } else { - contentItem->setPosition(QPointF(q->leftPadding(), q->topPadding() + visual.position * q->availableHeight())); - contentItem->setSize(QSizeF(q->availableWidth(), q->availableHeight() * visual.size)); + contentItem->setPosition(QPointF(q->leftPadding(), q->topPadding() + clampedPos * q->availableHeight())); + contentItem->setSize(QSizeF(q->availableWidth(), q->availableHeight() * clampedSize)); } } @@ -214,8 +190,6 @@ This property is automatically set when the scroll indicator is \l {Attaching ScrollIndicator to a Flickable}{attached to a flickable}. - - \sa minimumSize, visualSize */ qreal QQuickScrollIndicator::size() const { @@ -229,12 +203,10 @@ if (qFuzzyCompare(d->size, size)) return; - auto oldVisualArea = d->visualArea(); d->size = size; if (isComponentComplete()) d->resizeContent(); emit sizeChanged(); - d->visualAreaChange(d->visualArea(), oldVisualArea); } /*! @@ -245,7 +217,7 @@ This property is automatically set when the scroll indicator is \l {Attaching ScrollIndicator to a Flickable}{attached to a flickable}. - \sa {Flickable::visibleArea.yPosition}{Flickable::visibleArea}, visualPosition + \sa {Flickable::visibleArea.yPosition}{Flickable::visibleArea} */ qreal QQuickScrollIndicator::position() const { @@ -259,12 +231,10 @@ if (qFuzzyCompare(d->position, position)) return; - auto oldVisualArea = d->visualArea(); d->position = position; if (isComponentComplete()) d->resizeContent(); emit positionChanged(); - d->visualAreaChange(d->visualArea(), oldVisualArea); } /*! @@ -306,8 +276,6 @@ This property is automatically set when the scroll indicator is \l {Attaching ScrollIndicator to a Flickable}{attached to a flickable}. - - \sa horizontal, vertical */ Qt::Orientation QQuickScrollIndicator::orientation() const { @@ -327,97 +295,16 @@ emit orientationChanged(); } -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::ScrollIndicator::horizontal - \readonly - - This property holds whether the scroll indicator is horizontal. - - \sa orientation -*/ -bool QQuickScrollIndicator::isHorizontal() const -{ - Q_D(const QQuickScrollIndicator); - return d->orientation == Qt::Horizontal; -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::ScrollIndicator::vertical - \readonly - - This property holds whether the scroll indicator is vertical. - - \sa orientation -*/ -bool QQuickScrollIndicator::isVertical() const -{ - Q_D(const QQuickScrollIndicator); - return d->orientation == Qt::Vertical; -} - -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty real QtQuick.Controls::ScrollIndicator::minimumSize - - This property holds the minimum size of the indicator, scaled to \c {0.0 - 1.0}. - - \sa size, visualSize, visualPosition -*/ -qreal QQuickScrollIndicator::minimumSize() const -{ - Q_D(const QQuickScrollIndicator); - return d->minimumSize; -} - -void QQuickScrollIndicator::setMinimumSize(qreal minimumSize) -{ - Q_D(QQuickScrollIndicator); - if (qFuzzyCompare(d->minimumSize, minimumSize)) - return; - - auto oldVisualArea = d->visualArea(); - d->minimumSize = minimumSize; - if (isComponentComplete()) - d->resizeContent(); - emit minimumSizeChanged(); - d->visualAreaChange(d->visualArea(), oldVisualArea); -} - -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty real QtQuick.Controls::ScrollIndicator::visualSize - - This property holds the effective visual size of the indicator, - which may be limited by the \l {minimumSize}{minimum size}. - - \sa size, minimumSize -*/ -qreal QQuickScrollIndicator::visualSize() const -{ - Q_D(const QQuickScrollIndicator); - return d->visualArea().size; -} - -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty real QtQuick.Controls::ScrollIndicator::visualPosition - - This property holds the effective visual position of the indicator, - which may be limited by the \l {minimumSize}{minimum size}. - - \sa position, minimumSize -*/ -qreal QQuickScrollIndicator::visualPosition() const -{ - Q_D(const QQuickScrollIndicator); - return d->visualArea().position; -} - class QQuickScrollIndicatorAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener { public: + QQuickScrollIndicatorAttachedPrivate() + : flickable(nullptr), + horizontal(nullptr), + vertical(nullptr) + { + } + void activateHorizontal(); void activateVertical(); @@ -429,9 +316,9 @@ void itemImplicitHeightChanged(QQuickItem *item) override; void itemDestroyed(QQuickItem *item) override; - QQuickFlickable *flickable = nullptr; - QQuickScrollIndicator *horizontal = nullptr; - QQuickScrollIndicator *vertical = nullptr; + QQuickFlickable *flickable; + QQuickScrollIndicator *horizontal; + QQuickScrollIndicator *vertical; }; void QQuickScrollIndicatorAttachedPrivate::activateHorizontal() diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollindicator_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollindicator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollindicator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollindicator_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -63,13 +63,6 @@ Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL) Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged FINAL) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL) - // 2.3 (Qt 5.10) - Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) - Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) - // 2.4 (Qt 5.11) - Q_PROPERTY(qreal minimumSize READ minimumSize WRITE setMinimumSize NOTIFY minimumSizeChanged FINAL REVISION 4) - Q_PROPERTY(qreal visualSize READ visualSize NOTIFY visualSizeChanged FINAL REVISION 4) - Q_PROPERTY(qreal visualPosition READ visualPosition NOTIFY visualPositionChanged FINAL REVISION 4) public: explicit QQuickScrollIndicator(QQuickItem *parent = nullptr); @@ -85,17 +78,6 @@ Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); - // 2.3 (Qt 5.10) - bool isHorizontal() const; - bool isVertical() const; - - // 2.4 (Qt 5.11) - qreal minimumSize() const; - void setMinimumSize(qreal minimumSize); - - qreal visualSize() const; - qreal visualPosition() const; - public Q_SLOTS: void setSize(qreal size); void setPosition(qreal position); @@ -105,10 +87,6 @@ void positionChanged(); void activeChanged(); void orientationChanged(); - // 2.4 (Qt 5.11) - Q_REVISION(4) void minimumSizeChanged(); - Q_REVISION(4) void visualSizeChanged(); - Q_REVISION(4) void visualPositionChanged(); protected: #if QT_CONFIG(quicktemplates2_multitouch) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollview.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollview.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollview.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollview.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qquickscrollview_p.h" -#include "qquickpane_p_p.h" +#include "qquickcontrol_p_p.h" #include "qquickscrollbar_p_p.h" #include @@ -44,12 +44,11 @@ /*! \qmltype ScrollView - \inherits Pane + \inherits Control \instantiates QQuickScrollView \inqmlmodule QtQuick.Controls \since 5.9 \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes \brief Scrollable view. ScrollView provides scrolling for user-defined content. It can be used to @@ -70,21 +69,6 @@ \snippet qtquickcontrols2-scrollview-listview.qml file - \section2 Sizing - - As with Flickable, there are several things to keep in mind when using - ScrollView: - \list - \li If only a single item is used within a ScrollView, the content size is - automatically calculated based on the implicit size of its contained item. - However, if more than one item is used (or an implicit size is not - provided), the \l {QtQuick.Controls::Pane::}{contentWidth} and - \l {QtQuick.Controls::Pane::}{contentHeight} properties must - be set to the combined size of its contained items. - \li If the content size is less than or equal to the size of the ScrollView, - it will not be flickable. - \endlist - \section2 Scroll Bars The horizontal and vertical scroll bars can be accessed and customized using @@ -113,28 +97,22 @@ \snippet qtquickcontrols2-scrollview-interactive.qml file \sa ScrollBar, ScrollIndicator, {Customizing ScrollView}, {Container Controls}, - {Focus Management in Qt Quick Controls 2} */ -class QQuickScrollViewPrivate : public QQuickPanePrivate +class QQuickScrollViewPrivate : public QQuickControlPrivate { Q_DECLARE_PUBLIC(QQuickScrollView) public: - QQmlListProperty contentData() override; - QQmlListProperty contentChildren() override; - QList contentChildItems() const override; + QQuickScrollViewPrivate(); QQuickItem *getContentItem() override; QQuickFlickable *ensureFlickable(bool content); bool setFlickable(QQuickFlickable *flickable, bool content); - void flickableContentWidthChanged(); - void flickableContentHeightChanged(); - - qreal getContentWidth() const override; - qreal getContentHeight() const override; + void updateContentWidth(); + void updateContentHeight(); QQuickScrollBar *verticalScrollBar() const; QQuickScrollBar *horizontalScrollBar() const; @@ -151,20 +129,19 @@ static QQuickItem *contentChildren_at(QQmlListProperty *prop, int index); static void contentChildren_clear(QQmlListProperty *prop); - void itemImplicitWidthChanged(QQuickItem *item) override; - - bool wasTouched = false; - QQuickFlickable *flickable = nullptr; - bool flickableHasExplicitContentWidth = true; - bool flickableHasExplicitContentHeight = true; + bool wasTouched; + qreal contentWidth; + qreal contentHeight; + QQuickFlickable *flickable; }; -QList QQuickScrollViewPrivate::contentChildItems() const +QQuickScrollViewPrivate::QQuickScrollViewPrivate() + : wasTouched(false), + contentWidth(-1), + contentHeight(-1), + flickable(nullptr) { - if (!flickable) - return QList(); - - return flickable->contentItem()->childItems(); + wheelEnabled = true; } QQuickItem *QQuickScrollViewPrivate::getContentItem() @@ -177,11 +154,8 @@ QQuickFlickable *QQuickScrollViewPrivate::ensureFlickable(bool content) { Q_Q(QQuickScrollView); - if (!flickable) { - flickableHasExplicitContentWidth = false; - flickableHasExplicitContentHeight = false; + if (!flickable) setFlickable(new QQuickFlickable(q), content); - } return flickable; } @@ -199,9 +173,9 @@ if (attached) QQuickScrollBarAttachedPrivate::get(attached)->setFlickable(nullptr); - QObjectPrivate::disconnect(flickable->contentItem(), &QQuickItem::childrenChanged, this, &QQuickPanePrivate::contentChildrenChange); - QObjectPrivate::disconnect(flickable, &QQuickFlickable::contentWidthChanged, this, &QQuickScrollViewPrivate::flickableContentWidthChanged); - QObjectPrivate::disconnect(flickable, &QQuickFlickable::contentHeightChanged, this, &QQuickScrollViewPrivate::flickableContentHeightChanged); + QObject::disconnect(flickable->contentItem(), &QQuickItem::childrenChanged, q, &QQuickScrollView::contentChildrenChanged); + QObjectPrivate::disconnect(flickable, &QQuickFlickable::contentWidthChanged, this, &QQuickScrollViewPrivate::updateContentWidth); + QObjectPrivate::disconnect(flickable, &QQuickFlickable::contentHeightChanged, this, &QQuickScrollViewPrivate::updateContentHeight); } flickable = item; @@ -210,78 +184,52 @@ if (flickable) { flickable->installEventFilter(q); - if (hasContentWidth) - flickable->setContentWidth(contentWidth); + if (contentWidth > 0) + item->setContentWidth(contentWidth); else - flickableContentWidthChanged(); - if (hasContentHeight) - flickable->setContentHeight(contentHeight); + updateContentWidth(); + if (contentHeight > 0) + item->setContentHeight(contentHeight); else - flickableContentHeightChanged(); + updateContentHeight(); if (attached) QQuickScrollBarAttachedPrivate::get(attached)->setFlickable(flickable); - QObjectPrivate::connect(flickable->contentItem(), &QQuickItem::childrenChanged, this, &QQuickPanePrivate::contentChildrenChange); - QObjectPrivate::connect(flickable, &QQuickFlickable::contentWidthChanged, this, &QQuickScrollViewPrivate::flickableContentWidthChanged); - QObjectPrivate::connect(flickable, &QQuickFlickable::contentHeightChanged, this, &QQuickScrollViewPrivate::flickableContentHeightChanged); + QObject::connect(flickable->contentItem(), &QQuickItem::childrenChanged, q, &QQuickScrollView::contentChildrenChanged); + QObjectPrivate::connect(flickable, &QQuickFlickable::contentWidthChanged, this, &QQuickScrollViewPrivate::updateContentWidth); + QObjectPrivate::connect(flickable, &QQuickFlickable::contentHeightChanged, this, &QQuickScrollViewPrivate::updateContentHeight); } return true; } -void QQuickScrollViewPrivate::flickableContentWidthChanged() +void QQuickScrollViewPrivate::updateContentWidth() { Q_Q(QQuickScrollView); if (!flickable || !componentComplete) return; const qreal cw = flickable->contentWidth(); - if (qFuzzyCompare(cw, implicitContentWidth)) + if (qFuzzyCompare(cw, contentWidth)) return; - flickableHasExplicitContentWidth = true; - implicitContentWidth = cw; - emit q->implicitContentWidthChanged(); + contentWidth = cw; + emit q->contentWidthChanged(); } -void QQuickScrollViewPrivate::flickableContentHeightChanged() +void QQuickScrollViewPrivate::updateContentHeight() { Q_Q(QQuickScrollView); if (!flickable || !componentComplete) return; const qreal ch = flickable->contentHeight(); - if (qFuzzyCompare(ch, implicitContentHeight)) + if (qFuzzyCompare(ch, contentHeight)) return; - flickableHasExplicitContentHeight = true; - implicitContentHeight = ch; - emit q->implicitContentHeightChanged(); -} - -qreal QQuickScrollViewPrivate::getContentWidth() const -{ - if (flickable && flickableHasExplicitContentWidth) - return flickable->contentWidth(); - - // The scrollview wraps a flickable created by us, and nobody searched for it and - // modified its contentWidth. In that case, since the application does not control - // this flickable, we fall back to calculate the content width based on the child - // items inside it. - return QQuickPanePrivate::getContentWidth(); -} - -qreal QQuickScrollViewPrivate::getContentHeight() const -{ - if (flickable && flickableHasExplicitContentHeight) - return flickable->contentHeight(); - - // The scrollview wraps a flickable created by us, and nobody searched for it and - // modified its contentHeight. In that case, since the application does not control - // this flickable, we fall back to calculate the content height based on the child - // items inside it. - return QQuickPanePrivate::getContentHeight(); + contentHeight = ch; + emit q->contentHeightChanged(); } QQuickScrollBar *QQuickScrollViewPrivate::verticalScrollBar() const @@ -403,24 +351,72 @@ children.clear(&children); } -void QQuickScrollViewPrivate::itemImplicitWidthChanged(QQuickItem *item) +QQuickScrollView::QQuickScrollView(QQuickItem *parent) + : QQuickControl(*(new QQuickScrollViewPrivate), parent) +{ + setFlag(ItemIsFocusScope); + setActiveFocusOnTab(true); + setFiltersChildMouseEvents(true); +} + +/*! + \qmlproperty real QtQuick.Controls::ScrollView::contentWidth + + This property holds the width of the scrollable content. + + If only a single item is used within a ScrollView, the content size is + automatically calculated based on the implicit size of its contained item. + + \sa contentHeight +*/ +qreal QQuickScrollView::contentWidth() const +{ + Q_D(const QQuickScrollView); + return d->contentWidth; +} + +void QQuickScrollView::setContentWidth(qreal width) { - // a special case for width<->height dependent content (wrapping text) in ScrollView - if (contentWidth < 0 && !componentComplete) + Q_D(QQuickScrollView); + if (qFuzzyCompare(d->contentWidth, width)) return; - QQuickPanePrivate::itemImplicitWidthChanged(item); + if (d->flickable) { + d->flickable->setContentWidth(width); + } else { + d->contentWidth = width; + emit contentWidthChanged(); + } } -QQuickScrollView::QQuickScrollView(QQuickItem *parent) - : QQuickPane(*(new QQuickScrollViewPrivate), parent) +/*! + \qmlproperty real QtQuick.Controls::ScrollView::contentHeight + + This property holds the height of the scrollable content. + + If only a single item is used within a ScrollView, the content size is + automatically calculated based on the implicit size of its contained item. + + \sa contentWidth +*/ +qreal QQuickScrollView::contentHeight() const +{ + Q_D(const QQuickScrollView); + return d->contentHeight; +} + +void QQuickScrollView::setContentHeight(qreal height) { Q_D(QQuickScrollView); - d->contentWidth = -1; - d->contentHeight = -1; + if (qFuzzyCompare(d->contentHeight, height)) + return; - setFiltersChildMouseEvents(true); - setWheelEnabled(true); + if (d->flickable) { + d->flickable->setContentHeight(height); + } else { + d->contentHeight = height; + emit contentHeightChanged(); + } } /*! @@ -435,10 +431,10 @@ \sa Item::data, contentChildren */ -QQmlListProperty QQuickScrollViewPrivate::contentData() +QQmlListProperty QQuickScrollView::contentData() { - Q_Q(QQuickScrollView); - return QQmlListProperty(q, this, + Q_D(QQuickScrollView); + return QQmlListProperty(this, d, QQuickScrollViewPrivate::contentData_append, QQuickScrollViewPrivate::contentData_count, QQuickScrollViewPrivate::contentData_at, @@ -456,10 +452,10 @@ \sa Item::children, contentData */ -QQmlListProperty QQuickScrollViewPrivate::contentChildren() +QQmlListProperty QQuickScrollView::contentChildren() { - Q_Q(QQuickScrollView); - return QQmlListProperty(q, this, + Q_D(QQuickScrollView); + return QQmlListProperty(this, d, QQuickScrollViewPrivate::contentChildren_append, QQuickScrollViewPrivate::contentChildren_count, QQuickScrollViewPrivate::contentChildren_at, @@ -515,13 +511,13 @@ if (!d->wheelEnabled) return true; } - return QQuickPane::eventFilter(object, event); + return QQuickControl::eventFilter(object, event); } void QQuickScrollView::keyPressEvent(QKeyEvent *event) { Q_D(QQuickScrollView); - QQuickPane::keyPressEvent(event); + QQuickControl::keyPressEvent(event); switch (event->key()) { case Qt::Key_Up: if (QQuickScrollBar *vbar = d->verticalScrollBar()) { @@ -556,40 +552,22 @@ void QQuickScrollView::componentComplete() { Q_D(QQuickScrollView); - QQuickPane::componentComplete(); - if (!d->contentItem) + QQuickControl::componentComplete(); + if (!d->contentItem) { d->ensureFlickable(true); -} - -void QQuickScrollView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) -{ - Q_D(QQuickScrollView); - if (newItem != d->flickable) { - // The new flickable was not created by us. In that case, we always - // assume/require that it has an explicit content size assigned. - d->flickableHasExplicitContentWidth = true; - d->flickableHasExplicitContentHeight = true; - d->setFlickable(qobject_cast(newItem), false); + } else { + if (d->contentWidth <= 0) + d->updateContentWidth(); + if (d->contentHeight <= 0) + d->updateContentHeight(); } - QQuickPane::contentItemChange(newItem, oldItem); } -void QQuickScrollView::contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize) +void QQuickScrollView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) { Q_D(QQuickScrollView); - QQuickPane::contentSizeChange(newSize, oldSize); - if (d->flickable) { - // Only set the content size on the flickable if the flickable doesn't - // have an explicit assignment from before. Otherwise we can end up overwriting - // assignments done to those properties by the application. The - // exception is if the application has assigned a content size - // directly to the scrollview, which will then win even if the - // application has assigned something else to the flickable. - if (d->hasContentWidth || !d->flickableHasExplicitContentWidth) - d->flickable->setContentWidth(newSize.width()); - if (d->hasContentHeight || !d->flickableHasExplicitContentHeight) - d->flickable->setContentHeight(newSize.height()); - } + QQuickControl::contentItemChange(newItem, oldItem); + d->setFlickable(qobject_cast(newItem), false); } #if QT_CONFIG(accessibility) @@ -600,5 +578,3 @@ #endif QT_END_NAMESPACE - -#include "moc_qquickscrollview_p.cpp" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollview_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickscrollview_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickscrollview_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,20 +48,39 @@ // We mean it. // -#include +#include #include QT_BEGIN_NAMESPACE class QQuickScrollViewPrivate; -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollView : public QQuickPane +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollView : public QQuickControl { Q_OBJECT + Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL) + Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged FINAL) + Q_PROPERTY(QQmlListProperty contentData READ contentData FINAL) + Q_PROPERTY(QQmlListProperty contentChildren READ contentChildren NOTIFY contentChildrenChanged FINAL) + Q_CLASSINFO("DefaultProperty", "contentData") public: explicit QQuickScrollView(QQuickItem *parent = nullptr); + qreal contentWidth() const; + void setContentWidth(qreal width); + + qreal contentHeight() const; + void setContentHeight(qreal height); + + QQmlListProperty contentData(); + QQmlListProperty contentChildren(); + +Q_SIGNALS: + void contentWidthChanged(); + void contentHeightChanged(); + void contentChildrenChanged(); + protected: bool childMouseEventFilter(QQuickItem *item, QEvent *event) override; bool eventFilter(QObject *object, QEvent *event) override; @@ -69,7 +88,6 @@ void componentComplete() override; void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; - void contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize) override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickshortcutcontext.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickshortcutcontext.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickshortcutcontext.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickshortcutcontext.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -38,8 +38,6 @@ #include "qquickoverlay_p_p.h" #include "qquicktooltip_p.h" #include "qquickpopup_p.h" -#include "qquickmenu_p.h" -#include "qquickmenubaritem_p.h" #include #include @@ -56,13 +54,8 @@ for (QQuickPopup *popup : popups) { if (qobject_cast(popup)) continue; // ignore tooltips (QTBUG-60492) - if (popup->isModal() || popup->closePolicy() & QQuickPopup::CloseOnEscape) { - if (QQuickMenu *menu = qobject_cast(popup)) { - if (qobject_cast(menu->parentItem())) - continue; - } + if (popup->isModal() || popup->closePolicy() & QQuickPopup::CloseOnEscape) return item != popup->popupItem() && !popup->popupItem()->isAncestorOf(item); - } } return false; @@ -76,16 +69,14 @@ return true; case Qt::WindowShortcut: while (obj && !obj->isWindowType()) { + obj = obj->parent(); item = qobject_cast(obj); - if (item && item->window()) { + if (item) { obj = item->window(); - break; } else if (QQuickPopup *popup = qobject_cast(obj)) { obj = popup->window(); item = popup->popupItem(); - break; } - obj = obj->parent(); } if (QWindow *renderWindow = QQuickRenderControl::renderWindowFor(qobject_cast(obj))) obj = renderWindow; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickslider.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickslider.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickslider.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickslider.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -73,9 +73,6 @@ In the example above, \l visualPosition will be \c 0.24 in a left-to-right application, and \c 0.76 in a right-to-left application. - For a slider that allows the user to select a range by providing two - handles, see \l RangeSlider. - \sa {Customizing Slider}, {Input Controls} */ @@ -92,6 +89,20 @@ Q_DECLARE_PUBLIC(QQuickSlider) public: + QQuickSliderPrivate() + : from(0), + to(1), + value(0), + position(0), + stepSize(0), + live(true), + pressed(false), + orientation(Qt::Horizontal), + snapMode(QQuickSlider::NoSnap), + handle(nullptr) + { + } + qreal snapPosition(qreal position) const; qreal positionAt(const QPointF &point) const; void setPosition(qreal position); @@ -105,20 +116,16 @@ void cancelHandle(); void executeHandle(bool complete = false); - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - - qreal from = 0; - qreal to = 1; - qreal value = 0; - qreal position = 0; - qreal stepSize = 0; - qreal touchDragThreshold = -1; // in QQuickWindowPrivate::dragOverThreshold, '-1' implies using styleHints::startDragDistance() - bool live = true; - bool pressed = false; + qreal from; + qreal to; + qreal value; + qreal position; + qreal stepSize; + bool live; + bool pressed; QPointF pressPoint; - Qt::Orientation orientation = Qt::Horizontal; - QQuickSlider::SnapMode snapMode = QQuickSlider::NoSnap; + Qt::Orientation orientation; + QQuickSlider::SnapMode snapMode; QQuickDeferredPointer handle; }; @@ -252,22 +259,6 @@ quickCompleteDeferred(q, handleName(), handle); } -void QQuickSliderPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - Q_Q(QQuickSlider); - QQuickControlPrivate::itemImplicitWidthChanged(item); - if (item == handle) - emit q->implicitHandleWidthChanged(); -} - -void QQuickSliderPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - Q_Q(QQuickSlider); - QQuickControlPrivate::itemImplicitHeightChanged(item); - if (item == handle) - emit q->implicitHandleHeightChanged(); -} - QQuickSlider::QQuickSlider(QQuickItem *parent) : QQuickControl(*(new QQuickSliderPrivate), parent) { @@ -279,12 +270,6 @@ #endif } -QQuickSlider::~QQuickSlider() -{ - Q_D(QQuickSlider); - d->removeImplicitSizeListener(d->handle); -} - /*! \qmlproperty real QtQuick.Controls::Slider::from @@ -433,9 +418,6 @@ This property holds the snap mode. - The snap mode determines how the slider handle behaves with - regards to the \l stepSize. - Possible values: \value Slider.NoSnap The slider does not snap (default). \value Slider.SnapAlways The slider snaps while the handle is dragged. @@ -474,8 +456,7 @@ /*! \qmlproperty bool QtQuick.Controls::Slider::pressed - This property holds whether the slider is pressed by either touch, mouse, - or keys. + This property holds whether the slider is pressed. */ bool QQuickSlider::isPressed() const { @@ -495,36 +476,6 @@ } /*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::Slider::horizontal - \readonly - - This property holds whether the slider is horizontal. - - \sa orientation -*/ -bool QQuickSlider::isHorizontal() const -{ - Q_D(const QQuickSlider); - return d->orientation == Qt::Horizontal; -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::Slider::vertical - \readonly - - This property holds whether the slider is vertical. - - \sa orientation -*/ -bool QQuickSlider::isVertical() const -{ - Q_D(const QQuickSlider); - return d->orientation == Qt::Vertical; -} - -/*! \qmlproperty enumeration QtQuick.Controls::Slider::orientation This property holds the orientation. @@ -532,8 +483,6 @@ Possible values: \value Qt.Horizontal Horizontal (default) \value Qt.Vertical Vertical - - \sa horizontal, vertical */ Qt::Orientation QQuickSlider::orientation() const { @@ -575,23 +524,10 @@ if (!d->handle.isExecuting()) d->cancelHandle(); - const qreal oldImplicitHandleWidth = implicitHandleWidth(); - const qreal oldImplicitHandleHeight = implicitHandleHeight(); - - d->removeImplicitSizeListener(d->handle); delete d->handle; d->handle = handle; - - if (handle) { - if (!handle->parentItem()) - handle->setParentItem(this); - d->addImplicitSizeListener(handle); - } - - if (!qFuzzyCompare(oldImplicitHandleWidth, implicitHandleWidth())) - emit implicitHandleWidthChanged(); - if (!qFuzzyCompare(oldImplicitHandleHeight, implicitHandleHeight())) - emit implicitHandleHeightChanged(); + if (handle && !handle->parentItem()) + handle->setParentItem(this); if (!d->handle.isExecuting()) emit handleChanged(); } @@ -668,81 +604,6 @@ setValue(d->value - step); } -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty qreal QtQuick.Controls::Slider::touchDragThreshold - - This property holds the threshold (in logical pixels) at which a touch drag event will be initiated. - The mouse drag threshold won't be affected. - The default value is \c Qt.styleHints.startDragDistance. - - \sa QStyleHints -*/ -qreal QQuickSlider::touchDragThreshold() const -{ - Q_D(const QQuickSlider); - return d->touchDragThreshold; -} - -void QQuickSlider::setTouchDragThreshold(qreal touchDragThreshold) -{ - Q_D(QQuickSlider); - if (d->touchDragThreshold == touchDragThreshold) - return; - - d->touchDragThreshold = touchDragThreshold; - emit touchDragThresholdChanged(); -} - -void QQuickSlider::resetTouchDragThreshold() -{ - setTouchDragThreshold(-1); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Slider::implicitHandleWidth - \readonly - - This property holds the implicit handle width. - - The value is equal to \c {handle ? handle.implicitWidth : 0}. - - This is typically used, together with \l {Control::}{implicitContentWidth} and - \l {Control::}{implicitBackgroundWidth}, to calculate the \l {Item::}{implicitWidth}. - - \sa implicitHandleHeight -*/ -qreal QQuickSlider::implicitHandleWidth() const -{ - Q_D(const QQuickSlider); - if (!d->handle) - return 0; - return d->handle->implicitWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::Slider::implicitHandleHeight - \readonly - - This property holds the implicit handle height. - - The value is equal to \c {handle ? handle.implicitHeight : 0}. - - This is typically used, together with \l {Control::}{implicitContentHeight} and - \l {Control::}{implicitBackgroundHeight}, to calculate the \l {Item::}{implicitHeight}. - - \sa implicitHandleWidth -*/ -qreal QQuickSlider::implicitHandleHeight() const -{ - Q_D(const QQuickSlider); - if (!d->handle) - return 0; - return d->handle->implicitHeight(); -} - void QQuickSlider::keyPressEvent(QKeyEvent *event) { Q_D(QQuickSlider); @@ -791,7 +652,18 @@ Q_D(QQuickSlider); QQuickControl::mousePressEvent(event); d->handleMove(event->localPos()); - setKeepMouseGrab(true); +} + +void QQuickSlider::mouseMoveEvent(QMouseEvent *event) +{ + Q_D(QQuickSlider); + if (!keepMouseGrab()) { + if (d->orientation == Qt::Horizontal) + setKeepMouseGrab(QQuickWindowPrivate::dragOverThreshold(event->localPos().x() - d->pressPoint.x(), Qt::XAxis, event)); + else + setKeepMouseGrab(QQuickWindowPrivate::dragOverThreshold(event->localPos().y() - d->pressPoint.y(), Qt::YAxis, event)); + } + QQuickControl::mouseMoveEvent(event); } #if QT_CONFIG(quicktemplates2_multitouch) @@ -811,9 +683,9 @@ case Qt::TouchPointMoved: if (!keepTouchGrab()) { if (d->orientation == Qt::Horizontal) - setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.pos().x() - d->pressPoint.x(), Qt::XAxis, &point, qRound(d->touchDragThreshold))); + setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.pos().x() - d->pressPoint.x(), Qt::XAxis, &point)); else - setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.pos().y() - d->pressPoint.y(), Qt::YAxis, &point, qRound(d->touchDragThreshold))); + setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.pos().y() - d->pressPoint.y(), Qt::YAxis, &point)); } if (keepTouchGrab()) d->handleMove(point.pos()); @@ -848,6 +720,7 @@ const bool wasMoved = !qFuzzyCompare(d->value, oldValue); if (wasMoved) emit moved(); + event->setAccepted(wasMoved); } } #endif diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickslider_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickslider_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickslider_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickslider_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -68,18 +68,10 @@ Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL) Q_PROPERTY(QQuickItem *handle READ handle WRITE setHandle NOTIFY handleChanged FINAL) Q_PROPERTY(bool live READ live WRITE setLive NOTIFY liveChanged FINAL REVISION 2) - // 2.3 (Qt 5.10) - Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) - Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal touchDragThreshold READ touchDragThreshold WRITE setTouchDragThreshold RESET resetTouchDragThreshold NOTIFY touchDragThresholdChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitHandleWidth READ implicitHandleWidth NOTIFY implicitHandleWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitHandleHeight READ implicitHandleHeight NOTIFY implicitHandleHeightChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "background,handle") public: explicit QQuickSlider(QQuickItem *parent = nullptr); - ~QQuickSlider(); qreal from() const; void setFrom(qreal from); @@ -122,18 +114,6 @@ bool live() const; void setLive(bool live); - // 2.3 (Qt 5.10) - bool isHorizontal() const; - bool isVertical() const; - - // 2.5 (Qt 5.12) - qreal touchDragThreshold() const; - void setTouchDragThreshold(qreal touchDragThreshold); - void resetTouchDragThreshold(); - - qreal implicitHandleWidth() const; - qreal implicitHandleHeight() const; - public Q_SLOTS: void increase(); void decrease(); @@ -152,15 +132,12 @@ // 2.2 (Qt 5.9) Q_REVISION(2) void moved(); Q_REVISION(2) void liveChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void touchDragThresholdChanged(); - Q_REVISION(5) void implicitHandleWidthChanged(); - Q_REVISION(5) void implicitHandleHeightChanged(); protected: void keyPressEvent(QKeyEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override; void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; #if QT_CONFIG(quicktemplates2_multitouch) void touchEvent(QTouchEvent *event) override; #endif diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickspinbox.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickspinbox.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickspinbox.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickspinbox.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -59,7 +59,6 @@ \inqmlmodule QtQuick.Controls \since 5.7 \ingroup input - \ingroup qtquickcontrols2-focusscopes \brief Allows the user to select from a set of preset values. \image qtquickcontrols2-spinbox.png @@ -92,7 +91,7 @@ \snippet qtquickcontrols2-spinbox-double.qml 1 - \sa Tumbler, {Customizing SpinBox}, {Focus Management in Qt Quick Controls 2} + \sa Tumbler, {Customizing SpinBox} */ /*! @@ -108,18 +107,29 @@ Q_DECLARE_PUBLIC(QQuickSpinBox) public: - int boundValue(int value, bool wrap) const; + QQuickSpinBoxPrivate() + : editable(false), + from(0), + to(99), + value(0), + stepSize(1), + delayTimer(0), + repeatTimer(0), + up(nullptr), + down(nullptr), + validator(nullptr), + inputMethodHints(Qt::ImhDigitsOnly) + { + } + + int boundValue(int value) const; void updateValue(); - bool setValue(int value, bool wrap, bool modified); - bool stepBy(int steps, bool modified); + bool setValue(int value, bool modified); void increase(bool modified); void decrease(bool modified); int effectiveStepSize() const; - void updateDisplayText(); - void setDisplayText(const QString &displayText); - bool upEnabled() const; void updateUpEnabled(); bool downEnabled() const; @@ -135,24 +145,19 @@ void handleRelease(const QPointF &point) override; void handleUngrab() override; - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - - bool editable = false; - bool wrap = false; - int from = 0; - int to = 99; - int value = 0; - int stepSize = 1; - int delayTimer = 0; - int repeatTimer = 0; - QString displayText; - QQuickSpinButton *up = nullptr; - QQuickSpinButton *down = nullptr; - QValidator *validator = nullptr; + bool editable; + int from; + int to; + int value; + int stepSize; + int delayTimer; + int repeatTimer; + QQuickSpinButton *up; + QQuickSpinButton *down; + QValidator *validator; mutable QJSValue textFromValue; mutable QJSValue valueFromText; - Qt::InputMethodHints inputMethodHints = Qt::ImhDigitsOnly; + Qt::InputMethodHints inputMethodHints; }; class QQuickSpinButtonPrivate : public QObjectPrivate @@ -160,6 +165,13 @@ Q_DECLARE_PUBLIC(QQuickSpinButton) public: + QQuickSpinButtonPrivate() + : pressed(false), + hovered(false), + indicator(nullptr) + { + } + static QQuickSpinButtonPrivate *get(QQuickSpinButton *button) { return button->d_func(); @@ -168,25 +180,14 @@ void cancelIndicator(); void executeIndicator(bool complete = false); - bool pressed = false; - bool hovered = false; + bool pressed; + bool hovered; QQuickDeferredPointer indicator; }; -int QQuickSpinBoxPrivate::boundValue(int value, bool wrap) const +int QQuickSpinBoxPrivate::boundValue(int value) const { - bool inverted = from > to; - if (!wrap) - return inverted ? qBound(to, value, from) : qBound(from, value, to); - - int f = inverted ? to : from; - int t = inverted ? from : to; - if (value < f) - value = t; - else if (value > t) - value = f; - - return value; + return from > to ? qBound(to, value, from) : qBound(from, value, to); } void QQuickSpinBoxPrivate::updateValue() @@ -195,32 +196,28 @@ if (contentItem) { QVariant text = contentItem->property("text"); if (text.isValid()) { - int val = 0; QQmlEngine *engine = qmlEngine(q); - if (engine && valueFromText.isCallable()) { + if (engine) { QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine); QJSValue loc(v4, QQmlLocale::wrap(v4, locale)); - val = valueFromText.call(QJSValueList() << text.toString() << loc).toInt(); - } else { - val = locale.toInt(text.toString()); + QJSValue val = q->valueFromText().call(QJSValueList() << text.toString() << loc); + setValue(val.toInt(), true); } - setValue(val, /* allowWrap = */ false, /* modified = */ true); } } } -bool QQuickSpinBoxPrivate::setValue(int newValue, bool allowWrap, bool modified) +bool QQuickSpinBoxPrivate::setValue(int newValue, bool modified) { Q_Q(QQuickSpinBox); if (q->isComponentComplete()) - newValue = boundValue(newValue, allowWrap); + newValue = boundValue(newValue); if (value == newValue) return false; value = newValue; - updateDisplayText(); updateUpEnabled(); updateDownEnabled(); @@ -230,19 +227,14 @@ return true; } -bool QQuickSpinBoxPrivate::stepBy(int steps, bool modified) -{ - return setValue(value + steps, wrap, modified); -} - void QQuickSpinBoxPrivate::increase(bool modified) { - setValue(value + effectiveStepSize(), wrap, modified); + setValue(value + effectiveStepSize(), modified); } void QQuickSpinBoxPrivate::decrease(bool modified) { - setValue(value - effectiveStepSize(), wrap, modified); + setValue(value - effectiveStepSize(), modified); } int QQuickSpinBoxPrivate::effectiveStepSize() const @@ -250,31 +242,6 @@ return from > to ? -1 * stepSize : stepSize; } -void QQuickSpinBoxPrivate::updateDisplayText() -{ - Q_Q(QQuickSpinBox); - QString text; - QQmlEngine *engine = qmlEngine(q); - if (engine && textFromValue.isCallable()) { - QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine); - QJSValue loc(v4, QQmlLocale::wrap(v4, locale)); - text = textFromValue.call(QJSValueList() << value << loc).toString(); - } else { - text = locale.toString(value); - } - setDisplayText(text); -} - -void QQuickSpinBoxPrivate::setDisplayText(const QString &text) -{ - Q_Q(QQuickSpinBox); - if (displayText == text) - return; - - displayText = text; - emit q->displayTextChanged(); -} - bool QQuickSpinBoxPrivate::upEnabled() const { const QQuickItem *upIndicator = up->indicator(); @@ -287,7 +254,7 @@ if (!upIndicator) return; - upIndicator->setEnabled(wrap || (from < to ? value < to : value > to)); + upIndicator->setEnabled(from < to ? value < to : value > to); } bool QQuickSpinBoxPrivate::downEnabled() const @@ -302,7 +269,7 @@ if (!downIndicator) return; - downIndicator->setEnabled(wrap || (from < to ? value > from : value < from)); + downIndicator->setEnabled(from < to ? value > from : value < from); } void QQuickSpinBoxPrivate::updateHover(const QPointF &pos) @@ -362,10 +329,8 @@ QQuickControlPrivate::handleMove(point); QQuickItem *ui = up->indicator(); QQuickItem *di = down->indicator(); - up->setHovered(ui && ui->isEnabled() && ui->contains(ui->mapFromItem(q, point))); - up->setPressed(up->isHovered()); - down->setHovered(di && di->isEnabled() && di->contains(di->mapFromItem(q, point))); - down->setPressed(down->isHovered()); + up->setPressed(ui && ui->isEnabled() && ui->contains(ui->mapFromItem(q, point))); + down->setPressed(di && di->isEnabled() && di->contains(di->mapFromItem(q, point))); bool pressed = up->isPressed() || down->isPressed(); q->setAccessibleProperty("pressed", pressed); @@ -408,24 +373,6 @@ stopPressRepeat(); } -void QQuickSpinBoxPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - QQuickControlPrivate::itemImplicitWidthChanged(item); - if (item == up->indicator()) - emit up->implicitIndicatorWidthChanged(); - else if (item == down->indicator()) - emit down->implicitIndicatorWidthChanged(); -} - -void QQuickSpinBoxPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - QQuickControlPrivate::itemImplicitHeightChanged(item); - if (item == up->indicator()) - emit up->implicitIndicatorHeightChanged(); - else if (item == down->indicator()) - emit down->implicitIndicatorHeightChanged(); -} - QQuickSpinBox::QQuickSpinBox(QQuickItem *parent) : QQuickControl(*(new QQuickSpinBoxPrivate), parent) { @@ -441,13 +388,6 @@ #endif } -QQuickSpinBox::~QQuickSpinBox() -{ - Q_D(QQuickSpinBox); - d->removeImplicitSizeListener(d->up->indicator()); - d->removeImplicitSizeListener(d->down->indicator()); -} - /*! \qmlproperty int QtQuick.Controls::SpinBox::from @@ -470,7 +410,7 @@ d->from = from; emit fromChanged(); if (isComponentComplete()) { - if (!d->setValue(d->value, /* allowWrap = */ false, /* modified = */ false)) { + if (!d->setValue(d->value, false)) { d->updateUpEnabled(); d->updateDownEnabled(); } @@ -499,7 +439,7 @@ d->to = to; emit toChanged(); if (isComponentComplete()) { - if (!d->setValue(d->value, /* allowWrap = */false, /* modified = */ false)) { + if (!d->setValue(d->value, false)) { d->updateUpEnabled(); d->updateDownEnabled(); } @@ -520,7 +460,7 @@ void QQuickSpinBox::setValue(int value) { Q_D(QQuickSpinBox); - d->setValue(value, /* allowWrap = */ false, /* modified = */ false); + d->setValue(value, false); } /*! @@ -631,8 +571,7 @@ is the value to be converted, and the optional second argument is the locale that should be used for the conversion, if applicable. - The default implementation does the conversion using - \l {QtQml::Number::toLocaleString()}{Number.toLocaleString}(): + The default implementation does the conversion using \l {QtQml::Locale}{Number.toLocaleString()}: \code textFromValue: function(value, locale) { return Number(value).toLocaleString(locale, 'f', 0); } @@ -650,7 +589,7 @@ if (!d->textFromValue.isCallable()) { QQmlEngine *engine = qmlEngine(this); if (engine) - d->textFromValue = engine->evaluate(QStringLiteral("(function(value, locale) { return Number(value).toLocaleString(locale, 'f', 0); })")); + d->textFromValue = engine->evaluate(QStringLiteral("function(value, locale) { return Number(value).toLocaleString(locale, 'f', 0); }")); } return d->textFromValue; } @@ -719,13 +658,9 @@ \qmlproperty bool QtQuick.Controls::SpinBox::up.pressed \qmlproperty Item QtQuick.Controls::SpinBox::up.indicator \qmlproperty bool QtQuick.Controls::SpinBox::up.hovered - \qmlproperty real QtQuick.Controls::SpinBox::up.implicitIndicatorWidth - \qmlproperty real QtQuick.Controls::SpinBox::up.implicitIndicatorHeight These properties hold the up indicator item and whether it is pressed or - hovered. The \c up.hovered property was introduced in QtQuick.Controls 2.1, - and the \c up.implicitIndicatorWidth and \c up.implicitIndicatorHeight - properties were introduced in QtQuick.Controls 2.5. + hovered. The \c up.hovered property was introduced in QtQuick.Controls 2.1. \sa increase() */ @@ -740,13 +675,9 @@ \qmlproperty bool QtQuick.Controls::SpinBox::down.pressed \qmlproperty Item QtQuick.Controls::SpinBox::down.indicator \qmlproperty bool QtQuick.Controls::SpinBox::down.hovered - \qmlproperty real QtQuick.Controls::SpinBox::down.implicitIndicatorWidth - \qmlproperty real QtQuick.Controls::SpinBox::down.implicitIndicatorHeight These properties hold the down indicator item and whether it is pressed or - hovered. The \c down.hovered property was introduced in QtQuick.Controls 2.1, - and the \c down.implicitIndicatorWidth and \c down.implicitIndicatorHeight - properties were introduced in QtQuick.Controls 2.5. + hovered. The \c down.hovered property was introduced in QtQuick.Controls 2.1. \sa decrease() */ @@ -801,55 +732,6 @@ } /*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::SpinBox::wrap - - This property holds whether the spinbox wraps. The default value is \c false. - - If wrap is \c true, stepping past \l to changes the value to \l from and vice versa. -*/ -bool QQuickSpinBox::wrap() const -{ - Q_D(const QQuickSpinBox); - return d->wrap; -} - -void QQuickSpinBox::setWrap(bool wrap) -{ - Q_D(QQuickSpinBox); - if (d->wrap == wrap) - return; - - d->wrap = wrap; - if (d->value == d->from || d->value == d->to) { - d->updateUpEnabled(); - d->updateDownEnabled(); - } - emit wrapChanged(); -} - -/*! - \since QtQuick.Controls 2.4 (Qt 5.11) - \qmlproperty string QtQuick.Controls::SpinBox::displayText - \readonly - - This property holds the textual value of the spinbox. - - The value of the property is based on \l textFromValue and \l {Control::} - {locale}, and equal to: - \badcode - var text = spinBox.textFromValue(spinBox.value, spinBox.locale) - \endcode - - \sa textFromValue -*/ -QString QQuickSpinBox::displayText() const -{ - Q_D(const QQuickSpinBox); - return d->displayText; -} - -/*! \qmlmethod void QtQuick.Controls::SpinBox::increase() Increases the value by \l stepSize, or \c 1 if stepSize is not defined. @@ -971,7 +853,8 @@ if (d->wheelEnabled) { const QPointF angle = event->angleDelta(); const qreal delta = (qFuzzyIsNull(angle.y()) ? angle.x() : angle.y()) / QWheelEvent::DefaultDeltasPerStep; - d->stepBy(qRound(d->effectiveStepSize() * delta), true); + if (!d->setValue(d->value + qRound(d->effectiveStepSize() * delta), true)) + event->ignore(); } } #endif @@ -995,8 +878,7 @@ QQuickSpinButtonPrivate::get(d->down)->executeIndicator(true); QQuickControl::componentComplete(); - if (!d->setValue(d->value, /* allowWrap = */ false, /* modified = */ false)) { - d->updateDisplayText(); + if (!d->setValue(d->value, false)) { d->updateUpEnabled(); d->updateDownEnabled(); } @@ -1030,21 +912,9 @@ } } -void QQuickSpinBox::localeChange(const QLocale &newLocale, const QLocale &oldLocale) -{ - Q_D(QQuickSpinBox); - QQuickControl::localeChange(newLocale, oldLocale); - d->updateDisplayText(); -} - QFont QQuickSpinBox::defaultFont() const { - return QQuickTheme::font(QQuickTheme::SpinBox); -} - -QPalette QQuickSpinBox::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::SpinBox); + return QQuickControlPrivate::themeFont(QPlatformTheme::EditorFont); } #if QT_CONFIG(accessibility) @@ -1121,24 +991,13 @@ if (!d->indicator.isExecuting()) d->cancelIndicator(); - const qreal oldImplicitIndicatorWidth = implicitIndicatorWidth(); - const qreal oldImplicitIndicatorHeight = implicitIndicatorHeight(); - - QQuickSpinBox *spinBox = static_cast(parent()); - QQuickSpinBoxPrivate::get(spinBox)->removeImplicitSizeListener(d->indicator); delete d->indicator; d->indicator = indicator; if (indicator) { if (!indicator->parentItem()) - indicator->setParentItem(spinBox); - QQuickSpinBoxPrivate::get(spinBox)->addImplicitSizeListener(indicator); + indicator->setParentItem(static_cast(parent())); } - - if (!qFuzzyCompare(oldImplicitIndicatorWidth, implicitIndicatorWidth())) - emit implicitIndicatorWidthChanged(); - if (!qFuzzyCompare(oldImplicitIndicatorHeight, implicitIndicatorHeight())) - emit implicitIndicatorHeightChanged(); if (!d->indicator.isExecuting()) emit indicatorChanged(); } @@ -1159,20 +1018,4 @@ emit hoveredChanged(); } -qreal QQuickSpinButton::implicitIndicatorWidth() const -{ - Q_D(const QQuickSpinButton); - if (!d->indicator) - return 0; - return d->indicator->implicitWidth(); -} - -qreal QQuickSpinButton::implicitIndicatorHeight() const -{ - Q_D(const QQuickSpinButton); - if (!d->indicator) - return 0; - return d->indicator->implicitHeight(); -} - QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickspinbox_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickspinbox_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickspinbox_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickspinbox_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -74,14 +74,9 @@ // 2.2 (Qt 5.9) Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints NOTIFY inputMethodHintsChanged FINAL REVISION 2) Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged FINAL REVISION 2) - // 2.3 (Qt 5.10) - Q_PROPERTY(bool wrap READ wrap WRITE setWrap NOTIFY wrapChanged FINAL REVISION 3) - // 2.4 (Qt 5.11) - Q_PROPERTY(QString displayText READ displayText NOTIFY displayTextChanged FINAL REVISION 4) public: explicit QQuickSpinBox(QQuickItem *parent = nullptr); - ~QQuickSpinBox(); int from() const; void setFrom(int from); @@ -116,13 +111,6 @@ bool isInputMethodComposing() const; - // 2.3 (Qt 5.10) - bool wrap() const; - void setWrap(bool wrap); - - // 2.4 (Qt 5.11) - QString displayText() const; - public Q_SLOTS: void increase(); void decrease(); @@ -140,10 +128,6 @@ Q_REVISION(2) void valueModified(); Q_REVISION(2) void inputMethodHintsChanged(); Q_REVISION(2) void inputMethodComposingChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void wrapChanged(); - // 2.4 (Qt 5.11) - Q_REVISION(4) void displayTextChanged(); protected: void focusInEvent(QFocusEvent *event) override; @@ -161,10 +145,8 @@ void componentComplete() override; void itemChange(ItemChange change, const ItemChangeData &value) override; void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; - void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override; QFont defaultFont() const override; - QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; @@ -183,9 +165,6 @@ Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL) // 2.1 (Qt 5.8) Q_PROPERTY(bool hovered READ isHovered WRITE setHovered NOTIFY hoveredChanged FINAL REVISION 1) - // 2.5 (Qt 5.12) - Q_PROPERTY(qreal implicitIndicatorWidth READ implicitIndicatorWidth NOTIFY implicitIndicatorWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitIndicatorHeight READ implicitIndicatorHeight NOTIFY implicitIndicatorHeightChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "indicator") public: @@ -201,18 +180,11 @@ bool isHovered() const; void setHovered(bool hovered); - // 2.5 (Qt 5.12) - qreal implicitIndicatorWidth() const; - qreal implicitIndicatorHeight() const; - Q_SIGNALS: void pressedChanged(); void indicatorChanged(); // 2.1 (Qt 5.8) Q_REVISION(1) void hoveredChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void implicitIndicatorWidthChanged(); - Q_REVISION(5) void implicitIndicatorHeightChanged(); private: Q_DISABLE_COPY(QQuickSpinButton) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackelement.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackelement.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackelement.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackelement.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -72,7 +72,18 @@ }; QQuickStackElement::QQuickStackElement() - : QQuickItemViewTransitionableItem(nullptr) + : QQuickItemViewTransitionableItem(nullptr), + index(-1), + init(false), + removal(false), + ownItem(false), + ownComponent(false), + widthValid(false), + heightValid(false), + context(nullptr), + component(nullptr), + view(nullptr), + status(QQuickStackView::Inactive) { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackelement_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackelement_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackelement_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackelement_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -85,18 +85,18 @@ void itemDestroyed(QQuickItem *item) override; - int index = -1; - bool init = false; - bool removal = false; - bool ownItem = false; - bool ownComponent = false; - bool widthValid = false; - bool heightValid = false; - QQmlContext *context = nullptr; - QQmlComponent *component = nullptr; - QQuickStackView *view = nullptr; + int index; + bool init; + bool removal; + bool ownItem; + bool ownComponent; + bool widthValid; + bool heightValid; + QQmlContext *context; + QQmlComponent *component; + QQuickStackView *view; QPointer originalParent; - QQuickStackView::Status status = QQuickStackView::Inactive; + QQuickStackView::Status status; QV4::PersistentValue properties; QV4::PersistentValue qmlCallingContext; }; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstacktransition.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstacktransition.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstacktransition.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstacktransition.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -44,18 +44,23 @@ { QQuickStackTransition st; st.status = QQuickStackView::Deactivating; + st.transition = nullptr; st.element = element; const QQuickItemViewTransitioner *transitioner = QQuickStackViewPrivate::get(view)->transitioner; switch (operation) { case QQuickStackView::PushTransition: + st.target = false; st.type = QQuickItemViewTransitioner::AddTransition; + st.viewBounds = QRectF(); if (transitioner) st.transition = transitioner->addDisplacedTransition; break; case QQuickStackView::ReplaceTransition: + st.target = false; st.type = QQuickItemViewTransitioner::MoveTransition; + st.viewBounds = QRectF(); if (transitioner) st.transition = transitioner->moveDisplacedTransition; break; @@ -78,6 +83,7 @@ { QQuickStackTransition st; st.status = QQuickStackView::Activating; + st.transition = nullptr; st.element = element; const QQuickItemViewTransitioner *transitioner = QQuickStackViewPrivate::get(view)->transitioner; @@ -98,7 +104,9 @@ st.transition = transitioner->moveTransition; break; case QQuickStackView::PopTransition: + st.target = false; st.type = QQuickItemViewTransitioner::RemoveTransition; + st.viewBounds = QRectF(); if (transitioner) st.transition = transitioner->removeDisplacedTransition; break; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstacktransition_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstacktransition_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstacktransition_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstacktransition_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -66,12 +66,12 @@ static QQuickStackTransition replaceExit(QQuickStackView::Operation operation, QQuickStackElement *element, QQuickStackView *view); static QQuickStackTransition replaceEnter(QQuickStackView::Operation operation, QQuickStackElement *element, QQuickStackView *view); - bool target = false; - QQuickStackView::Status status = QQuickStackView::Inactive; - QQuickItemViewTransitioner::TransitionType type = QQuickItemViewTransitioner::NoTransition; + bool target; + QQuickStackView::Status status; + QQuickItemViewTransitioner::TransitionType type; QRectF viewBounds; - QQuickStackElement *element = nullptr; - QQuickTransition *transition = nullptr; + QQuickStackElement *element; + QQuickTransition *transition; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackview.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackview.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackview.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackview.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -57,7 +57,6 @@ \since 5.7 \ingroup qtquickcontrols2-navigation \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes \brief Provides a stack-based navigation model. \image qtquickcontrols2-stackview-wireframe.png @@ -296,84 +295,7 @@ only applies to the root of the item. Using anchors for its children works as expected. - \section1 Item Ownership - - StackView only takes ownership of items that it creates itself. This means - that any item pushed onto a StackView will never be destroyed by the - StackView; only items that StackView creates from \l {Component}{Components} - or \l [QML] {url}{URLs} are destroyed by the StackView. To illustrate this, - the messages in the example below will only be printed when the StackView - is destroyed, not when the items are popped off the stack: - - \qml - Component { - id: itemComponent - - Item { - Component.onDestruction: print("Destroying second item") - } - } - - StackView { - initialItem: Item { - Component.onDestruction: print("Destroying initial item") - } - - Component.onCompleted: push(itemComponent.createObject(window)) - } - \endqml - - However, both of the items created from the URL and Component in the - following example will be destroyed by the StackView when they are popped - off of it: - - \qml - Component { - id: itemComponent - - Item { - Component.onDestruction: print("Destroying second item") - } - } - - StackView { - initialItem: "Item1.qml" - - Component.onCompleted: push(itemComponent) - } - \endqml - - \section1 Size - - StackView does not inherit an implicit size from items that are pushed onto - it. This means that using it as the \l {Popup::}{contentItem} of a - \l Dialog, for example, will not work as expected: - - \code - Dialog { - StackView { - initialItem: Rectangle { - width: 200 - height: 200 - color: "salmon" - } - } - } - \endcode - - There are several ways to ensure that StackView has a size in this - situation: - - \list - \li Set \l implicitWidth and \l implicitHeight on the StackView itself. - \li Set \l implicitWidth and \l implicitHeight on the \l Rectangle. - \li Set \l {Popup::}{contentWidth} and \l {Popup::}{contentHeight} on - the Dialog. - \li Give the Dialog a size. - \endlist - - \sa {Customizing StackView}, {Navigation Controls}, {Container Controls}, - {Focus Management in Qt Quick Controls 2} + \sa {Customizing StackView}, {Navigation Controls}, {Container Controls} */ QQuickStackView::QQuickStackView(QQuickItem *parent) @@ -502,10 +424,7 @@ current. StackView creates an instance automatically if the pushed item is a \l Component, - or a \l [QML] url, and the instance will be destroyed when it is popped - off the stack. See \l {Item Ownership} for more information. - - The optional \a properties argument specifies a map of initial + or a \l [QML] url. The optional \a properties argument specifies a map of initial property values for the pushed item. For dynamically created items, these values are applied before the creation is finalized. This is more efficient than setting property values after creation, particularly where large sets of property values @@ -597,9 +516,8 @@ if (!d->elements.isEmpty()) exit = d->elements.top(); - int oldDepth = d->elements.count(); if (d->pushElements(elements)) { - d->depthChange(d->elements.count(), oldDepth); + emit depthChanged(); QQuickStackElement *enter = d->elements.top(); d->startTransition(QQuickStackTransition::pushEnter(operation, enter, this), QQuickStackTransition::pushExit(operation, exit, this), @@ -625,8 +543,6 @@ items down to (but not including) the first item is popped. If not specified, only the current item is popped. - \include qquickstackview.qdocinc pop-ownership - An \a operation can be optionally specified as the last argument. Supported operations: @@ -658,7 +574,6 @@ return; } - int oldDepth = d->elements.count(); QQuickStackElement *exit = d->elements.pop(); QQuickStackElement *enter = d->elements.top(); @@ -697,7 +612,7 @@ d->removing.insert(exit); previousItem = exit->item; } - d->depthChange(d->elements.count(), oldDepth); + emit depthChanged(); d->startTransition(QQuickStackTransition::popExit(operation, exit, this), QQuickStackTransition::popEnter(operation, enter, this), operation == Immediate); @@ -720,8 +635,6 @@ item. The item can be an \l Item, \l Component, or a \l [QML] url. Returns the item that became current. - \include qquickstackview.qdocinc pop-ownership - If the \a target argument is specified, all items down to the \target item will be replaced. If \a target is \c null, all items in the stack will be replaced. If not specified, only the top item will be replaced. @@ -839,13 +752,14 @@ return; } - int oldDepth = d->elements.count(); + int depth = d->elements.count(); QQuickStackElement* exit = nullptr; if (!d->elements.isEmpty()) exit = d->elements.pop(); if (exit != target ? d->replaceElements(target, elements) : d->pushElements(elements)) { - d->depthChange(d->elements.count(), oldDepth); + if (depth != d->elements.count()) + emit depthChanged(); if (exit) { exit->removal = true; d->removing.insert(exit); @@ -866,53 +780,20 @@ } /*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::StackView::empty - \readonly - - This property holds whether the stack is empty. - - \sa depth -*/ -bool QQuickStackView::isEmpty() const -{ - Q_D(const QQuickStackView); - return d->elements.isEmpty(); -} - -/*! - \qmlmethod void QtQuick.Controls::StackView::clear(transition) - - Removes all items from the stack. - - \include qquickstackview.qdocinc pop-ownership - - Since QtQuick.Controls 2.3, a \a transition can be optionally specified. Supported transitions: + \qmlmethod void QtQuick.Controls::StackView::clear() - \value StackView.Immediate Clear the stack immediately without any transition (default). - \value StackView.PushTransition Clear the stack with a push transition. - \value StackView.ReplaceTransition Clear the stack with a replace transition. - \value StackView.PopTransition Clear the stack with a pop transition. + Removes all items from the stack. No animations are applied. */ -void QQuickStackView::clear(Operation operation) +void QQuickStackView::clear() { Q_D(QQuickStackView); if (d->elements.isEmpty()) return; - if (operation != Immediate) { - QQuickStackElement *exit = d->elements.pop(); - exit->removal = true; - d->removing.insert(exit); - d->startTransition(QQuickStackTransition::popExit(operation, exit, this), - QQuickStackTransition::popEnter(operation, nullptr, this), false); - } - - int oldDepth = d->elements.count(); d->setCurrentItem(nullptr); qDeleteAll(d->elements); d->elements.clear(); - d->depthChange(0, oldDepth); + emit depthChanged(); } /*! @@ -927,13 +808,13 @@ \sa push() */ -QJSValue QQuickStackView::initialItem() const +QVariant QQuickStackView::initialItem() const { Q_D(const QQuickStackView); return d->initialItem; } -void QQuickStackView::setInitialItem(const QJSValue &item) +void QQuickStackView::setInitialItem(const QVariant &item) { Q_D(QQuickStackView); d->initialItem = item; @@ -1109,16 +990,15 @@ QScopedValueRollback rollback(d->operation, QStringLiteral("initialItem")); QQuickStackElement *element = nullptr; QString error; - int oldDepth = d->elements.count(); - if (QObject *o = d->initialItem.toQObject()) + if (QObject *o = d->initialItem.value()) element = QQuickStackElement::fromObject(o, this, &error); - else if (d->initialItem.isString()) + else if (d->initialItem.canConvert()) element = QQuickStackElement::fromString(d->initialItem.toString(), this, &error); if (!error.isEmpty()) { d->warn(error); delete element; } else if (d->pushElement(element)) { - d->depthChange(d->elements.count(), oldDepth); + emit depthChanged(); d->setCurrentItem(element); element->setStatus(QQuickStackView::Active); } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackview_p.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackview_p.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackview_p.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackview_p.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -47,6 +47,13 @@ QT_BEGIN_NAMESPACE +QQuickStackViewPrivate::QQuickStackViewPrivate() + : busy(false), + currentItem(nullptr), + transitioner(nullptr) +{ +} + void QQuickStackViewPrivate::warn(const QString &error) { Q_Q(QQuickStackView); @@ -66,8 +73,6 @@ currentItem = item; if (element) element->setVisible(true); - if (item) - item->setFocus(true); emit q->currentItemChanged(); } @@ -97,14 +102,14 @@ for (int i = from; i < argc; ++i) { QV4::ScopedValue arg(scope, (*args)[i]); if (QV4::ArrayObject *array = arg->as()) { - const uint len = uint(array->getLength()); - for (uint j = 0; j < len; ++j) { + int len = array->getLength(); + for (int j = 0; j < len; ++j) { QString error; - QV4::ScopedValue value(scope, array->get(j)); + QV4::ScopedValue value(scope, array->getIndexed(j)); QQuickStackElement *element = createElement(value, context, &error); if (element) { if (j < len - 1) { - QV4::ScopedValue props(scope, array->get(j + 1)); + QV4::ScopedValue props(scope, array->getIndexed(j + 1)); if (initProperties(element, props, args)) ++j; } @@ -272,7 +277,7 @@ removed += element; } - if (transitioner && transitioner->runningJobs.isEmpty()) { + if (transitioner->runningJobs.isEmpty()) { // ~QQuickStackElement() emits QQuickStackViewAttached::removed(), which may be used // to modify the stack. Set the status first and make a copy of the destroyable stack // elements to exclude any modifications that may happen during the loop. (QTBUG-62153) @@ -296,15 +301,4 @@ emit q->busyChanged(); } -void QQuickStackViewPrivate::depthChange(int newDepth, int oldDepth) -{ - Q_Q(QQuickStackView); - if (newDepth == oldDepth) - return; - - emit q->depthChanged(); - if (newDepth == 0 || oldDepth == 0) - emit q->emptyChanged(); -} - QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackview_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackview_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackview_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -65,15 +65,13 @@ Q_PROPERTY(bool busy READ isBusy NOTIFY busyChanged FINAL) Q_PROPERTY(int depth READ depth NOTIFY depthChanged FINAL) Q_PROPERTY(QQuickItem *currentItem READ currentItem NOTIFY currentItemChanged FINAL) - Q_PROPERTY(QJSValue initialItem READ initialItem WRITE setInitialItem FINAL) + Q_PROPERTY(QVariant initialItem READ initialItem WRITE setInitialItem FINAL) Q_PROPERTY(QQuickTransition *popEnter READ popEnter WRITE setPopEnter NOTIFY popEnterChanged FINAL) Q_PROPERTY(QQuickTransition *popExit READ popExit WRITE setPopExit NOTIFY popExitChanged FINAL) Q_PROPERTY(QQuickTransition *pushEnter READ pushEnter WRITE setPushEnter NOTIFY pushEnterChanged FINAL) Q_PROPERTY(QQuickTransition *pushExit READ pushExit WRITE setPushExit NOTIFY pushExitChanged FINAL) Q_PROPERTY(QQuickTransition *replaceEnter READ replaceEnter WRITE setReplaceEnter NOTIFY replaceEnterChanged FINAL) Q_PROPERTY(QQuickTransition *replaceExit READ replaceExit WRITE setReplaceExit NOTIFY replaceExitChanged FINAL) - // 2.3 (Qt 5.10) - Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged FINAL REVISION 3) public: explicit QQuickStackView(QQuickItem *parent = nullptr); @@ -93,8 +91,8 @@ }; Q_ENUM(Status) - QJSValue initialItem() const; - void setInitialItem(const QJSValue &item); + QVariant initialItem() const; + void setInitialItem(const QVariant &item); QQuickTransition *popEnter() const; void setPopEnter(QQuickTransition *enter); @@ -136,11 +134,8 @@ Q_INVOKABLE void pop(QQmlV4Function *args); Q_INVOKABLE void replace(QQmlV4Function *args); - // 2.3 (Qt 5.10) - bool isEmpty() const; - public Q_SLOTS: - void clear(Operation operation = Immediate); + void clear(); Q_SIGNALS: void busyChanged(); @@ -152,8 +147,6 @@ void pushExitChanged(); void replaceEnterChanged(); void replaceExitChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void emptyChanged(); protected: void componentComplete() override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackview_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackview_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickstackview_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickstackview_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -66,6 +66,8 @@ Q_DECLARE_PUBLIC(QQuickStackView) public: + QQuickStackViewPrivate(); + static QQuickStackViewPrivate *get(QQuickStackView *view) { return view->d_func(); @@ -90,16 +92,15 @@ void viewItemTransitionFinished(QQuickItemViewTransitionableItem *item) override; void setBusy(bool busy); - void depthChange(int newDepth, int oldDepth); - bool busy = false; + bool busy; QString operation; - QJSValue initialItem; - QQuickItem *currentItem = nullptr; + QVariant initialItem; + QQuickItem *currentItem; QSet removing; QList removed; QStack elements; - QQuickItemViewTransitioner *transitioner = nullptr; + QQuickItemViewTransitioner *transitioner; }; class QQuickStackViewAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener @@ -107,6 +108,12 @@ Q_DECLARE_PUBLIC(QQuickStackViewAttached) public: + QQuickStackViewAttachedPrivate() + : explicitVisible(false), + element(nullptr) + { + } + static QQuickStackViewAttachedPrivate *get(QQuickStackViewAttached *attached) { return attached->d_func(); @@ -114,8 +121,8 @@ void itemParentChanged(QQuickItem *item, QQuickItem *parent); - bool explicitVisible = false; - QQuickStackElement *element = nullptr; + bool explicitVisible; + QQuickStackElement *element; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswipedelegate.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswipedelegate.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswipedelegate.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswipedelegate.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -127,7 +127,7 @@ void finished() override; private: - QQuickSwipe *m_swipe = nullptr; + QQuickSwipe *m_swipe; }; class QQuickSwipePrivate : public QObjectPrivate @@ -135,7 +135,23 @@ Q_DECLARE_PUBLIC(QQuickSwipe) public: - QQuickSwipePrivate(QQuickSwipeDelegate *control) : control(control) { } + QQuickSwipePrivate(QQuickSwipeDelegate *control) + : control(control), + positionBeforePress(0), + position(0), + wasComplete(false), + complete(false), + enabled(true), + left(nullptr), + behind(nullptr), + right(nullptr), + leftItem(nullptr), + behindItem(nullptr), + rightItem(nullptr), + transition(nullptr), + transitionManager(nullptr) + { + } static QQuickSwipePrivate *get(QQuickSwipe *swipe); @@ -159,24 +175,24 @@ void beginTransition(qreal position); void finishTransition(); - QQuickSwipeDelegate *control = nullptr; + QQuickSwipeDelegate *control; // Same range as position, but is set before press events so that we can // keep track of which direction the user must swipe when using left and right delegates. - qreal positionBeforePress = 0; - qreal position = 0; + qreal positionBeforePress; + qreal position; // A "less strict" version of complete that is true if complete was true // before the last press event. - bool wasComplete = false; - bool complete = false; - bool enabled = true; + bool wasComplete; + bool complete; + bool enabled; QQuickVelocityCalculator velocityCalculator; - QQmlComponent *left = nullptr; - QQmlComponent *behind = nullptr; - QQmlComponent *right = nullptr; - QQuickItem *leftItem = nullptr; - QQuickItem *behindItem = nullptr; - QQuickItem *rightItem = nullptr; - QQuickTransition *transition = nullptr; + QQmlComponent *left; + QQmlComponent *behind; + QQmlComponent *right; + QQuickItem *leftItem; + QQuickItem *behindItem; + QQuickItem *rightItem; + QQuickTransition *transition; QScopedPointer transitionManager; }; @@ -720,7 +736,7 @@ // The press point could be incorrect if the press happened over a child item, // so we correct it after calling the base class' mousePressEvent(), rather // than having to duplicate its code just so we can set the pressPoint. - setPressPoint(item->mapToItem(q, event->pos())); + pressPoint = item->mapToItem(q, event->pos()); return true; } @@ -729,7 +745,7 @@ // mouse movement in case it turns into a swipe, in which case we grab the mouse. swipePrivate->positionBeforePress = swipePrivate->position; swipePrivate->velocityCalculator.startMeasuring(event->pos(), event->timestamp()); - setPressPoint(item->mapToItem(q, event->pos())); + pressPoint = item->mapToItem(q, event->pos()); // When a delegate uses the attached properties and signals, it declares that it wants mouse events. Attached *attached = attachedObject(item); @@ -1201,19 +1217,12 @@ event->ignore(); } -void QQuickSwipeDelegate::componentComplete() -{ - Q_D(QQuickSwipeDelegate); - QQuickItemDelegate::componentComplete(); - QQuickSwipePrivate::get(&d->swipe)->reposition(DontAnimatePosition); -} - void QQuickSwipeDelegate::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickSwipeDelegate); QQuickControl::geometryChanged(newGeometry, oldGeometry); - if (isComponentComplete() && !qFuzzyCompare(newGeometry.width(), oldGeometry.width())) { + if (!qFuzzyCompare(newGeometry.width(), oldGeometry.width())) { QQuickSwipePrivate *swipePrivate = QQuickSwipePrivate::get(&d->swipe); swipePrivate->reposition(DontAnimatePosition); } @@ -1221,12 +1230,7 @@ QFont QQuickSwipeDelegate::defaultFont() const { - return QQuickTheme::font(QQuickTheme::ListView); -} - -QPalette QQuickSwipeDelegate::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ListView); + return QQuickControlPrivate::themeFont(QPlatformTheme::ListViewFont); } #if QT_CONFIG(accessibility) @@ -1241,8 +1245,10 @@ Q_DECLARE_PUBLIC(QQuickSwipeDelegateAttached) public: + QQuickSwipeDelegateAttachedPrivate() : pressed(false) { } + // True when left/right/behind is non-interactive and is pressed. - bool pressed = false; + bool pressed; }; /*! diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswipedelegate_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswipedelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswipedelegate_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswipedelegate_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -60,7 +60,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeDelegate : public QQuickItemDelegate { Q_OBJECT - Q_PROPERTY(QQuickSwipe *swipe READ swipe CONSTANT FINAL) + Q_PROPERTY(QQuickSwipe *swipe READ swipe CONSTANT) public: explicit QQuickSwipeDelegate(QQuickItem *parent = nullptr); @@ -79,11 +79,9 @@ void mouseReleaseEvent(QMouseEvent *event) override; void touchEvent(QTouchEvent *event) override; - void componentComplete() override; void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; QFont defaultFont() const override; - QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswipeview.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswipeview.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswipeview.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswipeview.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -49,7 +49,6 @@ \since 5.7 \ingroup qtquickcontrols2-navigation \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes \brief Enables the user to navigate pages by swiping sideways. SwipeView provides a swipe-based navigation model. @@ -72,10 +71,10 @@ It is generally not advisable to add excessive amounts of pages to a SwipeView. However, when the amount of pages grows larger, or individual - pages are relatively complex, it may be desirable to free up resources by - unloading pages that are outside the immediate reach of the user. - The following example presents how to use \l Loader to keep a maximum of - three pages simultaneously instantiated. + pages are relatively complex, it may be desired free up resources by + unloading pages that are outside the reach. The following example presents + how to use \l Loader to keep a maximum of three pages simultaneously + instantiated. \code SwipeView { @@ -99,8 +98,7 @@ this only applies to the root of the item. Specifying width and height, or using anchors for its children works as expected. - \sa TabBar, PageIndicator, {Customizing SwipeView}, {Navigation Controls}, {Container Controls}, - {Focus Management in Qt Quick Controls 2} + \sa TabBar, PageIndicator, {Customizing SwipeView}, {Navigation Controls}, {Container Controls} */ class QQuickSwipeViewPrivate : public QQuickContainerPrivate @@ -108,38 +106,19 @@ Q_DECLARE_PUBLIC(QQuickSwipeView) public: + QQuickSwipeViewPrivate() + : interactive(true), + orientation(Qt::Horizontal) + { + } + void resizeItem(QQuickItem *item); void resizeItems(); static QQuickSwipeViewPrivate *get(QQuickSwipeView *view); - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - - qreal getContentWidth() const override; - qreal getContentHeight() const override; - - bool interactive = true; - Qt::Orientation orientation = Qt::Horizontal; -}; - -class QQuickSwipeViewAttachedPrivate : public QObjectPrivate -{ - Q_DECLARE_PUBLIC(QQuickSwipeViewAttached) - -public: - static QQuickSwipeViewAttachedPrivate *get(QQuickSwipeViewAttached *attached) - { - return attached->d_func(); - } - - void update(QQuickSwipeView *newView, int newIndex); - void updateCurrentIndex(); - void setCurrentIndex(int i); - - QQuickSwipeView *swipeView = nullptr; - int index = -1; - int currentIndex = -1; + bool interactive; + Qt::Orientation orientation; }; void QQuickSwipeViewPrivate::resizeItems() @@ -170,44 +149,11 @@ return view->d_func(); } -void QQuickSwipeViewPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - Q_Q(QQuickSwipeView); - QQuickContainerPrivate::itemImplicitWidthChanged(item); - if (item == q->currentItem()) - updateImplicitContentWidth(); -} - -void QQuickSwipeViewPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - Q_Q(QQuickSwipeView); - QQuickContainerPrivate::itemImplicitHeightChanged(item); - if (item == q->currentItem()) - updateImplicitContentHeight(); -} - -qreal QQuickSwipeViewPrivate::getContentWidth() const -{ - Q_Q(const QQuickSwipeView); - QQuickItem *currentItem = q->currentItem(); - return currentItem ? currentItem->implicitWidth() : 0; -} - -qreal QQuickSwipeViewPrivate::getContentHeight() const -{ - Q_Q(const QQuickSwipeView); - QQuickItem *currentItem = q->currentItem(); - return currentItem ? currentItem->implicitHeight() : 0; -} - QQuickSwipeView::QQuickSwipeView(QQuickItem *parent) : QQuickContainer(*(new QQuickSwipeViewPrivate), parent) { - Q_D(QQuickSwipeView); - d->changeTypes |= QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight; setFlag(ItemIsFocusScope); setActiveFocusOnTab(true); - QObjectPrivate::connect(this, &QQuickContainer::currentItemChanged, d, &QQuickControlPrivate::updateImplicitContentSize); } /*! @@ -244,8 +190,6 @@ Possible values: \value Qt.Horizontal Horizontal (default) \value Qt.Vertical Vertical - - \sa horizontal, vertical */ Qt::Orientation QQuickSwipeView::orientation() const { @@ -265,36 +209,6 @@ emit orientationChanged(); } -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::SwipeView::horizontal - \readonly - - This property holds whether the swipe view is horizontal. - - \sa orientation -*/ -bool QQuickSwipeView::isHorizontal() const -{ - Q_D(const QQuickSwipeView); - return d->orientation == Qt::Horizontal; -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::SwipeView::vertical - \readonly - - This property holds whether the swipe view is vertical. - - \sa orientation -*/ -bool QQuickSwipeView::isVertical() const -{ - Q_D(const QQuickSwipeView); - return d->orientation == Qt::Vertical; -} - QQuickSwipeViewAttached *QQuickSwipeView::qmlAttachedProperties(QObject *object) { return new QQuickSwipeViewAttached(object); @@ -307,29 +221,12 @@ d->resizeItems(); } -void QQuickSwipeView::itemAdded(int index, QQuickItem *item) +void QQuickSwipeView::itemAdded(int, QQuickItem *item) { Q_D(QQuickSwipeView); QQuickItemPrivate::get(item)->setCulled(true); // QTBUG-51078, QTBUG-51669 if (isComponentComplete()) item->setSize(QSizeF(d->contentItem->width(), d->contentItem->height())); - QQuickSwipeViewAttached *attached = qobject_cast(qmlAttachedPropertiesObject(item)); - if (attached) - QQuickSwipeViewAttachedPrivate::get(attached)->update(this, index); -} - -void QQuickSwipeView::itemMoved(int index, QQuickItem *item) -{ - QQuickSwipeViewAttached *attached = qobject_cast(qmlAttachedPropertiesObject(item)); - if (attached) - QQuickSwipeViewAttachedPrivate::get(attached)->update(this, index); -} - -void QQuickSwipeView::itemRemoved(int, QQuickItem *item) -{ - QQuickSwipeViewAttached *attached = qobject_cast(qmlAttachedPropertiesObject(item)); - if (attached) - QQuickSwipeViewAttachedPrivate::get(attached)->update(nullptr, -1); } #if QT_CONFIG(accessibility) @@ -386,11 +283,85 @@ It is attached to each child item of the SwipeView. */ +class QQuickSwipeViewAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener +{ + Q_DECLARE_PUBLIC(QQuickSwipeViewAttached) +public: + QQuickSwipeViewAttachedPrivate() + : item(nullptr), + swipeView(nullptr), + index(-1), + currentIndex(-1) + { + } + + ~QQuickSwipeViewAttachedPrivate() { + } + + void updateView(QQuickItem *parent); + + void itemChildAdded(QQuickItem *, QQuickItem *) override; + void itemChildRemoved(QQuickItem *, QQuickItem *) override; + void itemParentChanged(QQuickItem *, QQuickItem *) override; + void itemDestroyed(QQuickItem *) override; + + void updateIndex(); + void updateCurrentIndex(); + + void setView(QQuickSwipeView *view); + void setIndex(int i); + void setCurrentIndex(int i); + + QQuickItem *item; + QQuickSwipeView *swipeView; + int index; + int currentIndex; +}; + +void QQuickSwipeViewAttachedPrivate::updateIndex() +{ + setIndex(swipeView ? QQuickSwipeViewPrivate::get(swipeView)->contentModel->indexOf(item, nullptr) : -1); +} + void QQuickSwipeViewAttachedPrivate::updateCurrentIndex() { setCurrentIndex(swipeView ? swipeView->currentIndex() : -1); } +void QQuickSwipeViewAttachedPrivate::setView(QQuickSwipeView *view) +{ + if (view == swipeView) + return; + + if (swipeView) { + QQuickItemPrivate *p = QQuickItemPrivate::get(swipeView); + p->removeItemChangeListener(this, QQuickItemPrivate::Children); + + disconnect(swipeView, &QQuickSwipeView::currentIndexChanged, + this, &QQuickSwipeViewAttachedPrivate::updateCurrentIndex); + disconnect(swipeView, &QQuickSwipeView::contentChildrenChanged, + this, &QQuickSwipeViewAttachedPrivate::updateIndex); + } + + swipeView = view; + + if (swipeView) { + QQuickItemPrivate *p = QQuickItemPrivate::get(swipeView); + p->addItemChangeListener(this, QQuickItemPrivate::Children); + + connect(swipeView, &QQuickSwipeView::currentIndexChanged, + this, &QQuickSwipeViewAttachedPrivate::updateCurrentIndex); + connect(swipeView, &QQuickSwipeView::contentChildrenChanged, + this, &QQuickSwipeViewAttachedPrivate::updateIndex); + } + + Q_Q(QQuickSwipeViewAttached); + emit q->viewChanged(); + + updateIndex(); + updateCurrentIndex(); +} + void QQuickSwipeViewAttachedPrivate::setCurrentIndex(int i) { if (i == currentIndex) @@ -410,37 +381,79 @@ emit q->isPreviousItemChanged(); } -void QQuickSwipeViewAttachedPrivate::update(QQuickSwipeView *newView, int newIndex) +void QQuickSwipeViewAttachedPrivate::setIndex(int i) { - Q_Q(QQuickSwipeViewAttached); - int oldIndex = index; - QQuickSwipeView *oldView = swipeView; + if (i == index) + return; - index = newIndex; - swipeView = newView; + index = i; + Q_Q(QQuickSwipeViewAttached); + emit q->indexChanged(); +} - if (oldView != newView) { - if (oldView) { - disconnect(oldView, &QQuickSwipeView::currentIndexChanged, - this, &QQuickSwipeViewAttachedPrivate::updateCurrentIndex); - } - if (newView) { - connect(newView, &QQuickSwipeView::currentIndexChanged, - this, &QQuickSwipeViewAttachedPrivate::updateCurrentIndex); +void QQuickSwipeViewAttachedPrivate::updateView(QQuickItem *parent) +{ + // parent can be, e.g.: + // - The contentItem of a ListView (typically the case) + // - A non-visual or weird type like TestCase, when child items are created from components + // wherein the attached properties are used + // - null, when the item was removed with removeItem() + QQuickSwipeView *view = nullptr; + if (parent) { + view = qobject_cast(parent); + if (!view) { + if (parent->parentItem() && parent->parentItem()->property("contentItem").isValid()) { + // The parent is the contentItem of some kind of view. + view = qobject_cast(parent->parentItem()->parentItem()); + } } - emit q->viewChanged(); } - if (oldIndex != newIndex) - emit q->indexChanged(); - updateCurrentIndex(); + setView(view); +} + +void QQuickSwipeViewAttachedPrivate::itemChildAdded(QQuickItem *, QQuickItem *) +{ + updateIndex(); +} + +void QQuickSwipeViewAttachedPrivate::itemChildRemoved(QQuickItem *, QQuickItem *) +{ + updateIndex(); +} + +void QQuickSwipeViewAttachedPrivate::itemParentChanged(QQuickItem *, QQuickItem *parent) +{ + updateView(parent); +} + +void QQuickSwipeViewAttachedPrivate::itemDestroyed(QQuickItem *item) +{ + QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Parent | QQuickItemPrivate::Destroyed); } QQuickSwipeViewAttached::QQuickSwipeViewAttached(QObject *parent) : QObject(*(new QQuickSwipeViewAttachedPrivate), parent) { - if (!qobject_cast(parent)) + Q_D(QQuickSwipeViewAttached); + d->item = qobject_cast(parent); + if (d->item) { + if (d->item->parentItem()) + d->updateView(d->item->parentItem()); + + QQuickItemPrivate *p = QQuickItemPrivate::get(d->item); + p->addItemChangeListener(d, QQuickItemPrivate::Parent | QQuickItemPrivate::Destroyed); + } else if (parent) { qmlWarning(parent) << "SwipeView: attached properties must be accessed from within a child item"; + } +} + +QQuickSwipeViewAttached::~QQuickSwipeViewAttached() +{ + Q_D(QQuickSwipeViewAttached); + QQuickItem *item = qobject_cast(parent()); + if (item) + QQuickItemPrivate::get(item)->removeItemChangeListener(d, QQuickItemPrivate::Parent | QQuickItemPrivate::Destroyed); } int QQuickSwipeViewAttached::index() const diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswipeview_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswipeview_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswipeview_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswipeview_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -62,9 +62,6 @@ Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged FINAL REVISION 1) // 2.2 (Qt 5.9) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL REVISION 2) - // 2.3 (Qt 5.10) - Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) - Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) public: explicit QQuickSwipeView(QQuickItem *parent = nullptr); @@ -79,10 +76,6 @@ Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); - // 2.3 (Qt 5.10) - bool isHorizontal() const; - bool isVertical() const; - Q_SIGNALS: // 2.1 (Qt 5.8) Q_REVISION(1) void interactiveChanged(); @@ -92,8 +85,6 @@ protected: void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; void itemAdded(int index, QQuickItem *item) override; - void itemMoved(int index, QQuickItem *item) override; - void itemRemoved(int index, QQuickItem *item) override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; @@ -118,6 +109,7 @@ public: explicit QQuickSwipeViewAttached(QObject *parent = nullptr); + ~QQuickSwipeViewAttached(); int index() const; bool isCurrentItem() const; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswitch.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswitch.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswitch.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswitch.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -82,13 +82,15 @@ Q_DECLARE_PUBLIC(QQuickSwitch) public: + QQuickSwitchPrivate() : position(0) { } + qreal positionAt(const QPointF &point) const; bool canDrag(const QPointF &movePoint) const; void handleMove(const QPointF &point) override; void handleRelease(const QPointF &point) override; - qreal position = 0; + qreal position; }; qreal QQuickSwitchPrivate::positionAt(const QPointF &point) const @@ -229,14 +231,4 @@ QQuickAbstractButton::buttonChange(change); } -QFont QQuickSwitch::defaultFont() const -{ - return QQuickTheme::font(QQuickTheme::Switch); -} - -QPalette QQuickSwitch::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::Switch); -} - QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswitchdelegate.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswitchdelegate.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswitchdelegate.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswitchdelegate.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -79,13 +79,15 @@ Q_DECLARE_PUBLIC(QQuickSwitchDelegate) public: + QQuickSwitchDelegatePrivate() : position(0) { } + qreal positionAt(const QPointF &point) const; bool canDrag(const QPointF &movePoint) const; void handleMove(const QPointF &point) override; void handleRelease(const QPointF &point) override; - qreal position = 0; + qreal position; }; qreal QQuickSwitchDelegatePrivate::positionAt(const QPointF &point) const @@ -200,12 +202,7 @@ QFont QQuickSwitchDelegate::defaultFont() const { - return QQuickTheme::font(QQuickTheme::ListView); -} - -QPalette QQuickSwitchDelegate::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ListView); + return QQuickControlPrivate::themeFont(QPlatformTheme::ListViewFont); } void QQuickSwitchDelegate::mirrorChange() diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswitchdelegate_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswitchdelegate_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswitchdelegate_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswitchdelegate_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -79,8 +79,6 @@ #endif QFont defaultFont() const override; - QPalette defaultPalette() const override; - void mirrorChange() override; void nextCheckState() override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswitch_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswitch_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickswitch_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickswitch_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -83,9 +83,6 @@ void nextCheckState() override; void buttonChange(ButtonChange change) override; - QFont defaultFont() const override; - QPalette defaultPalette() const override; - private: Q_DISABLE_COPY(QQuickSwitch) Q_DECLARE_PRIVATE(QQuickSwitch) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktabbar.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktabbar.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktabbar.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktabbar.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,6 @@ \since 5.7 \ingroup qtquickcontrols2-navigation \ingroup qtquickcontrols2-containers - \ingroup qtquickcontrols2-focusscopes \brief Allows the user to switch between different views or subtasks. TabBar provides a tab-based navigation model. @@ -91,8 +90,7 @@ \snippet qtquickcontrols2-tabbar-flickable.qml 1 - \sa TabButton, {Customizing TabBar}, {Navigation Controls}, {Container Controls}, - {Focus Management in Qt Quick Controls 2} + \sa TabButton, {Customizing TabBar}, {Navigation Controls}, {Container Controls} */ class QQuickTabBarPrivate : public QQuickContainerPrivate @@ -100,36 +98,34 @@ Q_DECLARE_PUBLIC(QQuickTabBar) public: + QQuickTabBarPrivate(); + void updateCurrentItem(); void updateCurrentIndex(); void updateLayout(); - qreal getContentWidth() const override; - qreal getContentHeight() const override; - void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) override; void itemImplicitWidthChanged(QQuickItem *item) override; void itemImplicitHeightChanged(QQuickItem *item) override; - bool updatingLayout = false; - QQuickTabBar::Position position = QQuickTabBar::Header; + bool updatingLayout; + bool hasContentWidth; + bool hasContentHeight; + qreal contentWidth; + qreal contentHeight; + QQuickTabBar::Position position; }; -class QQuickTabBarAttachedPrivate : public QObjectPrivate +QQuickTabBarPrivate::QQuickTabBarPrivate() + : updatingLayout(false), + hasContentWidth(false), + hasContentHeight(false), + contentWidth(0), + contentHeight(0), + position(QQuickTabBar::Header) { - Q_DECLARE_PUBLIC(QQuickTabBarAttached) - -public: - static QQuickTabBarAttachedPrivate *get(QQuickTabBarAttached *attached) - { - return attached->d_func(); - } - - void update(QQuickTabBar *tabBar, int index); - - int index = -1; - QQuickTabBar *tabBar = nullptr; -}; + changeTypes |= Geometry | ImplicitWidth | ImplicitHeight; +} void QQuickTabBarPrivate::updateCurrentItem() { @@ -153,104 +149,82 @@ if (count <= 0 || !contentItem) return; + qreal maxHeight = 0; + qreal totalWidth = 0; qreal reservedWidth = 0; - int resizableCount = 0; - QVector allItems; - allItems.reserve(count); + QVector resizableItems; + resizableItems.reserve(count); for (int i = 0; i < count; ++i) { QQuickItem *item = q->itemAt(i); if (item) { QQuickItemPrivate *p = QQuickItemPrivate::get(item); - if (!p->widthValid) - ++resizableCount; - else + if (!p->widthValid) { + resizableItems += item; + totalWidth += item->implicitWidth(); + } else { reservedWidth += item->width(); - allItems += item; + totalWidth += item->width(); + } + maxHeight = qMax(maxHeight, item->implicitHeight()); } } const qreal totalSpacing = qMax(0, count - 1) * spacing; - const qreal itemWidth = (contentItem->width() - reservedWidth - totalSpacing) / qMax(1, resizableCount); + totalWidth += totalSpacing; + + if (!resizableItems.isEmpty()) { + const qreal itemWidth = (contentItem->width() - reservedWidth - totalSpacing) / resizableItems.count(); - updatingLayout = true; - for (QQuickItem *item : qAsConst(allItems)) { - QQuickItemPrivate *p = QQuickItemPrivate::get(item); - if (!p->widthValid) { + updatingLayout = true; + for (QQuickItem *item : qAsConst(resizableItems)) { item->setWidth(itemWidth); - p->widthValid = false; - } - if (!p->heightValid) { - item->setHeight(contentHeight); - p->heightValid = false; - } else { - item->setY((contentHeight - item->height()) / 2); + QQuickItemPrivate::get(item)->widthValid = false; } + updatingLayout = false; } - updatingLayout = false; -} -qreal QQuickTabBarPrivate::getContentWidth() const -{ - Q_Q(const QQuickTabBar); - const int count = contentModel->count(); - qreal totalWidth = qMax(0, count - 1) * spacing; - for (int i = 0; i < count; ++i) { - QQuickItem *item = q->itemAt(i); - if (item) { - QQuickItemPrivate *p = QQuickItemPrivate::get(item); - if (!p->widthValid) - totalWidth += item->implicitWidth(); - else - totalWidth += item->width(); - } + bool contentWidthChange = false; + if (!hasContentWidth && !qFuzzyCompare(contentWidth, totalWidth)) { + contentWidth = totalWidth; + contentWidthChange = true; } - return totalWidth; -} -qreal QQuickTabBarPrivate::getContentHeight() const -{ - Q_Q(const QQuickTabBar); - const int count = contentModel->count(); - qreal maxHeight = 0; - for (int i = 0; i < count; ++i) { - QQuickItem *item = q->itemAt(i); - if (item) - maxHeight = qMax(maxHeight, item->implicitHeight()); + bool contentHeightChange = false; + if (!hasContentHeight && !qFuzzyCompare(contentHeight, maxHeight)) { + contentHeight = maxHeight; + contentHeightChange = true; } - return maxHeight; + + if (contentWidthChange) + emit q->contentWidthChanged(); + if (contentHeightChange) + emit q->contentHeightChanged(); } -void QQuickTabBarPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) +void QQuickTabBarPrivate::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &) { - QQuickContainerPrivate::itemGeometryChanged(item, change, diff); - if (!updatingLayout) { - if (change.sizeChange()) - updateImplicitContentSize(); + if (!updatingLayout) updateLayout(); - } } -void QQuickTabBarPrivate::itemImplicitWidthChanged(QQuickItem *item) +void QQuickTabBarPrivate::itemImplicitWidthChanged(QQuickItem *) { - QQuickContainerPrivate::itemImplicitWidthChanged(item); - if (item != contentItem) - updateImplicitContentWidth(); + if (!updatingLayout && !hasContentWidth) + updateLayout(); } -void QQuickTabBarPrivate::itemImplicitHeightChanged(QQuickItem *item) +void QQuickTabBarPrivate::itemImplicitHeightChanged(QQuickItem *) { - QQuickContainerPrivate::itemImplicitHeightChanged(item); - if (item != contentItem) - updateImplicitContentHeight(); + if (!updatingLayout && !hasContentHeight) + updateLayout(); } QQuickTabBar::QQuickTabBar(QQuickItem *parent) : QQuickContainer(*(new QQuickTabBarPrivate), parent) { Q_D(QQuickTabBar); - d->changeTypes |= QQuickItemPrivate::Geometry | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight; setFlag(ItemIsFocusScope); QObjectPrivate::connect(this, &QQuickTabBar::currentIndexChanged, d, &QQuickTabBarPrivate::updateCurrentItem); } @@ -294,11 +268,39 @@ This property holds the content width. It is used for calculating the total implicit width of the tab bar. - \note This property is available in TabBar since QtQuick.Controls 2.2 (Qt 5.9), - but it was promoted to the Container base type in QtQuick.Controls 2.5 (Qt 5.12). + Unless explicitly overridden, the content width is automatically calculated + based on the total implicit width of the tabs and the \l {Control::}{spacing} + of the tab bar. - \sa Container::contentWidth + \sa contentHeight */ +qreal QQuickTabBar::contentWidth() const +{ + Q_D(const QQuickTabBar); + return d->contentWidth; +} + +void QQuickTabBar::setContentWidth(qreal width) +{ + Q_D(QQuickTabBar); + d->hasContentWidth = true; + if (qFuzzyCompare(d->contentWidth, width)) + return; + + d->contentWidth = width; + emit contentWidthChanged(); +} + +void QQuickTabBar::resetContentWidth() +{ + Q_D(QQuickTabBar); + if (!d->hasContentWidth) + return; + + d->hasContentWidth = false; + if (isComponentComplete()) + d->updateLayout(); +} /*! \since QtQuick.Controls 2.2 (Qt 5.9) @@ -307,15 +309,37 @@ This property holds the content height. It is used for calculating the total implicit height of the tab bar. - \note This property is available in TabBar since QtQuick.Controls 2.2 (Qt 5.9), - but it was promoted to the Container base type in QtQuick.Controls 2.5 (Qt 5.12). + Unless explicitly overridden, the content height is automatically calculated + based on the maximum implicit height of the tabs. - \sa Container::contentHeight + \sa contentWidth */ +qreal QQuickTabBar::contentHeight() const +{ + Q_D(const QQuickTabBar); + return d->contentHeight; +} -QQuickTabBarAttached *QQuickTabBar::qmlAttachedProperties(QObject *object) +void QQuickTabBar::setContentHeight(qreal height) { - return new QQuickTabBarAttached(object); + Q_D(QQuickTabBar); + d->hasContentHeight = true; + if (qFuzzyCompare(d->contentHeight, height)) + return; + + d->contentHeight = height; + emit contentHeightChanged(); +} + +void QQuickTabBar::resetContentHeight() +{ + Q_D(QQuickTabBar); + if (!d->hasContentHeight) + return; + + d->hasContentHeight = false; + if (isComponentComplete()) + d->updateLayout(); } void QQuickTabBar::updatePolish() @@ -352,45 +376,20 @@ QQuickItemPrivate::get(item)->setCulled(true); // QTBUG-55129 if (QQuickTabButton *button = qobject_cast(item)) QObjectPrivate::connect(button, &QQuickTabButton::checkedChanged, d, &QQuickTabBarPrivate::updateCurrentIndex); - QQuickTabBarAttached *attached = qobject_cast(qmlAttachedPropertiesObject(item)); - if (attached) - QQuickTabBarAttachedPrivate::get(attached)->update(this, index); - d->updateImplicitContentSize(); if (isComponentComplete()) polish(); } -void QQuickTabBar::itemMoved(int index, QQuickItem *item) -{ - QQuickTabBarAttached *attached = qobject_cast(qmlAttachedPropertiesObject(item)); - if (attached) - QQuickTabBarAttachedPrivate::get(attached)->update(this, index); -} - void QQuickTabBar::itemRemoved(int index, QQuickItem *item) { Q_D(QQuickTabBar); Q_UNUSED(index); if (QQuickTabButton *button = qobject_cast(item)) QObjectPrivate::disconnect(button, &QQuickTabButton::checkedChanged, d, &QQuickTabBarPrivate::updateCurrentIndex); - QQuickTabBarAttached *attached = qobject_cast(qmlAttachedPropertiesObject(item)); - if (attached) - QQuickTabBarAttachedPrivate::get(attached)->update(nullptr, -1); - d->updateImplicitContentSize(); if (isComponentComplete()) polish(); } -QFont QQuickTabBar::defaultFont() const -{ - return QQuickTheme::font(QQuickTheme::TabBar); -} - -QPalette QQuickTabBar::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::TabBar); -} - #if QT_CONFIG(accessibility) QAccessible::Role QQuickTabBar::accessibleRole() const { @@ -398,87 +397,4 @@ } #endif -/*! - \qmlattachedproperty int QtQuick.Controls::TabBar::index - \since QtQuick.Controls 2.3 (Qt 5.10) - \readonly - - This attached property holds the index of each tab button in the TabBar. - - It is attached to each tab button of the TabBar. -*/ - -/*! - \qmlattachedproperty TabBar QtQuick.Controls::TabBar::tabBar - \since QtQuick.Controls 2.3 (Qt 5.10) - \readonly - - This attached property holds the tab bar that manages this tab button. - - It is attached to each tab button of the TabBar. -*/ - -/*! - \qmlattachedproperty enumeration QtQuick.Controls::TabBar::position - \since QtQuick.Controls 2.3 (Qt 5.10) - \readonly - - This attached property holds the position of the tab bar. - - It is attached to each tab button of the TabBar. - - Possible values: - \value TabBar.Header The tab bar is at the top, as a window or page header. - \value TabBar.Footer The tab bar is at the bottom, as a window or page footer. -*/ - -void QQuickTabBarAttachedPrivate::update(QQuickTabBar *newTabBar, int newIndex) -{ - Q_Q(QQuickTabBarAttached); - const int oldIndex = index; - const QQuickTabBar *oldTabBar = tabBar; - const QQuickTabBar::Position oldPos = q->position(); - - index = newIndex; - tabBar = newTabBar; - - if (oldTabBar != newTabBar) { - if (oldTabBar) - QObject::disconnect(oldTabBar, &QQuickTabBar::positionChanged, q, &QQuickTabBarAttached::positionChanged); - if (newTabBar) - QObject::connect(newTabBar, &QQuickTabBar::positionChanged, q, &QQuickTabBarAttached::positionChanged); - emit q->tabBarChanged(); - } - - if (oldIndex != newIndex) - emit q->indexChanged(); - if (oldPos != q->position()) - emit q->positionChanged(); -} - -QQuickTabBarAttached::QQuickTabBarAttached(QObject *parent) - : QObject(*(new QQuickTabBarAttachedPrivate), parent) -{ -} - -int QQuickTabBarAttached::index() const -{ - Q_D(const QQuickTabBarAttached); - return d->index; -} - -QQuickTabBar *QQuickTabBarAttached::tabBar() const -{ - Q_D(const QQuickTabBarAttached); - return d->tabBar; -} - -QQuickTabBar::Position QQuickTabBarAttached::position() const -{ - Q_D(const QQuickTabBarAttached); - if (!d->tabBar) - return QQuickTabBar::Header; - return d->tabBar->position(); -} - QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktabbar_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktabbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktabbar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktabbar_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -53,16 +53,14 @@ QT_BEGIN_NAMESPACE class QQuickTabBarPrivate; -class QQuickTabBarAttached; -class QQuickTabBarAttachedPrivate; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTabBar : public QQuickContainer { Q_OBJECT Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL) // 2.2 (Qt 5.9) - Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth RESET resetContentWidth NOTIFY contentWidthChanged FINAL REVISION 2) // re-declare QQuickContainer::contentWidth (REV 5) - Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight RESET resetContentHeight NOTIFY contentHeightChanged FINAL REVISION 2) // re-declare QQuickContainer::contentHeight (REV 5) + Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth RESET resetContentWidth NOTIFY contentWidthChanged FINAL REVISION 2) + Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight RESET resetContentHeight NOTIFY contentHeightChanged FINAL REVISION 2) public: explicit QQuickTabBar(QQuickItem *parent = nullptr); @@ -76,10 +74,20 @@ Position position() const; void setPosition(Position position); - static QQuickTabBarAttached *qmlAttachedProperties(QObject *object); + // 2.2 (Qt 5.9) + qreal contentWidth() const; + void setContentWidth(qreal width); + void resetContentWidth(); + + qreal contentHeight() const; + void setContentHeight(qreal height); + void resetContentHeight(); Q_SIGNALS: void positionChanged(); + // 2.2 (Qt 5.9) + Q_REVISION(2) void contentWidthChanged(); + Q_REVISION(2) void contentHeightChanged(); protected: void updatePolish() override; @@ -87,12 +95,8 @@ void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; bool isContent(QQuickItem *item) const override; void itemAdded(int index, QQuickItem *item) override; - void itemMoved(int index, QQuickItem *item) override; void itemRemoved(int index, QQuickItem *item) override; - QFont defaultFont() const override; - QPalette defaultPalette() const override; - #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif @@ -102,33 +106,8 @@ Q_DECLARE_PRIVATE(QQuickTabBar) }; -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTabBarAttached : public QObject -{ - Q_OBJECT - Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) - Q_PROPERTY(QQuickTabBar *tabBar READ tabBar NOTIFY tabBarChanged FINAL) - Q_PROPERTY(QQuickTabBar::Position position READ position NOTIFY positionChanged FINAL) - -public: - explicit QQuickTabBarAttached(QObject *parent = nullptr); - - int index() const; - QQuickTabBar *tabBar() const; - QQuickTabBar::Position position() const; - -Q_SIGNALS: - void indexChanged(); - void tabBarChanged(); - void positionChanged(); - -private: - Q_DISABLE_COPY(QQuickTabBarAttached) - Q_DECLARE_PRIVATE(QQuickTabBarAttached) -}; - QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickTabBar) -QML_DECLARE_TYPEINFO(QQuickTabBar, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKTABBAR_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktabbutton.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktabbutton.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktabbutton.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktabbutton.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -72,12 +72,7 @@ QFont QQuickTabButton::defaultFont() const { - return QQuickTheme::font(QQuickTheme::TabBar); -} - -QPalette QQuickTabButton::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::TabBar); + return QQuickControlPrivate::themeFont(QPlatformTheme::TabButtonFont); } #if QT_CONFIG(accessibility) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktabbutton_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktabbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktabbutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktabbutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -61,7 +61,6 @@ protected: QFont defaultFont() const override; - QPalette defaultPalette() const override; #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextarea.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextarea.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextarea.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextarea.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -96,24 +96,6 @@ \li Clips the content \endlist - \section2 Tab Focus - - By default, pressing the tab key while TextArea has - \l {Item::activeFocus}{active focus} results in a tab character being input - into the control itself. To make tab pass active focus onto another item, - use the attached \l KeyNavigation properties: - - \code - TextField { - id: textField - } - - TextArea { - KeyNavigation.priority: KeyNavigation.BeforeItem - KeyNavigation.tab: textField - } - \endcode - \sa TextField, {Customizing TextArea}, {Input Controls} */ @@ -150,6 +132,15 @@ */ QQuickTextAreaPrivate::QQuickTextAreaPrivate() + : QQuickTextEditPrivate(), +#if QT_CONFIG(quicktemplates2_hover) + hovered(false), + explicitHoverEnabled(false), +#endif + background(nullptr), + focusReason(Qt::OtherFocusReason), + accessibleAttached(nullptr), + flickable(nullptr) { #if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); @@ -163,74 +154,26 @@ #endif } -void QQuickTextAreaPrivate::setTopInset(qreal value, bool reset) -{ - Q_Q(QQuickTextArea); - const QMarginsF oldInset = getInset(); - extra.value().topInset = value; - extra.value().hasTopInset = !reset; - if (!qFuzzyCompare(oldInset.top(), value)) { - emit q->topInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickTextAreaPrivate::setLeftInset(qreal value, bool reset) -{ - Q_Q(QQuickTextArea); - const QMarginsF oldInset = getInset(); - extra.value().leftInset = value; - extra.value().hasLeftInset = !reset; - if (!qFuzzyCompare(oldInset.left(), value)) { - emit q->leftInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickTextAreaPrivate::setRightInset(qreal value, bool reset) -{ - Q_Q(QQuickTextArea); - const QMarginsF oldInset = getInset(); - extra.value().rightInset = value; - extra.value().hasRightInset = !reset; - if (!qFuzzyCompare(oldInset.right(), value)) { - emit q->rightInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickTextAreaPrivate::setBottomInset(qreal value, bool reset) -{ - Q_Q(QQuickTextArea); - const QMarginsF oldInset = getInset(); - extra.value().bottomInset = value; - extra.value().hasBottomInset = !reset; - if (!qFuzzyCompare(oldInset.bottom(), value)) { - emit q->bottomInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - void QQuickTextAreaPrivate::resizeBackground() { - if (!background) - return; - - resizingBackground = true; - - QQuickItemPrivate *p = QQuickItemPrivate::get(background); - if (((!p->widthValid || !extra.isAllocated() || !extra->hasBackgroundWidth) && qFuzzyIsNull(background->x())) - || (extra.isAllocated() && (extra->hasLeftInset || extra->hasRightInset))) { - background->setX(getLeftInset()); - background->setWidth(width - getLeftInset() - getRightInset()); - } - if (((!p->heightValid || !extra.isAllocated() || !extra->hasBackgroundHeight) && qFuzzyIsNull(background->y())) - || (extra.isAllocated() && (extra->hasTopInset || extra->hasBottomInset))) { - background->setY(getTopInset()); - background->setHeight(height - getTopInset() - getBottomInset()); + Q_Q(QQuickTextArea); + if (background) { + QQuickItemPrivate *p = QQuickItemPrivate::get(background); + if (!p->widthValid && qFuzzyIsNull(background->x())) { + if (flickable) + background->setWidth(flickable->width()); + else + background->setWidth(q->width()); + p->widthValid = false; + } + if (!p->heightValid && qFuzzyIsNull(background->y())) { + if (flickable) + background->setHeight(flickable->height()); + else + background->setHeight(q->height()); + p->heightValid = false; + } } - - resizingBackground = false; } /*! @@ -247,71 +190,21 @@ inheritFont(QQuickControlPrivate::parentFont(q)); } -void QQuickTextAreaPrivate::inheritFont(const QFont &font) -{ - QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font; - parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve()); - - const QFont defaultFont = QQuickTheme::font(QQuickTheme::TextArea); - const QFont resolvedFont = parentFont.resolve(defaultFont); - - setFont_helper(resolvedFont); -} - -/*! - \internal - - Assign \a font to this control, and propagate it to all children. -*/ -void QQuickTextAreaPrivate::updateFont(const QFont &font) +void QQuickTextAreaPrivate::inheritFont(const QFont &f) { Q_Q(QQuickTextArea); - QFont oldFont = sourceFont; - q->QQuickTextEdit::setFont(font); + QFont parentFont = font.resolve(f); + parentFont.resolve(font.resolve() | f.resolve()); - QQuickControlPrivate::updateFontRecur(q, font); + const QFont defaultFont = QQuickControlPrivate::themeFont(QPlatformTheme::EditorFont); + const QFont resolvedFont = parentFont.resolve(defaultFont); - if (oldFont != font) + const bool changed = resolvedFont != sourceFont; + q->QQuickTextEdit::setFont(resolvedFont); + if (changed) emit q->fontChanged(); } -/*! - \internal - - Determine which palette is implicitly imposed on this control by its ancestors - and QGuiApplication::palette, resolve this against its own palette (attributes from - the implicit palette are copied over). Then propagate this palette to this - control's children. -*/ -void QQuickTextAreaPrivate::resolvePalette() -{ - Q_Q(QQuickTextArea); - inheritPalette(QQuickControlPrivate::parentPalette(q)); -} - -void QQuickTextAreaPrivate::inheritPalette(const QPalette &palette) -{ - QPalette parentPalette = extra.isAllocated() ? extra->requestedPalette.resolve(palette) : palette; - parentPalette.resolve(extra.isAllocated() ? extra->requestedPalette.resolve() | palette.resolve() : palette.resolve()); - - const QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::TextArea); - const QPalette resolvedPalette = parentPalette.resolve(defaultPalette); - - setPalette_helper(resolvedPalette); -} - -void QQuickTextAreaPrivate::updatePalette(const QPalette &palette) -{ - Q_Q(QQuickTextArea); - QPalette oldPalette = resolvedPalette; - resolvedPalette = palette; - - QQuickControlPrivate::updatePaletteRecur(q, palette); - - if (oldPalette != palette) - emit q->paletteChanged(); -} - #if QT_CONFIG(quicktemplates2_hover) void QQuickTextAreaPrivate::updateHoverEnabled(bool enabled, bool xplicit) { @@ -468,7 +361,7 @@ { Q_UNUSED(isReadOnly); #if QT_CONFIG(accessibility) - if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(q_func())) + if (accessibleAttached) accessibleAttached->set_readOnly(isReadOnly); #endif #if QT_CONFIG(cursor) @@ -479,15 +372,18 @@ #if QT_CONFIG(accessibility) void QQuickTextAreaPrivate::accessibilityActiveChanged(bool active) { - if (!active) + if (accessibleAttached || !active) return; Q_Q(QQuickTextArea); - QQuickAccessibleAttached *accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(q, true)); - Q_ASSERT(accessibleAttached); - accessibleAttached->setRole(accessibleRole()); - accessibleAttached->set_readOnly(q->isReadOnly()); - accessibleAttached->setDescription(placeholder); + accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(q, true)); + if (accessibleAttached) { + accessibleAttached->setRole(accessibleRole()); + accessibleAttached->set_readOnly(q->isReadOnly()); + accessibleAttached->setDescription(placeholder); + } else { + qWarning() << "QQuickTextArea: " << q << " QQuickAccessibleAttached object creation failed!"; + } } QAccessible::Role QQuickTextAreaPrivate::accessibleRole() const @@ -512,35 +408,8 @@ if (!background || complete) quickBeginDeferred(q, backgroundName(), background); - if (complete) { + if (complete) quickCompleteDeferred(q, backgroundName(), background); - if (background) - QQuickControlPrivate::addImplicitSizeListener(background, this, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); - } -} - -void QQuickTextAreaPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - Q_Q(QQuickTextArea); - if (item == background) - emit q->implicitBackgroundWidthChanged(); -} - -void QQuickTextAreaPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - Q_Q(QQuickTextArea); - if (item == background) - emit q->implicitBackgroundHeightChanged(); -} - -void QQuickTextAreaPrivate::itemDestroyed(QQuickItem *item) -{ - Q_Q(QQuickTextArea); - if (item == background) { - background = nullptr; - emit q->implicitBackgroundWidthChanged(); - emit q->implicitBackgroundHeightChanged(); - } } QQuickTextArea::QQuickTextArea(QQuickItem *parent) @@ -563,7 +432,6 @@ Q_D(QQuickTextArea); if (d->flickable) d->detachFlickable(); - QQuickControlPrivate::removeImplicitSizeListener(d->background, d, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); } QQuickTextAreaAttached *QQuickTextArea::qmlAttachedProperties(QObject *object) @@ -579,10 +447,10 @@ void QQuickTextArea::setFont(const QFont &font) { Q_D(QQuickTextArea); - if (d->extra.value().requestedFont.resolve() == font.resolve() && d->extra.value().requestedFont == font) + if (d->font.resolve() == font.resolve() && d->font == font) return; - d->extra.value().requestedFont = font; + d->font = font; d->resolveFont(); } @@ -612,40 +480,15 @@ if (!d->background.isExecuting()) d->cancelBackground(); - const qreal oldImplicitBackgroundWidth = implicitBackgroundWidth(); - const qreal oldImplicitBackgroundHeight = implicitBackgroundHeight(); - - if (d->extra.isAllocated()) { - d->extra.value().hasBackgroundWidth = false; - d->extra.value().hasBackgroundHeight = false; - } - - QQuickControlPrivate::removeImplicitSizeListener(d->background, d, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); delete d->background; d->background = background; - if (background) { - if (d->flickable) - background->setParentItem(d->flickable); - else - background->setParentItem(this); + background->setParentItem(this); if (qFuzzyIsNull(background->z())) background->setZ(-1); - QQuickItemPrivate *p = QQuickItemPrivate::get(background); - if (p->widthValid || p->heightValid) { - d->extra.value().hasBackgroundWidth = p->widthValid; - d->extra.value().hasBackgroundHeight = p->heightValid; - } - if (isComponentComplete()) { + if (isComponentComplete()) d->resizeBackground(); - QQuickControlPrivate::addImplicitSizeListener(background, d, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); - } } - - if (!qFuzzyCompare(oldImplicitBackgroundWidth, implicitBackgroundWidth())) - emit implicitBackgroundWidthChanged(); - if (!qFuzzyCompare(oldImplicitBackgroundHeight, implicitBackgroundHeight())) - emit implicitBackgroundHeightChanged(); if (!d->background.isExecuting()) emit backgroundChanged(); } @@ -670,37 +513,13 @@ d->placeholder = text; #if QT_CONFIG(accessibility) - if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(this)) - accessibleAttached->setDescription(text); + if (d->accessibleAttached) + d->accessibleAttached->setDescription(text); #endif emit placeholderTextChanged(); } /*! - \qmlproperty color QtQuick.Controls::TextArea::placeholderTextColor - \since QtQuick.Controls 2.5 (Qt 5.12) - - This property holds the color of placeholderText. - - \sa placeholderText -*/ -QColor QQuickTextArea::placeholderTextColor() const -{ - Q_D(const QQuickTextArea); - return d->placeholderColor; -} - -void QQuickTextArea::setPlaceholderTextColor(const QColor &color) -{ - Q_D(QQuickTextArea); - if (d->placeholderColor == color) - return; - - d->placeholderColor = color; - emit placeholderTextColorChanged(); -} - -/*! \qmlproperty enumeration QtQuick.Controls::TextArea::focusReason \include qquickcontrol-focusreason.qdocinc @@ -805,186 +624,11 @@ #endif } -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty palette QtQuick.Controls::TextArea::palette - - This property holds the palette currently set for the text area. - - \sa Control::palette -*/ -QPalette QQuickTextArea::palette() const -{ - Q_D(const QQuickTextArea); - QPalette palette = d->resolvedPalette; - if (!isEnabled()) - palette.setCurrentColorGroup(QPalette::Disabled); - return palette; -} - -void QQuickTextArea::setPalette(const QPalette &palette) -{ - Q_D(QQuickTextArea); - if (d->extra.value().requestedPalette.resolve() == palette.resolve() && d->extra.value().requestedPalette == palette) - return; - - d->extra.value().requestedPalette = palette; - d->resolvePalette(); -} - -void QQuickTextArea::resetPalette() -{ - setPalette(QPalette()); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextArea::implicitBackgroundWidth - \readonly - - This property holds the implicit background width. - - The value is equal to \c {background ? background.implicitWidth : 0}. - - \sa implicitBackgroundHeight -*/ -qreal QQuickTextArea::implicitBackgroundWidth() const -{ - Q_D(const QQuickTextArea); - if (!d->background) - return 0; - return d->background->implicitWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextArea::implicitBackgroundHeight - \readonly - - This property holds the implicit background height. - - The value is equal to \c {background ? background.implicitHeight : 0}. - - \sa implicitBackgroundWidth -*/ -qreal QQuickTextArea::implicitBackgroundHeight() const -{ - Q_D(const QQuickTextArea); - if (!d->background) - return 0; - return d->background->implicitHeight(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextArea::topInset - - This property holds the top inset for the background. - - \sa {Control Layout}, bottomInset -*/ -qreal QQuickTextArea::topInset() const -{ - Q_D(const QQuickTextArea); - return d->getTopInset(); -} - -void QQuickTextArea::setTopInset(qreal inset) -{ - Q_D(QQuickTextArea); - d->setTopInset(inset); -} - -void QQuickTextArea::resetTopInset() -{ - Q_D(QQuickTextArea); - d->setTopInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextArea::leftInset - - This property holds the left inset for the background. - - \sa {Control Layout}, rightInset -*/ -qreal QQuickTextArea::leftInset() const -{ - Q_D(const QQuickTextArea); - return d->getLeftInset(); -} - -void QQuickTextArea::setLeftInset(qreal inset) -{ - Q_D(QQuickTextArea); - d->setLeftInset(inset); -} - -void QQuickTextArea::resetLeftInset() -{ - Q_D(QQuickTextArea); - d->setLeftInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextArea::rightInset - - This property holds the right inset for the background. - - \sa {Control Layout}, leftInset -*/ -qreal QQuickTextArea::rightInset() const -{ - Q_D(const QQuickTextArea); - return d->getRightInset(); -} - -void QQuickTextArea::setRightInset(qreal inset) -{ - Q_D(QQuickTextArea); - d->setRightInset(inset); -} - -void QQuickTextArea::resetRightInset() -{ - Q_D(QQuickTextArea); - d->setRightInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextArea::bottomInset - - This property holds the bottom inset for the background. - - \sa {Control Layout}, topInset -*/ -qreal QQuickTextArea::bottomInset() const -{ - Q_D(const QQuickTextArea); - return d->getBottomInset(); -} - -void QQuickTextArea::setBottomInset(qreal inset) -{ - Q_D(QQuickTextArea); - d->setBottomInset(inset); -} - -void QQuickTextArea::resetBottomInset() -{ - Q_D(QQuickTextArea); - d->setBottomInset(0, true); -} - void QQuickTextArea::classBegin() { Q_D(QQuickTextArea); QQuickTextEdit::classBegin(); d->resolveFont(); - d->resolvePalette(); } void QQuickTextArea::componentComplete() @@ -992,13 +636,12 @@ Q_D(QQuickTextArea); d->executeBackground(true); QQuickTextEdit::componentComplete(); - d->resizeBackground(); #if QT_CONFIG(quicktemplates2_hover) if (!d->explicitHoverEnabled) setAcceptHoverEvents(QQuickControlPrivate::calcHoverEnabled(d->parentItem)); #endif #if QT_CONFIG(accessibility) - if (QAccessible::isActive()) + if (!d->accessibleAttached && QAccessible::isActive()) d->accessibilityActiveChanged(true); #endif } @@ -1007,31 +650,20 @@ { Q_D(QQuickTextArea); QQuickTextEdit::itemChange(change, value); - switch (change) { - case ItemEnabledHasChanged: - emit paletteChanged(); - break; - case ItemSceneChange: - case ItemParentHasChanged: - if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) { - d->resolveFont(); - d->resolvePalette(); + if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) { + d->resolveFont(); #if QT_CONFIG(quicktemplates2_hover) - if (!d->explicitHoverEnabled) - d->updateHoverEnabled(QQuickControlPrivate::calcHoverEnabled(d->parentItem), false); // explicit=false + if (!d->explicitHoverEnabled) + d->updateHoverEnabled(QQuickControlPrivate::calcHoverEnabled(d->parentItem), false); // explicit=false #endif - if (change == ItemParentHasChanged) { - QQuickFlickable *flickable = qobject_cast(value.item->parentItem()); - if (flickable) { - QQuickScrollView *scrollView = qobject_cast(flickable->parentItem()); - if (scrollView) - d->attachFlickable(flickable); - } + if (change == ItemParentHasChanged) { + QQuickFlickable *flickable = qobject_cast(value.item->parentItem()); + if (flickable) { + QQuickScrollView *scrollView = qobject_cast(flickable->parentItem()); + if (scrollView) + d->attachFlickable(flickable); } } - break; - default: - break; } } @@ -1042,14 +674,6 @@ d->resizeBackground(); } -void QQuickTextArea::insetChange(const QMarginsF &newInset, const QMarginsF &oldInset) -{ - Q_D(QQuickTextArea); - Q_UNUSED(newInset); - Q_UNUSED(oldInset); - d->resizeBackground(); -} - QSGNode *QQuickTextArea::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) { Q_D(QQuickTextArea); @@ -1174,7 +798,9 @@ class QQuickTextAreaAttachedPrivate : public QObjectPrivate { public: - QQuickTextArea *control = nullptr; + QQuickTextAreaAttachedPrivate() : control(nullptr) { } + + QQuickTextArea *control; }; QQuickTextAreaAttached::QQuickTextAreaAttached(QObject *parent) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextarea_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextarea_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextarea_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextarea_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,6 @@ // We mean it. // -#include #include #include @@ -71,16 +70,6 @@ // 2.1 (Qt 5.8) Q_PROPERTY(bool hovered READ isHovered NOTIFY hoveredChanged FINAL REVISION 1) Q_PROPERTY(bool hoverEnabled READ isHoverEnabled WRITE setHoverEnabled RESET resetHoverEnabled NOTIFY hoverEnabledChanged FINAL REVISION 1) - // 2.3 (Qt 5.10) - Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) - // 2.5 (Qt 5.12) - Q_PROPERTY(QColor placeholderTextColor READ placeholderTextColor WRITE setPlaceholderTextColor NOTIFY placeholderTextColorChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitBackgroundWidth READ implicitBackgroundWidth NOTIFY implicitBackgroundWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitBackgroundHeight READ implicitBackgroundHeight NOTIFY implicitBackgroundHeightChanged FINAL REVISION 5) - Q_PROPERTY(qreal topInset READ topInset WRITE setTopInset RESET resetTopInset NOTIFY topInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal leftInset READ leftInset WRITE setLeftInset RESET resetLeftInset NOTIFY leftInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal rightInset READ rightInset WRITE setRightInset RESET resetRightInset NOTIFY rightInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal bottomInset READ bottomInset WRITE setBottomInset RESET resetBottomInset NOTIFY bottomInsetChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "background") public: @@ -111,34 +100,6 @@ void setHoverEnabled(bool enabled); void resetHoverEnabled(); - // 2.3 (Qt 5.10) - QPalette palette() const; - void setPalette(const QPalette &palette); - void resetPalette(); - - // 2.5 (Qt 5.12) - QColor placeholderTextColor() const; - void setPlaceholderTextColor(const QColor &color); - - qreal implicitBackgroundWidth() const; - qreal implicitBackgroundHeight() const; - - qreal topInset() const; - void setTopInset(qreal inset); - void resetTopInset(); - - qreal leftInset() const; - void setLeftInset(qreal inset); - void resetLeftInset(); - - qreal rightInset() const; - void setRightInset(qreal inset); - void resetRightInset(); - - qreal bottomInset() const; - void setBottomInset(qreal inset); - void resetBottomInset(); - Q_SIGNALS: void fontChanged(); void implicitWidthChanged3(); @@ -152,16 +113,6 @@ Q_REVISION(1) void released(QQuickMouseEvent *event); Q_REVISION(1) void hoveredChanged(); Q_REVISION(1) void hoverEnabledChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void paletteChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void placeholderTextColorChanged(); - Q_REVISION(5) void implicitBackgroundWidthChanged(); - Q_REVISION(5) void implicitBackgroundHeightChanged(); - Q_REVISION(5) void topInsetChanged(); - Q_REVISION(5) void leftInsetChanged(); - Q_REVISION(5) void rightInsetChanged(); - Q_REVISION(5) void bottomInsetChanged(); protected: void classBegin() override; @@ -169,8 +120,6 @@ void itemChange(ItemChange change, const ItemChangeData &value) override; void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; - virtual void insetChange(const QMarginsF &newInset, const QMarginsF &oldInset); - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) override; void focusInEvent(QFocusEvent *event) override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextarea_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextarea_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextarea_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextarea_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,13 +48,12 @@ // We mean it. // -#include #include #include #include #include -#include +#include "qquicktextarea_p.h" #if QT_CONFIG(accessibility) #include @@ -63,6 +62,7 @@ QT_BEGIN_NAMESPACE class QQuickFlickable; +class QQuickAccessibleAttached; class QQuickTextAreaPrivate : public QQuickTextEditPrivate, public QQuickItemChangeListener #if QT_CONFIG(accessibility) @@ -80,36 +80,9 @@ return static_cast(QObjectPrivate::get(item)); } - inline QMarginsF getInset() const { return QMarginsF(getLeftInset(), getTopInset(), getRightInset(), getBottomInset()); } - inline qreal getTopInset() const { return extra.isAllocated() ? extra->topInset : 0; } - inline qreal getLeftInset() const { return extra.isAllocated() ? extra->leftInset : 0; } - inline qreal getRightInset() const { return extra.isAllocated() ? extra->rightInset : 0; } - inline qreal getBottomInset() const { return extra.isAllocated() ? extra->bottomInset : 0; } - - void setTopInset(qreal value, bool reset = false); - void setLeftInset(qreal value, bool reset = false); - void setRightInset(qreal value, bool reset = false); - void setBottomInset(qreal value, bool reset = false); - void resizeBackground(); - void resolveFont(); - void inheritFont(const QFont &font); - void updateFont(const QFont &font); - inline void setFont_helper(const QFont &font) { - if (sourceFont.resolve() == font.resolve() && sourceFont == font) - return; - updateFont(font); - } - - void resolvePalette(); - void inheritPalette(const QPalette &palette); - void updatePalette(const QPalette &palette); - inline void setPalette_helper(const QPalette &palette) { - if (resolvedPalette.resolve() == palette.resolve() && resolvedPalette == palette) - return; - updatePalette(palette); - } + void inheritFont(const QFont &f); #if QT_CONFIG(quicktemplates2_hover) void updateHoverEnabled(bool h, bool e); @@ -139,39 +112,17 @@ void cancelBackground(); void executeBackground(bool complete = false); - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - void itemDestroyed(QQuickItem *item) override; - #if QT_CONFIG(quicktemplates2_hover) - bool hovered = false; - bool explicitHoverEnabled = false; + bool hovered; + bool explicitHoverEnabled; #endif - - struct ExtraData { - bool hasTopInset = false; - bool hasLeftInset = false; - bool hasRightInset = false; - bool hasBottomInset = false; - bool hasBackgroundWidth = false; - bool hasBackgroundHeight = false; - qreal topInset = 0; - qreal leftInset = 0; - qreal rightInset = 0; - qreal bottomInset = 0; - QFont requestedFont; - QPalette requestedPalette; - }; - QLazilyAllocated extra; - - bool resizingBackground = false; - QPalette resolvedPalette; + QFont font; QQuickDeferredPointer background; QString placeholder; - QColor placeholderColor; - Qt::FocusReason focusReason = Qt::OtherFocusReason; + Qt::FocusReason focusReason; QQuickPressHandler pressHandler; - QQuickFlickable *flickable = nullptr; + QQuickAccessibleAttached *accessibleAttached; + QQuickFlickable *flickable; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextfield.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextfield.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextfield.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextfield.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -113,6 +113,14 @@ */ QQuickTextFieldPrivate::QQuickTextFieldPrivate() + : QQuickTextInputPrivate(), +#if QT_CONFIG(quicktemplates2_hover) + hovered(false), + explicitHoverEnabled(false), +#endif + background(nullptr), + focusReason(Qt::OtherFocusReason), + accessibleAttached(nullptr) { #if QT_CONFIG(accessibility) QAccessible::installActivationObserver(this); @@ -126,81 +134,20 @@ #endif } -void QQuickTextFieldPrivate::setTopInset(qreal value, bool reset) -{ - Q_Q(QQuickTextField); - const QMarginsF oldInset = getInset(); - extra.value().topInset = value; - extra.value().hasTopInset = !reset; - if (!qFuzzyCompare(oldInset.top(), value)) { - emit q->topInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickTextFieldPrivate::setLeftInset(qreal value, bool reset) -{ - Q_Q(QQuickTextField); - const QMarginsF oldInset = getInset(); - extra.value().leftInset = value; - extra.value().hasLeftInset = !reset; - if (!qFuzzyCompare(oldInset.left(), value)) { - emit q->leftInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickTextFieldPrivate::setRightInset(qreal value, bool reset) -{ - Q_Q(QQuickTextField); - const QMarginsF oldInset = getInset(); - extra.value().rightInset = value; - extra.value().hasRightInset = !reset; - if (!qFuzzyCompare(oldInset.right(), value)) { - emit q->rightInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - -void QQuickTextFieldPrivate::setBottomInset(qreal value, bool reset) -{ - Q_Q(QQuickTextField); - const QMarginsF oldInset = getInset(); - extra.value().bottomInset = value; - extra.value().hasBottomInset = !reset; - if (!qFuzzyCompare(oldInset.bottom(), value)) { - emit q->bottomInsetChanged(); - q->insetChange(getInset(), oldInset); - } -} - void QQuickTextFieldPrivate::resizeBackground() { - if (!background) - return; - - resizingBackground = true; - - QQuickItemPrivate *p = QQuickItemPrivate::get(background); - if (((!p->widthValid || !extra.isAllocated() || !extra->hasBackgroundWidth) && qFuzzyIsNull(background->x())) - || (extra.isAllocated() && (extra->hasLeftInset || extra->hasRightInset))) { - const bool wasWidthValid = p->widthValid; - background->setX(getLeftInset()); - background->setWidth(width - getLeftInset() - getRightInset()); - // If the user hadn't previously set the width, that shouldn't change when we set it for them. - if (!wasWidthValid) + Q_Q(QQuickTextField); + if (background) { + QQuickItemPrivate *p = QQuickItemPrivate::get(background); + if (!p->widthValid && qFuzzyIsNull(background->x())) { + background->setWidth(q->width()); p->widthValid = false; - } - if (((!p->heightValid || !extra.isAllocated() || !extra->hasBackgroundHeight) && qFuzzyIsNull(background->y())) - || (extra.isAllocated() && (extra->hasTopInset || extra->hasBottomInset))) { - const bool wasHeightValid = p->heightValid; - background->setY(getTopInset()); - background->setHeight(height - getTopInset() - getBottomInset()); - if (!wasHeightValid) + } + if (!p->heightValid && qFuzzyIsNull(background->y())) { + background->setHeight(q->height()); p->heightValid = false; + } } - - resizingBackground = false; } /*! @@ -217,71 +164,21 @@ inheritFont(QQuickControlPrivate::parentFont(q)); } -void QQuickTextFieldPrivate::inheritFont(const QFont &font) -{ - QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font; - parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve()); - - const QFont defaultFont = QQuickTheme::font(QQuickTheme::TextField); - const QFont resolvedFont = parentFont.resolve(defaultFont); - - setFont_helper(resolvedFont); -} - -/*! - \internal - - Assign \a font to this control, and propagate it to all children. -*/ -void QQuickTextFieldPrivate::updateFont(const QFont &font) +void QQuickTextFieldPrivate::inheritFont(const QFont &f) { Q_Q(QQuickTextField); - QFont oldFont = sourceFont; - q->QQuickTextInput::setFont(font); + QFont parentFont = font.resolve(f); + parentFont.resolve(font.resolve() | f.resolve()); - QQuickControlPrivate::updateFontRecur(q, font); + const QFont defaultFont = QQuickControlPrivate::themeFont(QPlatformTheme::EditorFont); + const QFont resolvedFont = parentFont.resolve(defaultFont); - if (oldFont != font) + const bool changed = resolvedFont != sourceFont; + q->QQuickTextInput::setFont(resolvedFont); + if (changed) emit q->fontChanged(); } -/*! - \internal - - Determine which palette is implicitly imposed on this control by its ancestors - and QGuiApplication::palette, resolve this against its own palette (attributes from - the implicit palette are copied over). Then propagate this palette to this - control's children. -*/ -void QQuickTextFieldPrivate::resolvePalette() -{ - Q_Q(QQuickTextField); - inheritPalette(QQuickControlPrivate::parentPalette(q)); -} - -void QQuickTextFieldPrivate::inheritPalette(const QPalette &palette) -{ - QPalette parentPalette = extra.isAllocated() ? extra->requestedPalette.resolve(palette) : palette; - parentPalette.resolve(extra.isAllocated() ? extra->requestedPalette.resolve() | palette.resolve() : palette.resolve()); - - const QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::TextField); - const QPalette resolvedPalette = parentPalette.resolve(defaultPalette); - - setPalette_helper(resolvedPalette); -} - -void QQuickTextFieldPrivate::updatePalette(const QPalette &palette) -{ - Q_Q(QQuickTextField); - QPalette oldPalette = resolvedPalette; - resolvedPalette = palette; - - QQuickControlPrivate::updatePaletteRecur(q, palette); - - if (oldPalette != palette) - emit q->paletteChanged(); -} - #if QT_CONFIG(quicktemplates2_hover) void QQuickTextFieldPrivate::updateHoverEnabled(bool enabled, bool xplicit) { @@ -327,7 +224,7 @@ { Q_UNUSED(isReadOnly); #if QT_CONFIG(accessibility) - if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(q_func())) + if (accessibleAttached) accessibleAttached->set_readOnly(isReadOnly); #endif #if QT_CONFIG(cursor) @@ -338,7 +235,7 @@ void QQuickTextFieldPrivate::echoModeChanged(QQuickTextField::EchoMode echoMode) { #if QT_CONFIG(accessibility) - if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(q_func())) + if (accessibleAttached) accessibleAttached->set_passwordEdit((echoMode == QQuickTextField::Password || echoMode == QQuickTextField::PasswordEchoOnEdit) ? true : false); #else Q_UNUSED(echoMode) @@ -348,16 +245,19 @@ #if QT_CONFIG(accessibility) void QQuickTextFieldPrivate::accessibilityActiveChanged(bool active) { - if (!active) + if (accessibleAttached || !active) return; Q_Q(QQuickTextField); - QQuickAccessibleAttached *accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(q, true)); - Q_ASSERT(accessibleAttached); - accessibleAttached->setRole(accessibleRole()); - accessibleAttached->set_readOnly(m_readOnly); - accessibleAttached->set_passwordEdit((m_echoMode == QQuickTextField::Password || m_echoMode == QQuickTextField::PasswordEchoOnEdit) ? true : false); - accessibleAttached->setDescription(placeholder); + accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(q, true)); + if (accessibleAttached) { + accessibleAttached->setRole(accessibleRole()); + accessibleAttached->set_readOnly(m_readOnly); + accessibleAttached->set_passwordEdit((m_echoMode == QQuickTextField::Password || m_echoMode == QQuickTextField::PasswordEchoOnEdit) ? true : false); + accessibleAttached->setDescription(placeholder); + } else { + qWarning() << "QQuickTextField: " << q << " QQuickAccessibleAttached object creation failed!"; + } } QAccessible::Role QQuickTextFieldPrivate::accessibleRole() const @@ -386,47 +286,6 @@ quickCompleteDeferred(q, backgroundName(), background); } -void QQuickTextFieldPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) -{ - Q_UNUSED(diff); - if (resizingBackground || item != background || !change.sizeChange()) - return; - - QQuickItemPrivate *p = QQuickItemPrivate::get(item); - // QTBUG-71875: only allocate the extra data if we have to. - // resizeBackground() relies on the value of extra.isAllocated() - // as part of its checks to see whether it should resize the background or not. - if (p->widthValid || extra.isAllocated()) - extra.value().hasBackgroundWidth = p->widthValid; - if (p->heightValid || extra.isAllocated()) - extra.value().hasBackgroundHeight = p->heightValid; - resizeBackground(); -} - -void QQuickTextFieldPrivate::itemImplicitWidthChanged(QQuickItem *item) -{ - Q_Q(QQuickTextField); - if (item == background) - emit q->implicitBackgroundWidthChanged(); -} - -void QQuickTextFieldPrivate::itemImplicitHeightChanged(QQuickItem *item) -{ - Q_Q(QQuickTextField); - if (item == background) - emit q->implicitBackgroundHeightChanged(); -} - -void QQuickTextFieldPrivate::itemDestroyed(QQuickItem *item) -{ - Q_Q(QQuickTextField); - if (item == background) { - background = nullptr; - emit q->implicitBackgroundWidthChanged(); - emit q->implicitBackgroundHeightChanged(); - } -} - QQuickTextField::QQuickTextField(QQuickItem *parent) : QQuickTextInput(*(new QQuickTextFieldPrivate), parent) { @@ -442,12 +301,6 @@ QObjectPrivate::connect(this, &QQuickTextInput::echoModeChanged, d, &QQuickTextFieldPrivate::echoModeChanged); } -QQuickTextField::~QQuickTextField() -{ - Q_D(QQuickTextField); - QQuickControlPrivate::removeImplicitSizeListener(d->background, d, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); -} - QFont QQuickTextField::font() const { return QQuickTextInput::font(); @@ -456,10 +309,10 @@ void QQuickTextField::setFont(const QFont &font) { Q_D(QQuickTextField); - if (d->extra.value().requestedFont.resolve() == font.resolve() && d->extra.value().requestedFont == font) + if (d->font.resolve() == font.resolve() && d->font == font) return; - d->extra.value().requestedFont = font; + d->font = font; d->resolveFont(); } @@ -489,36 +342,15 @@ if (!d->background.isExecuting()) d->cancelBackground(); - const qreal oldImplicitBackgroundWidth = implicitBackgroundWidth(); - const qreal oldImplicitBackgroundHeight = implicitBackgroundHeight(); - - if (d->extra.isAllocated()) { - d->extra.value().hasBackgroundWidth = false; - d->extra.value().hasBackgroundHeight = false; - } - - QQuickControlPrivate::removeImplicitSizeListener(d->background, d, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); delete d->background; d->background = background; - if (background) { background->setParentItem(this); if (qFuzzyIsNull(background->z())) background->setZ(-1); - QQuickItemPrivate *p = QQuickItemPrivate::get(background); - if (p->widthValid || p->heightValid) { - d->extra.value().hasBackgroundWidth = p->widthValid; - d->extra.value().hasBackgroundHeight = p->heightValid; - } if (isComponentComplete()) d->resizeBackground(); - QQuickControlPrivate::addImplicitSizeListener(background, d, QQuickControlPrivate::ImplicitSizeChanges | QQuickItemPrivate::Geometry); } - - if (!qFuzzyCompare(oldImplicitBackgroundWidth, implicitBackgroundWidth())) - emit implicitBackgroundWidthChanged(); - if (!qFuzzyCompare(oldImplicitBackgroundHeight, implicitBackgroundHeight())) - emit implicitBackgroundHeightChanged(); if (!d->background.isExecuting()) emit backgroundChanged(); } @@ -543,37 +375,13 @@ d->placeholder = text; #if QT_CONFIG(accessibility) - if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(this)) - accessibleAttached->setDescription(text); + if (d->accessibleAttached) + d->accessibleAttached->setDescription(text); #endif emit placeholderTextChanged(); } /*! - \qmlproperty color QtQuick.Controls::TextField::placeholderTextColor - \since QtQuick.Controls 2.5 (Qt 5.12) - - This property holds the color of placeholderText. - - \sa placeholderText -*/ -QColor QQuickTextField::placeholderTextColor() const -{ - Q_D(const QQuickTextField); - return d->placeholderColor; -} - -void QQuickTextField::setPlaceholderTextColor(const QColor &color) -{ - Q_D(QQuickTextField); - if (d->placeholderColor == color) - return; - - d->placeholderColor = color; - emit placeholderTextColorChanged(); -} - -/*! \qmlproperty enumeration QtQuick.Controls::TextField::focusReason \include qquickcontrol-focusreason.qdocinc @@ -670,186 +478,11 @@ #endif } -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty palette QtQuick.Controls::TextField::palette - - This property holds the palette currently set for the text field. - - \sa Control::palette -*/ -QPalette QQuickTextField::palette() const -{ - Q_D(const QQuickTextField); - QPalette palette = d->resolvedPalette; - if (!isEnabled()) - palette.setCurrentColorGroup(QPalette::Disabled); - return palette; -} - -void QQuickTextField::setPalette(const QPalette &palette) -{ - Q_D(QQuickTextField); - if (d->extra.value().requestedPalette.resolve() == palette.resolve() && d->extra.value().requestedPalette == palette) - return; - - d->extra.value().requestedPalette = palette; - d->resolvePalette(); -} - -void QQuickTextField::resetPalette() -{ - setPalette(QPalette()); -} - void QQuickTextField::classBegin() { Q_D(QQuickTextField); QQuickTextInput::classBegin(); d->resolveFont(); - d->resolvePalette(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextField::implicitBackgroundWidth - \readonly - - This property holds the implicit background width. - - The value is equal to \c {background ? background.implicitWidth : 0}. - - \sa implicitBackgroundHeight -*/ -qreal QQuickTextField::implicitBackgroundWidth() const -{ - Q_D(const QQuickTextField); - if (!d->background) - return 0; - return d->background->implicitWidth(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextField::implicitBackgroundHeight - \readonly - - This property holds the implicit background height. - - The value is equal to \c {background ? background.implicitHeight : 0}. - - \sa implicitBackgroundWidth -*/ -qreal QQuickTextField::implicitBackgroundHeight() const -{ - Q_D(const QQuickTextField); - if (!d->background) - return 0; - return d->background->implicitHeight(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextField::topInset - - This property holds the top inset for the background. - - \sa {Control Layout}, bottomInset -*/ -qreal QQuickTextField::topInset() const -{ - Q_D(const QQuickTextField); - return d->getTopInset(); -} - -void QQuickTextField::setTopInset(qreal inset) -{ - Q_D(QQuickTextField); - d->setTopInset(inset); -} - -void QQuickTextField::resetTopInset() -{ - Q_D(QQuickTextField); - d->setTopInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextField::leftInset - - This property holds the left inset for the background. - - \sa {Control Layout}, rightInset -*/ -qreal QQuickTextField::leftInset() const -{ - Q_D(const QQuickTextField); - return d->getLeftInset(); -} - -void QQuickTextField::setLeftInset(qreal inset) -{ - Q_D(QQuickTextField); - d->setLeftInset(inset); -} - -void QQuickTextField::resetLeftInset() -{ - Q_D(QQuickTextField); - d->setLeftInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextField::rightInset - - This property holds the right inset for the background. - - \sa {Control Layout}, leftInset -*/ -qreal QQuickTextField::rightInset() const -{ - Q_D(const QQuickTextField); - return d->getRightInset(); -} - -void QQuickTextField::setRightInset(qreal inset) -{ - Q_D(QQuickTextField); - d->setRightInset(inset); -} - -void QQuickTextField::resetRightInset() -{ - Q_D(QQuickTextField); - d->setRightInset(0, true); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlproperty real QtQuick.Controls::TextField::bottomInset - - This property holds the bottom inset for the background. - - \sa {Control Layout}, topInset -*/ -qreal QQuickTextField::bottomInset() const -{ - Q_D(const QQuickTextField); - return d->getBottomInset(); -} - -void QQuickTextField::setBottomInset(qreal inset) -{ - Q_D(QQuickTextField); - d->setBottomInset(inset); -} - -void QQuickTextField::resetBottomInset() -{ - Q_D(QQuickTextField); - d->setBottomInset(0, true); } void QQuickTextField::componentComplete() @@ -857,13 +490,12 @@ Q_D(QQuickTextField); d->executeBackground(true); QQuickTextInput::componentComplete(); - d->resizeBackground(); #if QT_CONFIG(quicktemplates2_hover) if (!d->explicitHoverEnabled) setAcceptHoverEvents(QQuickControlPrivate::calcHoverEnabled(d->parentItem)); #endif #if QT_CONFIG(accessibility) - if (QAccessible::isActive()) + if (!d->accessibleAttached && QAccessible::isActive()) d->accessibilityActiveChanged(true); #endif } @@ -872,23 +504,12 @@ { Q_D(QQuickTextField); QQuickTextInput::itemChange(change, value); - switch (change) { - case ItemEnabledHasChanged: - emit paletteChanged(); - break; - case ItemSceneChange: - case ItemParentHasChanged: - if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) { - d->resolveFont(); - d->resolvePalette(); + if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) { + d->resolveFont(); #if QT_CONFIG(quicktemplates2_hover) - if (!d->explicitHoverEnabled) - d->updateHoverEnabled(QQuickControlPrivate::calcHoverEnabled(d->parentItem), false); // explicit=false + if (!d->explicitHoverEnabled) + d->updateHoverEnabled(QQuickControlPrivate::calcHoverEnabled(d->parentItem), false); // explicit=false #endif - } - break; - default: - break; } } @@ -899,13 +520,6 @@ d->resizeBackground(); } -void QQuickTextField::insetChange(const QMarginsF &newInset, const QMarginsF &oldInset) -{ - Q_D(QQuickTextField); - Q_UNUSED(newInset); - Q_UNUSED(oldInset); - d->resizeBackground(); -} QSGNode *QQuickTextField::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) { QQuickDefaultClipNode *clipNode = static_cast(oldNode); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextfield_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextfield_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextfield_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextfield_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,6 @@ // We mean it. // -#include #include #include @@ -70,21 +69,10 @@ // 2.1 (Qt 5.8) Q_PROPERTY(bool hovered READ isHovered NOTIFY hoveredChanged FINAL REVISION 1) Q_PROPERTY(bool hoverEnabled READ isHoverEnabled WRITE setHoverEnabled RESET resetHoverEnabled NOTIFY hoverEnabledChanged FINAL REVISION 1) - // 2.3 (Qt 5.10) - Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) - // 2.5 (Qt 5.12) - Q_PROPERTY(QColor placeholderTextColor READ placeholderTextColor WRITE setPlaceholderTextColor NOTIFY placeholderTextColorChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitBackgroundWidth READ implicitBackgroundWidth NOTIFY implicitBackgroundWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal implicitBackgroundHeight READ implicitBackgroundHeight NOTIFY implicitBackgroundHeightChanged FINAL REVISION 5) - Q_PROPERTY(qreal topInset READ topInset WRITE setTopInset RESET resetTopInset NOTIFY topInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal leftInset READ leftInset WRITE setLeftInset RESET resetLeftInset NOTIFY leftInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal rightInset READ rightInset WRITE setRightInset RESET resetRightInset NOTIFY rightInsetChanged FINAL REVISION 5) - Q_PROPERTY(qreal bottomInset READ bottomInset WRITE setBottomInset RESET resetBottomInset NOTIFY bottomInsetChanged FINAL REVISION 5) Q_CLASSINFO("DeferredPropertyNames", "background") public: explicit QQuickTextField(QQuickItem *parent = nullptr); - ~QQuickTextField(); QFont font() const; void setFont(const QFont &font); @@ -106,34 +94,6 @@ void setHoverEnabled(bool enabled); void resetHoverEnabled(); - // 2.3 (Qt 5.10) - QPalette palette() const; - void setPalette(const QPalette &palette); - void resetPalette(); - - // 2.5 (Qt 5.12) - QColor placeholderTextColor() const; - void setPlaceholderTextColor(const QColor &color); - - qreal implicitBackgroundWidth() const; - qreal implicitBackgroundHeight() const; - - qreal topInset() const; - void setTopInset(qreal inset); - void resetTopInset(); - - qreal leftInset() const; - void setLeftInset(qreal inset); - void resetLeftInset(); - - qreal rightInset() const; - void setRightInset(qreal inset); - void resetRightInset(); - - qreal bottomInset() const; - void setBottomInset(qreal inset); - void resetBottomInset(); - Q_SIGNALS: void fontChanged(); void implicitWidthChanged3(); @@ -147,16 +107,6 @@ Q_REVISION(1) void released(QQuickMouseEvent *event); Q_REVISION(1) void hoveredChanged(); Q_REVISION(1) void hoverEnabledChanged(); - // 2.3 (Qt 5.10) - Q_REVISION(3) void paletteChanged(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void placeholderTextColorChanged(); - Q_REVISION(5) void implicitBackgroundWidthChanged(); - Q_REVISION(5) void implicitBackgroundHeightChanged(); - Q_REVISION(5) void topInsetChanged(); - Q_REVISION(5) void leftInsetChanged(); - Q_REVISION(5) void rightInsetChanged(); - Q_REVISION(5) void bottomInsetChanged(); protected: void classBegin() override; @@ -164,8 +114,6 @@ void itemChange(ItemChange change, const ItemChangeData &value) override; void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; - virtual void insetChange(const QMarginsF &newInset, const QMarginsF &oldInset); - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) override; void focusInEvent(QFocusEvent *event) override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextfield_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextfield_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktextfield_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktextfield_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,13 +48,11 @@ // We mean it. // -#include #include -#include #include #include -#include +#include "qquicktextfield_p.h" #if QT_CONFIG(accessibility) #include @@ -62,7 +60,9 @@ QT_BEGIN_NAMESPACE -class QQuickTextFieldPrivate : public QQuickTextInputPrivate, public QQuickItemChangeListener +class QQuickAccessibleAttached; + +class QQuickTextFieldPrivate : public QQuickTextInputPrivate #if QT_CONFIG(accessibility) , public QAccessible::ActivationObserver #endif @@ -76,36 +76,9 @@ static QQuickTextFieldPrivate *get(QQuickTextField *item) { return static_cast(QObjectPrivate::get(item)); } - inline QMarginsF getInset() const { return QMarginsF(getLeftInset(), getTopInset(), getRightInset(), getBottomInset()); } - inline qreal getTopInset() const { return extra.isAllocated() ? extra->topInset : 0; } - inline qreal getLeftInset() const { return extra.isAllocated() ? extra->leftInset : 0; } - inline qreal getRightInset() const { return extra.isAllocated() ? extra->rightInset : 0; } - inline qreal getBottomInset() const { return extra.isAllocated() ? extra->bottomInset : 0; } - - void setTopInset(qreal value, bool reset = false); - void setLeftInset(qreal value, bool reset = false); - void setRightInset(qreal value, bool reset = false); - void setBottomInset(qreal value, bool reset = false); - void resizeBackground(); - void resolveFont(); - void inheritFont(const QFont &font); - void updateFont(const QFont &font); - inline void setFont_helper(const QFont &font) { - if (sourceFont.resolve() == font.resolve() && sourceFont == font) - return; - updateFont(font); - } - - void resolvePalette(); - void inheritPalette(const QPalette &palette); - void updatePalette(const QPalette &palette); - inline void setPalette_helper(const QPalette &palette) { - if (resolvedPalette.resolve() == palette.resolve() && resolvedPalette == palette) - return; - updatePalette(palette); - } + void inheritFont(const QFont &f); #if QT_CONFIG(quicktemplates2_hover) void updateHoverEnabled(bool h, bool e); @@ -128,39 +101,16 @@ void cancelBackground(); void executeBackground(bool complete = false); - void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) override; - void itemImplicitWidthChanged(QQuickItem *item) override; - void itemImplicitHeightChanged(QQuickItem *item) override; - void itemDestroyed(QQuickItem *item) override; - #if QT_CONFIG(quicktemplates2_hover) - bool hovered = false; - bool explicitHoverEnabled = false; + bool hovered; + bool explicitHoverEnabled; #endif - - struct ExtraData { - bool hasTopInset = false; - bool hasLeftInset = false; - bool hasRightInset = false; - bool hasBottomInset = false; - bool hasBackgroundWidth = false; - bool hasBackgroundHeight = false; - qreal topInset = 0; - qreal leftInset = 0; - qreal rightInset = 0; - qreal bottomInset = 0; - QFont requestedFont; - QPalette requestedPalette; - }; - QLazilyAllocated extra; - - bool resizingBackground = false; - QPalette resolvedPalette; + QFont font; QQuickDeferredPointer background; QString placeholder; - QColor placeholderColor; - Qt::FocusReason focusReason = Qt::OtherFocusReason; + Qt::FocusReason focusReason; QQuickPressHandler pressHandler; + QQuickAccessibleAttached *accessibleAttached; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktheme.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktheme.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktheme.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktheme.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,178 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquicktheme_p.h" -#include "qquicktheme_p_p.h" - -#include -#include - -QT_BEGIN_NAMESPACE - -QScopedPointer QQuickThemePrivate::instance; - -static void cleanup_instance() -{ - QQuickThemePrivate::instance.reset(); -} - -static void install_instance_cleanuper() -{ - qAddPostRoutine(cleanup_instance); -} - -Q_COREAPP_STARTUP_FUNCTION(install_instance_cleanuper) - -static QPlatformTheme::Font platformFont(QQuickTheme::Scope scope) -{ - switch (scope) { - case QQuickTheme::Button: return QPlatformTheme::PushButtonFont; - case QQuickTheme::CheckBox: return QPlatformTheme::CheckBoxFont; - case QQuickTheme::ComboBox: return QPlatformTheme::ComboMenuItemFont; - case QQuickTheme::GroupBox: return QPlatformTheme::GroupBoxTitleFont; - case QQuickTheme::ItemView: return QPlatformTheme::ItemViewFont; - case QQuickTheme::Label: return QPlatformTheme::LabelFont; - case QQuickTheme::ListView: return QPlatformTheme::ListViewFont; - case QQuickTheme::Menu: return QPlatformTheme::MenuFont; - case QQuickTheme::MenuBar: return QPlatformTheme::MenuBarFont; - case QQuickTheme::RadioButton: return QPlatformTheme::RadioButtonFont; - case QQuickTheme::SpinBox: return QPlatformTheme::EditorFont; - case QQuickTheme::Switch: return QPlatformTheme::CheckBoxFont; - case QQuickTheme::TabBar: return QPlatformTheme::TabButtonFont; - case QQuickTheme::TextArea: return QPlatformTheme::EditorFont; - case QQuickTheme::TextField: return QPlatformTheme::EditorFont; - case QQuickTheme::ToolBar: return QPlatformTheme::ToolButtonFont; - case QQuickTheme::ToolTip: return QPlatformTheme::TipLabelFont; - case QQuickTheme::Tumbler: return QPlatformTheme::ItemViewFont; - default: return QPlatformTheme::SystemFont; - } -} - -static QPlatformTheme::Palette platformPalette(QQuickTheme::Scope scope) -{ - switch (scope) { - case QQuickTheme::Button: return QPlatformTheme::ButtonPalette; - case QQuickTheme::CheckBox: return QPlatformTheme::CheckBoxPalette; - case QQuickTheme::ComboBox: return QPlatformTheme::ComboBoxPalette; - case QQuickTheme::GroupBox: return QPlatformTheme::GroupBoxPalette; - case QQuickTheme::ItemView: return QPlatformTheme::ItemViewPalette; - case QQuickTheme::Label: return QPlatformTheme::LabelPalette; - case QQuickTheme::ListView: return QPlatformTheme::ItemViewPalette; - case QQuickTheme::Menu: return QPlatformTheme::MenuPalette; - case QQuickTheme::MenuBar: return QPlatformTheme::MenuBarPalette; - case QQuickTheme::RadioButton: return QPlatformTheme::RadioButtonPalette; - case QQuickTheme::SpinBox: return QPlatformTheme::TextLineEditPalette; - case QQuickTheme::Switch: return QPlatformTheme::CheckBoxPalette; - case QQuickTheme::TabBar: return QPlatformTheme::TabBarPalette; - case QQuickTheme::TextArea: return QPlatformTheme::TextEditPalette; - case QQuickTheme::TextField: return QPlatformTheme::TextLineEditPalette; - case QQuickTheme::ToolBar: return QPlatformTheme::ToolButtonPalette; - case QQuickTheme::ToolTip: return QPlatformTheme::ToolTipPalette; - case QQuickTheme::Tumbler: return QPlatformTheme::ItemViewPalette; - default: return QPlatformTheme::SystemPalette; - } -} - -QQuickTheme::QQuickTheme() - : d_ptr(new QQuickThemePrivate) -{ - d_ptr->q_ptr = this; -} - -QQuickTheme::~QQuickTheme() -{ -} - -QQuickTheme *QQuickTheme::instance() -{ - return QQuickThemePrivate::instance.data(); -} - -QFont QQuickTheme::font(Scope scope) -{ - const QFont *font = nullptr; - if (QQuickTheme *theme = instance()) - font = QQuickThemePrivate::get(theme)->fonts[scope].data(); - else if (QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) - font = theme->font(platformFont(scope)); - - if (font) { - QFont f = *font; - if (scope == System) - f.resolve(0); - return f; - } - - if (scope != System) - return QQuickTheme::font(System); - - return QFont(); -} - -QPalette QQuickTheme::palette(Scope scope) -{ - const QPalette *palette = nullptr; - if (QQuickTheme *theme = instance()) - palette = QQuickThemePrivate::get(theme)->palettes[scope].data(); - else if (QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) - palette = theme->palette(platformPalette(scope)); - - if (palette) { - QPalette f = *palette; - if (scope == System) - f.resolve(0); - return f; - } - - if (scope != System) - return QQuickTheme::palette(System); - - return QPalette(); -} - -void QQuickTheme::setFont(Scope scope, const QFont &font) -{ - Q_D(QQuickTheme); - d->fonts[scope] = QSharedPointer::create(d->defaultFont ? d->defaultFont->resolve(font) : font); -} - -void QQuickTheme::setPalette(Scope scope, const QPalette &palette) -{ - Q_D(QQuickTheme); - d->palettes[scope] = QSharedPointer::create(d->defaultPalette ? d->defaultPalette->resolve(palette) : palette); -} - -QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktheme_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktheme_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktheme_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktheme_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKTHEME_P_H -#define QQUICKTHEME_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QQuickThemePrivate; - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTheme -{ -public: - QQuickTheme(); - ~QQuickTheme(); - - static QQuickTheme *instance(); - - enum Scope { - System, - Button, - CheckBox, - ComboBox, - GroupBox, - ItemView, - Label, - ListView, - Menu, - MenuBar, - RadioButton, - SpinBox, - Switch, - TabBar, - TextArea, - TextField, - ToolBar, - ToolTip, - Tumbler - }; - - static QFont font(Scope scope); - static QPalette palette(Scope scope); - - void setFont(Scope scope, const QFont &font); - void setPalette(Scope scope, const QPalette &palette); - -private: - Q_DISABLE_COPY(QQuickTheme) - Q_DECLARE_PRIVATE(QQuickTheme) - QScopedPointer d_ptr; -}; - -QT_END_NAMESPACE - -#endif // QQUICKTHEME_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktheme_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktheme_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktheme_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktheme_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKTHEME_P_P_H -#define QQUICKTHEME_P_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -QT_BEGIN_NAMESPACE - -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickThemePrivate -{ - Q_DECLARE_PUBLIC(QQuickTheme) - -public: - static QQuickThemePrivate *get(QQuickTheme *theme) - { - return theme->d_func(); - } - - static QScopedPointer instance; - - static const int NScopes = QQuickTheme::Tumbler + 1; - - QScopedPointer defaultFont; - QScopedPointer defaultPalette; - QSharedPointer fonts[NScopes]; - QSharedPointer palettes[NScopes]; - QQuickTheme *q_ptr = nullptr; -}; - -QT_END_NAMESPACE - -#endif // QQUICKTHEME_P_P_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolbar.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolbar.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolbar.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolbar.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -99,7 +99,9 @@ class QQuickToolBarPrivate : public QQuickPanePrivate { public: - QQuickToolBar::Position position = QQuickToolBar::Header; + QQuickToolBarPrivate() : position(QQuickToolBar::Header) { } + + QQuickToolBar::Position position; }; QQuickToolBar::QQuickToolBar(QQuickItem *parent) @@ -139,16 +141,6 @@ emit positionChanged(); } -QFont QQuickToolBar::defaultFont() const -{ - return QQuickTheme::font(QQuickTheme::ToolBar); -} - -QPalette QQuickToolBar::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ToolBar); -} - #if QT_CONFIG(accessibility) QAccessible::Role QQuickToolBar::accessibleRole() const { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolbar_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolbar_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolbar_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolbar_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -75,9 +75,6 @@ void positionChanged(); protected: - QFont defaultFont() const override; - QPalette defaultPalette() const override; - #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolbutton.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolbutton.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolbutton.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolbutton.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -58,8 +58,8 @@ \snippet qtquickcontrols2-toolbar.qml 1 ToolButton inherits its API from AbstractButton. For instance, you can set - \l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls 2}{icon}, - and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API. + \l {AbstractButton::text}{text}, and react to \l {AbstractButton::clicked}{clicks} + using the AbstractButton API. \sa ToolBar, {Customizing ToolButton}, {Button Controls} */ @@ -71,12 +71,7 @@ QFont QQuickToolButton::defaultFont() const { - return QQuickTheme::font(QQuickTheme::ToolBar); -} - -QPalette QQuickToolButton::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ToolBar); + return QQuickControlPrivate::themeFont(QPlatformTheme::ToolButtonFont); } QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolbutton_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolbutton_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolbutton_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolbutton_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -61,7 +61,6 @@ protected: QFont defaultFont() const override; - QPalette defaultPalette() const override; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolseparator.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolseparator.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolseparator.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolseparator.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -66,7 +66,9 @@ Q_DECLARE_PUBLIC(QQuickToolSeparator) public: - Qt::Orientation orientation = Qt::Vertical; + QQuickToolSeparatorPrivate() : orientation(Qt::Vertical) { } + + Qt::Orientation orientation; }; QQuickToolSeparator::QQuickToolSeparator(QQuickItem *parent) @@ -131,16 +133,6 @@ return d->orientation == Qt::Vertical; } -QFont QQuickToolSeparator::defaultFont() const -{ - return QQuickTheme::font(QQuickTheme::ToolBar); -} - -QPalette QQuickToolSeparator::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ToolBar); -} - #if QT_CONFIG(accessibility) QAccessible::Role QQuickToolSeparator::accessibleRole() const { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolseparator_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolseparator_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktoolseparator_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktoolseparator_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -74,9 +74,6 @@ void orientationChanged(); protected: - QFont defaultFont() const override; - QPalette defaultPalette() const override; - #if QT_CONFIG(accessibility) QAccessible::Role accessibleRole() const override; #endif diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktooltip.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktooltip.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktooltip.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktooltip.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -124,14 +124,20 @@ Q_DECLARE_PUBLIC(QQuickToolTip) public: + QQuickToolTipPrivate() + : delay(0), + timeout(-1) + { + } + void startDelay(); void stopDelay(); void startTimeout(); void stopTimeout(); - int delay = 0; - int timeout = -1; + int delay; + int timeout; QString text; QBasicTimer delayTimer; QBasicTimer timeoutTimer; @@ -270,39 +276,9 @@ return new QQuickToolTipAttached(object); } -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlmethod void QtQuick.Controls::ToolTip::show(string text, int timeout = -1) - - This method shows the tooltip with \a text and \a timeout (milliseconds). -*/ -void QQuickToolTip::show(const QString &text, int ms) -{ - if (ms >= 0) - setTimeout(ms); - setText(text); - open(); -} - -/*! - \since QtQuick.Controls 2.5 (Qt 5.12) - \qmlmethod void QtQuick.Controls::ToolTip::hide() - - This method hides the tooltip. -*/ -void QQuickToolTip::hide() -{ - close(); -} - QFont QQuickToolTip::defaultFont() const { - return QQuickTheme::font(QQuickTheme::ToolTip); -} - -QPalette QQuickToolTip::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ToolTip); + return QQuickControlPrivate::themeFont(QPlatformTheme::TipLabelFont); } void QQuickToolTip::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) @@ -354,10 +330,16 @@ Q_DECLARE_PUBLIC(QQuickToolTipAttached) public: + QQuickToolTipAttachedPrivate() + : delay(0), + timeout(-1) + { + } + QQuickToolTip *instance(bool create) const; - int delay = 0; - int timeout = -1; + int delay; + int timeout; QString text; }; @@ -373,7 +355,7 @@ if (!tip && create) { // TODO: a cleaner way to create the instance? QQml(Meta)Type? QQmlComponent component(engine); - component.setData("import QtQuick.Controls 2.4; ToolTip { }", QUrl()); + component.setData("import QtQuick.Controls 2.2; ToolTip { }", QUrl()); QObject *object = component.create(); if (object) @@ -533,9 +515,10 @@ tip->resetWidth(); tip->resetHeight(); tip->setParentItem(qobject_cast(parent())); - tip->setDelay(d->delay); tip->setTimeout(ms >= 0 ? ms : d->timeout); - tip->show(text); + tip->setDelay(d->delay); + tip->setText(text); + tip->open(); } /*! diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktooltip_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktooltip_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktooltip_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktooltip_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -84,13 +84,8 @@ void delayChanged(); void timeoutChanged(); -public Q_SLOTS: - Q_REVISION(5) void show(const QString &text, int ms = -1); - Q_REVISION(5) void hide(); - protected: QFont defaultFont() const override; - QPalette defaultPalette() const override; void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) override; void timerEvent(QTimerEvent *event) override; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktumbler.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktumbler.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktumbler.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktumbler.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -36,7 +36,6 @@ #include "qquicktumbler_p.h" -#include #include #include #include @@ -70,8 +69,7 @@ The API is similar to that of views like \l ListView and \l PathView; a \l model and \l delegate can be set, and the \l count and \l currentItem - properties provide read-only access to information about the view. To - position the view at a certain index, use \l positionViewAtIndex(). + properties provide read-only access to information about the view. Unlike views like \l PathView and \l ListView, however, there is always a current item (when the model isn't empty). This means that when \l count is @@ -87,6 +85,27 @@ \sa {Customizing Tumbler}, {Input Controls} */ +QQuickTumblerPrivate::QQuickTumblerPrivate() + : delegate(nullptr), + visibleItemCount(5), + wrap(true), + explicitWrap(false), + ignoreWrapChanges(false), + view(nullptr), + viewContentItem(nullptr), + viewContentItemType(UnsupportedContentItemType), + currentIndex(-1), + pendingCurrentIndex(-1), + ignoreCurrentIndexChanges(false), + count(0), + ignoreSignals(false) +{ +} + +QQuickTumblerPrivate::~QQuickTumblerPrivate() +{ +} + namespace { static inline qreal delegateHeight(const QQuickTumbler *tumbler) { @@ -100,6 +119,7 @@ */ QQuickItem *QQuickTumblerPrivate::determineViewType(QQuickItem *contentItem) { + Q_Q(QQuickTumbler); if (!contentItem) { resetViewData(); return nullptr; @@ -109,14 +129,16 @@ view = contentItem; viewContentItem = contentItem; viewContentItemType = PathViewContentItem; - viewOffset = 0; + + QObject::connect(view, SIGNAL(offsetChanged()), q, SLOT(_q_calculateAttachedDisplacements())); return contentItem; } else if (contentItem->inherits("QQuickListView")) { view = contentItem; viewContentItem = qobject_cast(contentItem)->contentItem(); viewContentItemType = ListViewContentItem; - viewContentY = 0; + + QObject::connect(view, SIGNAL(contentYChanged()), q, SLOT(_q_calculateAttachedDisplacements())); return contentItem; } else { @@ -137,10 +159,6 @@ { view = nullptr; viewContentItem = nullptr; - if (viewContentItemType == PathViewContentItem) - viewOffset = 0; - else if (viewContentItemType == ListViewContentItem) - viewContentY = 0; viewContentItemType = NoContentItem; } @@ -186,17 +204,12 @@ void QQuickTumblerPrivate::_q_onViewCurrentIndexChanged() { Q_Q(QQuickTumbler); - if (!view || ignoreCurrentIndexChanges || currentIndexSetDuringModelChange) { - // If the user set currentIndex in the onModelChanged handler, - // we have to respect that currentIndex by ignoring changes in the view - // until the model has finished being set. - return; + if (view && !ignoreCurrentIndexChanges) { + const int oldCurrentIndex = currentIndex; + currentIndex = view->property("currentIndex").toInt(); + if (oldCurrentIndex != currentIndex) + emit q->currentIndexChanged(); } - - const int oldCurrentIndex = currentIndex; - currentIndex = view->property("currentIndex").toInt(); - if (oldCurrentIndex != currentIndex) - emit q->currentIndexChanged(); } void QQuickTumblerPrivate::_q_onViewCountChanged() @@ -211,42 +224,33 @@ if (pendingCurrentIndex != -1) { // If there was an attempt to set currentIndex at creation, try to finish that attempt now. // componentComplete() is too early, because the count might only be known sometime after completion. - setCurrentIndex(pendingCurrentIndex); + q->setCurrentIndex(pendingCurrentIndex); // If we could successfully set the currentIndex, consider it done. // Otherwise, we'll try again later in updatePolish(). if (currentIndex == pendingCurrentIndex) - setPendingCurrentIndex(-1); + pendingCurrentIndex = -1; else q->polish(); } else if (currentIndex == -1) { // If new items were added and our currentIndex was -1, we must // enforce our rule of a non-negative currentIndex when count > 0. - setCurrentIndex(0); + q->setCurrentIndex(0); } } else { - setCurrentIndex(-1); + q->setCurrentIndex(-1); } } -void QQuickTumblerPrivate::_q_onViewOffsetChanged() -{ - viewOffset = view->property("offset").toReal(); - calculateDisplacements(); -} - -void QQuickTumblerPrivate::_q_onViewContentYChanged() -{ - viewContentY = view->property("contentY").toReal(); - calculateDisplacements(); -} - -void QQuickTumblerPrivate::calculateDisplacements() +void QQuickTumblerPrivate::_q_calculateAttachedDisplacements() { const auto items = viewContentItemChildItems(); for (QQuickItem *childItem : items) { - QQuickTumblerAttached *attached = qobject_cast(qmlAttachedPropertiesObject(childItem, false)); - if (attached) - QQuickTumblerAttachedPrivate::get(attached)->calculateDisplacement(); + QQuickTumblerAttached *attached = qobject_cast( + qmlAttachedPropertiesObject(childItem, false)); + if (attached) { + QQuickTumblerAttachedPrivate *attachedPrivate = QQuickTumblerAttachedPrivate::get(attached); + attachedPrivate->_q_calculateDisplacement(); + } } } @@ -262,13 +266,6 @@ _q_updateItemHeights(); } -void QQuickTumblerPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) -{ - QQuickControlPrivate::itemGeometryChanged(item, change, diff); - if (change.sizeChange()) - calculateDisplacements(); -} - QQuickTumbler::QQuickTumbler(QQuickItem *parent) : QQuickControl(*(new QQuickTumblerPrivate), parent) { @@ -304,19 +301,17 @@ if (model == d->model) return; - d->beginSetModel(); + d->lockWrap(); d->model = model; emit modelChanged(); - d->endSetModel(); - - d->currentIndexSetDuringModelChange = false; + d->unlockWrap(); // Don't try to correct the currentIndex if count() isn't known yet. // We can check in setupViewData() instead. if (isComponentComplete() && d->view && count() == 0) - d->setCurrentIndex(-1); + setCurrentIndex(-1); } /*! @@ -338,8 +333,6 @@ The value of this property is \c -1 when \l count is equal to \c 0. In all other cases, it will be greater than or equal to \c 0. - - \sa currentItem, positionViewAtIndex() */ int QQuickTumbler::currentIndex() const { @@ -350,9 +343,49 @@ void QQuickTumbler::setCurrentIndex(int currentIndex) { Q_D(QQuickTumbler); - if (d->modelBeingSet) - d->currentIndexSetDuringModelChange = true; - d->setCurrentIndex(currentIndex, QQuickTumblerPrivate::UserChange); + if (currentIndex == d->currentIndex || currentIndex < -1) + return; + + if (!isComponentComplete()) { + // Views can't set currentIndex until they're ready. + d->pendingCurrentIndex = currentIndex; + return; + } + + // -1 doesn't make sense for a non-empty Tumbler, because unlike + // e.g. ListView, there's always one item selected. + // Wait until the component has finished before enforcing this rule, though, + // because the count might not be known yet. + if ((d->count > 0 && currentIndex == -1) || (currentIndex >= d->count)) { + return; + } + + // The view might not have been created yet, as is the case + // if you create a Tumbler component and pass e.g. { currentIndex: 2 } + // to createObject(). + if (d->view) { + // Only actually set our currentIndex if the view was able to set theirs. + bool couldSet = false; + if (d->count == 0 && currentIndex == -1) { + // PathView insists on using 0 as the currentIndex when there are no items. + couldSet = true; + } else { + d->ignoreCurrentIndexChanges = true; + d->ignoreSignals = true; + d->view->setProperty("currentIndex", currentIndex); + d->ignoreSignals = false; + d->ignoreCurrentIndexChanges = false; + + couldSet = d->view->property("currentIndex").toInt() == currentIndex; + } + + if (couldSet) { + // The view's currentIndex might not have actually changed, but ours has, + // and that's what user code sees. + d->currentIndex = currentIndex; + emit currentIndexChanged(); + } + } } /*! @@ -360,8 +393,6 @@ \readonly This property holds the item at the current index. - - \sa currentIndex, positionViewAtIndex() */ QQuickItem *QQuickTumbler::currentItem() const { @@ -463,41 +494,6 @@ return d->view && d->view->property("moving").toBool(); } -/*! - \qmlmethod void QtQuick.Controls::Tumbler::positionViewAtIndex(int index, PositionMode mode) - \since QtQuick.Controls 2.5 (Qt 5.12) - - Positions the view so that the \a index is at the position specified by \a mode. - - For example: - - \code - positionViewAtIndex(10, Tumbler.Center) - \endcode - - If \l wrap is true (the default), the modes available to \l {PathView}'s - \l {PathView::}{positionViewAtIndex()} function - are available, otherwise the modes available to \l {ListView}'s - \l {ListView::}{positionViewAtIndex()} function - are available. - - \note There is a known limitation that using \c Tumbler.Beginning when \l - wrap is \c true will result in the wrong item being positioned at the top - of view. As a workaround, pass \c {index - 1}. - - \sa currentIndex -*/ -void QQuickTumbler::positionViewAtIndex(int index, QQuickTumbler::PositionMode mode) -{ - Q_D(QQuickTumbler); - if (!d->view) { - d->warnAboutIncorrectContentItem(); - return; - } - - QMetaObject::invokeMethod(d->view, "positionViewAtIndex", Q_ARG(int, index), Q_ARG(int, mode)); -} - void QQuickTumbler::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickTumbler); @@ -573,13 +569,8 @@ QObject::disconnect(view, SIGNAL(countChanged()), q, SLOT(_q_onViewCountChanged())); QObject::disconnect(view, SIGNAL(movingChanged()), q, SIGNAL(movingChanged())); - if (viewContentItemType == PathViewContentItem) - QObject::disconnect(view, SIGNAL(offsetChanged()), q, SLOT(_q_onViewOffsetChanged())); - else - QObject::disconnect(view, SIGNAL(contentYChanged()), q, SLOT(_q_onViewContentYChanged())); - QQuickItemPrivate *oldViewContentItemPrivate = QQuickItemPrivate::get(viewContentItem); - oldViewContentItemPrivate->removeItemChangeListener(this, QQuickItemPrivate::Children | QQuickItemPrivate::Geometry); + oldViewContentItemPrivate->removeItemChangeListener(this, QQuickItemPrivate::Geometry | QQuickItemPrivate::Children); resetViewData(); } @@ -596,7 +587,7 @@ return; if (viewContentItemType == QQuickTumblerPrivate::UnsupportedContentItemType) { - warnAboutIncorrectContentItem(); + qWarning() << "Tumbler: contentItem must contain either a PathView or a ListView"; return; } @@ -606,27 +597,13 @@ QObject::connect(view, SIGNAL(countChanged()), q, SLOT(_q_onViewCountChanged())); QObject::connect(view, SIGNAL(movingChanged()), q, SIGNAL(movingChanged())); - if (viewContentItemType == PathViewContentItem) { - QObject::connect(view, SIGNAL(offsetChanged()), q, SLOT(_q_onViewOffsetChanged())); - _q_onViewOffsetChanged(); - } else { - QObject::connect(view, SIGNAL(contentYChanged()), q, SLOT(_q_onViewContentYChanged())); - _q_onViewContentYChanged(); - } - QQuickItemPrivate *viewContentItemPrivate = QQuickItemPrivate::get(viewContentItem); - viewContentItemPrivate->addItemChangeListener(this, QQuickItemPrivate::Children | QQuickItemPrivate::Geometry); + viewContentItemPrivate->addItemChangeListener(this, QQuickItemPrivate::Geometry | QQuickItemPrivate::Children); // Sync the view's currentIndex with ours. syncCurrentIndex(); - calculateDisplacements(); -} - -void QQuickTumblerPrivate::warnAboutIncorrectContentItem() -{ - Q_Q(QQuickTumbler); - qmlWarning(q) << "Tumbler: contentItem must contain either a PathView or a ListView"; + _q_calculateAttachedDisplacements(); } void QQuickTumblerPrivate::syncCurrentIndex() @@ -639,7 +616,7 @@ // Nothing to do. if (actualViewIndex == indexToSet) { - setPendingCurrentIndex(-1); + pendingCurrentIndex = -1; return; } @@ -652,74 +629,11 @@ ignoreCurrentIndexChanges = false; if (view->property("currentIndex").toInt() == indexToSet) - setPendingCurrentIndex(-1); + pendingCurrentIndex = -1; else if (isPendingCurrentIndex) q->polish(); } -void QQuickTumblerPrivate::setPendingCurrentIndex(int index) -{ - pendingCurrentIndex = index; -} - -void QQuickTumblerPrivate::setCurrentIndex(int newCurrentIndex, - QQuickTumblerPrivate::PropertyChangeReason changeReason) -{ - Q_Q(QQuickTumbler); - if (newCurrentIndex == currentIndex || newCurrentIndex < -1) - return; - - if (!q->isComponentComplete()) { - // Views can't set currentIndex until they're ready. - setPendingCurrentIndex(newCurrentIndex); - return; - } - - if (modelBeingSet && changeReason == UserChange) { - // If modelBeingSet is true and the user set the currentIndex, - // the model is in the process of being set and the user has set - // the currentIndex in onModelChanged. We have to queue the currentIndex - // change until we're ready. - setPendingCurrentIndex(newCurrentIndex); - return; - } - - // -1 doesn't make sense for a non-empty Tumbler, because unlike - // e.g. ListView, there's always one item selected. - // Wait until the component has finished before enforcing this rule, though, - // because the count might not be known yet. - if ((count > 0 && newCurrentIndex == -1) || (newCurrentIndex >= count)) { - return; - } - - // The view might not have been created yet, as is the case - // if you create a Tumbler component and pass e.g. { currentIndex: 2 } - // to createObject(). - if (view) { - // Only actually set our currentIndex if the view was able to set theirs. - bool couldSet = false; - if (count == 0 && newCurrentIndex == -1) { - // PathView insists on using 0 as the currentIndex when there are no items. - couldSet = true; - } else { - ignoreCurrentIndexChanges = true; - ignoreSignals = true; - view->setProperty("currentIndex", newCurrentIndex); - ignoreSignals = false; - ignoreCurrentIndexChanges = false; - - couldSet = view->property("currentIndex").toInt() == newCurrentIndex; - } - - if (couldSet) { - // The view's currentIndex might not have actually changed, but ours has, - // and that's what user code sees. - currentIndex = newCurrentIndex; - emit q->currentIndexChanged(); - } - } -} - void QQuickTumblerPrivate::setCount(int newCount) { if (newCount == count) @@ -735,7 +649,7 @@ void QQuickTumblerPrivate::setWrapBasedOnCount() { - if (count == 0 || explicitWrap || modelBeingSet) + if (count == 0 || explicitWrap || ignoreWrapChanges) return; setWrap(count >= visibleItemCount, false); @@ -780,17 +694,17 @@ if (q->isComponentComplete() || contentItem) setupViewData(contentItem); - setCurrentIndex(oldCurrentIndex); + q->setCurrentIndex(oldCurrentIndex); } -void QQuickTumblerPrivate::beginSetModel() +void QQuickTumblerPrivate::lockWrap() { - modelBeingSet = true; + ignoreWrapChanges = true; } -void QQuickTumblerPrivate::endSetModel() +void QQuickTumblerPrivate::unlockWrap() { - modelBeingSet = false; + ignoreWrapChanges = false; setWrapBasedOnCount(); } @@ -819,33 +733,30 @@ // If the count is still 0, it's not going to happen. if (d->count == 0) { - d->setPendingCurrentIndex(-1); + d->pendingCurrentIndex = -1; return; } // If there is a pending currentIndex at this stage, it means that // the view wouldn't set our currentIndex in _q_onViewCountChanged // because it wasn't ready. Try one last time here. - d->setCurrentIndex(d->pendingCurrentIndex); + setCurrentIndex(d->pendingCurrentIndex); if (d->currentIndex != d->pendingCurrentIndex && d->currentIndex == -1) { // If we *still* couldn't set it, it's probably invalid. // See if we can at least enforce our rule of "non-negative currentIndex when count > 0" instead. - d->setCurrentIndex(0); + setCurrentIndex(0); } - d->setPendingCurrentIndex(-1); + d->pendingCurrentIndex = -1; } } -QFont QQuickTumbler::defaultFont() const -{ - return QQuickTheme::font(QQuickTheme::Tumbler); -} - -QPalette QQuickTumbler::defaultPalette() const +QQuickTumblerAttachedPrivate::QQuickTumblerAttachedPrivate() + : tumbler(nullptr), + index(-1), + displacement(0) { - return QQuickTheme::palette(QQuickTheme::Tumbler); } void QQuickTumblerAttachedPrivate::init(QQuickItem *delegateItem) @@ -870,9 +781,9 @@ } } -void QQuickTumblerAttachedPrivate::calculateDisplacement() +void QQuickTumblerAttachedPrivate::_q_calculateDisplacement() { - const qreal previousDisplacement = displacement; + const int previousDisplacement = displacement; displacement = 0; if (!tumbler) { @@ -898,7 +809,7 @@ } if (tumblerPrivate->viewContentItemType == QQuickTumblerPrivate::PathViewContentItem) { - const qreal offset = tumblerPrivate->viewOffset; + const qreal offset = tumblerPrivate->view->property("offset").toReal(); displacement = count > 1 ? count - index - offset : 0; // Don't add 1 if count <= visibleItemCount @@ -909,7 +820,7 @@ else if (displacement < -halfVisibleItems) displacement += count; } else { - const qreal contentY = tumblerPrivate->viewContentY; + const qreal contentY = tumblerPrivate->view->property("contentY").toReal(); const qreal delegateH = delegateHeight(tumbler); const qreal preferredHighlightBegin = tumblerPrivate->view->property("preferredHighlightBegin").toReal(); // Tumbler's displacement goes from negative at the top to positive towards the bottom, so we must switch this around. @@ -927,6 +838,11 @@ emit q->displacementChanged(); } +QQuickTumblerAttachedPrivate *QQuickTumblerAttachedPrivate::get(QQuickTumblerAttached *attached) +{ + return attached->d_func(); +} + QQuickTumblerAttached::QQuickTumblerAttached(QObject *parent) : QObject(*(new QQuickTumblerAttachedPrivate), parent) { @@ -949,12 +865,16 @@ if (delegateItem->parentItem() == tumblerPrivate->viewContentItem) { // This item belongs to the "new" view, meaning that the tumbler's contentItem // was probably assigned declaratively. If they're not equal, calling - // calculateDisplacement() would use the old contentItem data, which is bad. - d->calculateDisplacement(); + // _q_calculateDisplacement() would use the old contentItem data, which is bad. + d->_q_calculateDisplacement(); } } } +QQuickTumblerAttached::~QQuickTumblerAttached() +{ +} + /*! \qmlattachedproperty Tumbler QtQuick.Controls::Tumbler::tumbler \readonly diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktumbler_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktumbler_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktumbler_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktumbler_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -100,19 +100,6 @@ // 2.2 (Qt 5.9) bool isMoving() const; - enum PositionMode { - Beginning, - Center, - End, - Visible, // ListView-only - Contain, - SnapPosition - }; - Q_ENUM(PositionMode) - - // 2.5 (Qt 5.12) - Q_REVISION(5) Q_INVOKABLE void positionViewAtIndex(int index, PositionMode mode); - Q_SIGNALS: void modelChanged(); void countChanged(); @@ -132,9 +119,6 @@ void keyPressEvent(QKeyEvent *event) override; void updatePolish() override; - QFont defaultFont() const override; - QPalette defaultPalette() const override; - private: Q_DISABLE_COPY(QQuickTumbler) Q_DECLARE_PRIVATE(QQuickTumbler) @@ -143,8 +127,7 @@ Q_PRIVATE_SLOT(d_func(), void _q_updateItemHeights()) Q_PRIVATE_SLOT(d_func(), void _q_onViewCurrentIndexChanged()) Q_PRIVATE_SLOT(d_func(), void _q_onViewCountChanged()) - Q_PRIVATE_SLOT(d_func(), void _q_onViewOffsetChanged()) - Q_PRIVATE_SLOT(d_func(), void _q_onViewContentYChanged()) + Q_PRIVATE_SLOT(d_func(), void _q_calculateAttachedDisplacements()) }; class QQuickTumblerAttachedPrivate; @@ -152,11 +135,12 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerAttached : public QObject { Q_OBJECT - Q_PROPERTY(QQuickTumbler *tumbler READ tumbler CONSTANT FINAL) + Q_PROPERTY(QQuickTumbler *tumbler READ tumbler CONSTANT) Q_PROPERTY(qreal displacement READ displacement NOTIFY displacementChanged FINAL) public: explicit QQuickTumblerAttached(QObject *parent = nullptr); + ~QQuickTumblerAttached(); QQuickTumbler *tumbler() const; qreal displacement() const; @@ -167,6 +151,8 @@ private: Q_DISABLE_COPY(QQuickTumblerAttached) Q_DECLARE_PRIVATE(QQuickTumblerAttached) + + Q_PRIVATE_SLOT(d_func(), void _q_calculateDisplacement()) }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktumbler_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktumbler_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquicktumbler_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquicktumbler_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -48,16 +48,21 @@ // We mean it. // +#include #include -#include QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerPrivate : public QQuickControlPrivate +class QQuickTumbler; + +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickTumbler) public: + QQuickTumblerPrivate(); + ~QQuickTumblerPrivate(); + enum ContentItemType { NoContentItem, UnsupportedContentItemType, @@ -72,78 +77,60 @@ static QQuickTumblerPrivate *get(QQuickTumbler *tumbler); QVariant model; - QQmlComponent *delegate = nullptr; - int visibleItemCount = 5; - bool wrap = true; - bool explicitWrap = false; - bool modelBeingSet = false; - bool currentIndexSetDuringModelChange = false; - QQuickItem *view = nullptr; - QQuickItem *viewContentItem = nullptr; - ContentItemType viewContentItemType = UnsupportedContentItemType; - union { - qreal viewOffset; // PathView - qreal viewContentY; // ListView - }; - int currentIndex = -1; - int pendingCurrentIndex = -1; - bool ignoreCurrentIndexChanges = false; - int count = 0; - bool ignoreSignals = false; + QQmlComponent *delegate; + int visibleItemCount; + bool wrap; + bool explicitWrap; + bool ignoreWrapChanges; + QQuickItem *view; + QQuickItem *viewContentItem; + ContentItemType viewContentItemType; + int currentIndex; + int pendingCurrentIndex; + bool ignoreCurrentIndexChanges; + int count; + bool ignoreSignals; void _q_updateItemHeights(); void _q_updateItemWidths(); void _q_onViewCurrentIndexChanged(); void _q_onViewCountChanged(); - void _q_onViewOffsetChanged(); - void _q_onViewContentYChanged(); - - void calculateDisplacements(); + void _q_calculateAttachedDisplacements(); void disconnectFromView(); void setupViewData(QQuickItem *newControlContentItem); - void warnAboutIncorrectContentItem(); void syncCurrentIndex(); - void setPendingCurrentIndex(int index); - enum PropertyChangeReason { - UserChange, - InternalChange - }; - - void setCurrentIndex(int newCurrentIndex, PropertyChangeReason changeReason = InternalChange); void setCount(int newCount); void setWrapBasedOnCount(); void setWrap(bool shouldWrap, bool isExplicit); - void beginSetModel(); - void endSetModel(); + void lockWrap(); + void unlockWrap(); void itemChildAdded(QQuickItem *, QQuickItem *) override; void itemChildRemoved(QQuickItem *, QQuickItem *) override; - void itemGeometryChanged(QQuickItem *, QQuickGeometryChange , const QRectF &) override; }; -class QQuickTumblerAttachedPrivate : public QObjectPrivate +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickTumblerAttached) public: - static QQuickTumblerAttachedPrivate *get(QQuickTumblerAttached *attached) - { - return attached->d_func(); - } + QQuickTumblerAttachedPrivate(); void init(QQuickItem *delegateItem); - void calculateDisplacement(); + void _q_calculateDisplacement(); void emitIfDisplacementChanged(qreal oldDisplacement, qreal newDisplacement); + static QQuickTumblerAttachedPrivate *get(QQuickTumblerAttached *attached); + // The Tumbler that contains the delegate. Required to calculated the displacement. QPointer tumbler; // The index of the delegate. Used to calculate the displacement. - int index = -1; + int index; // The displacement for our delegate. - qreal displacement = 0; + qreal displacement; }; QT_END_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickvelocitycalculator.cpp qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickvelocitycalculator.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickvelocitycalculator.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickvelocitycalculator.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -58,6 +58,12 @@ doSomethingElse(); */ +QQuickVelocityCalculator::QQuickVelocityCalculator() + : m_point1Timestamp(0), + m_point2Timestamp(0) +{ +} + void QQuickVelocityCalculator::startMeasuring(const QPointF &point1, qint64 timestamp) { m_point1 = point1; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickvelocitycalculator_p_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickvelocitycalculator_p_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qquickvelocitycalculator_p_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qquickvelocitycalculator_p_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -56,6 +56,8 @@ class QQuickVelocityCalculator { public: + QQuickVelocityCalculator(); + void startMeasuring(const QPointF &point1, qint64 timestamp = 0); void stopMeasuring(const QPointF &m_point2, qint64 timestamp = 0); void reset(); @@ -64,8 +66,8 @@ private: QPointF m_point1; QPointF m_point2; - qint64 m_point1Timestamp = 0; - qint64 m_point2Timestamp = 0; + qint64 m_point1Timestamp; + qint64 m_point2Timestamp; // When a timestamp isn't available, we must use a timer. // When stopMeasuring() has been called, we store the elapsed time in point2timestamp. QElapsedTimer m_timer; diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qtquicktemplates2global_p.h qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qtquicktemplates2global_p.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/qtquicktemplates2global_p.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/qtquicktemplates2global_p.h 2018-03-21 07:59:29.000000000 +0000 @@ -49,7 +49,6 @@ // #include -#include #include QT_BEGIN_NAMESPACE diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/quicktemplates2.pri qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/quicktemplates2.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/quicktemplates2.pri 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/quicktemplates2.pri 2018-03-21 07:59:29.000000000 +0000 @@ -3,8 +3,6 @@ HEADERS += \ $$PWD/qquickabstractbutton_p.h \ $$PWD/qquickabstractbutton_p_p.h \ - $$PWD/qquickaction_p.h \ - $$PWD/qquickactiongroup_p.h \ $$PWD/qquickapplicationwindow_p.h \ $$PWD/qquickbusyindicator_p.h \ $$PWD/qquickbutton_p.h \ @@ -15,7 +13,6 @@ $$PWD/qquickcombobox_p.h \ $$PWD/qquickcontainer_p.h \ $$PWD/qquickcontainer_p_p.h \ - $$PWD/qquickcontentitem_p.h \ $$PWD/qquickcontrol_p.h \ $$PWD/qquickcontrol_p_p.h \ $$PWD/qquickdeferredexecute_p_p.h \ @@ -31,33 +28,23 @@ $$PWD/qquickframe_p.h \ $$PWD/qquickframe_p_p.h \ $$PWD/qquickgroupbox_p.h \ - $$PWD/qquickicon_p.h \ $$PWD/qquickitemdelegate_p.h \ $$PWD/qquickitemdelegate_p_p.h \ $$PWD/qquicklabel_p.h \ $$PWD/qquicklabel_p_p.h \ $$PWD/qquickmenu_p.h \ $$PWD/qquickmenu_p_p.h \ - $$PWD/qquickmenubar_p.h \ - $$PWD/qquickmenubar_p_p.h \ - $$PWD/qquickmenubaritem_p.h \ - $$PWD/qquickmenubaritem_p_p.h \ $$PWD/qquickmenuitem_p.h \ - $$PWD/qquickmenuitem_p_p.h \ $$PWD/qquickmenuseparator_p.h \ $$PWD/qquickoverlay_p.h \ $$PWD/qquickoverlay_p_p.h \ $$PWD/qquickpage_p.h \ - $$PWD/qquickpage_p_p.h \ $$PWD/qquickpageindicator_p.h \ - $$PWD/qquickpalette_p.h \ - $$PWD/qquickpaletteprovider_p.h \ + $$PWD/qquickpagelayout_p_p.h \ $$PWD/qquickpane_p.h \ $$PWD/qquickpane_p_p.h \ $$PWD/qquickpopup_p.h \ $$PWD/qquickpopup_p_p.h \ - $$PWD/qquickpopupanchors_p.h \ - $$PWD/qquickpopupanchors_p_p.h \ $$PWD/qquickpopupitem_p_p.h \ $$PWD/qquickpopuppositioner_p_p.h \ $$PWD/qquickpresshandler_p_p.h \ @@ -89,8 +76,6 @@ $$PWD/qquicktextarea_p_p.h \ $$PWD/qquicktextfield_p.h \ $$PWD/qquicktextfield_p_p.h \ - $$PWD/qquicktheme_p.h \ - $$PWD/qquicktheme_p_p.h \ $$PWD/qquicktoolbar_p.h \ $$PWD/qquicktoolbutton_p.h \ $$PWD/qquicktoolseparator_p.h \ @@ -99,8 +84,6 @@ SOURCES += \ $$PWD/qquickabstractbutton.cpp \ - $$PWD/qquickaction.cpp \ - $$PWD/qquickactiongroup.cpp \ $$PWD/qquickapplicationwindow.cpp \ $$PWD/qquickbusyindicator.cpp \ $$PWD/qquickbutton.cpp \ @@ -109,7 +92,6 @@ $$PWD/qquickcheckdelegate.cpp \ $$PWD/qquickcombobox.cpp \ $$PWD/qquickcontainer.cpp \ - $$PWD/qquickcontentitem.cpp \ $$PWD/qquickcontrol.cpp \ $$PWD/qquickdeferredexecute.cpp \ $$PWD/qquickdelaybutton.cpp \ @@ -119,22 +101,17 @@ $$PWD/qquickdrawer.cpp \ $$PWD/qquickframe.cpp \ $$PWD/qquickgroupbox.cpp \ - $$PWD/qquickicon.cpp \ $$PWD/qquickitemdelegate.cpp \ $$PWD/qquicklabel.cpp \ $$PWD/qquickmenu.cpp \ - $$PWD/qquickmenubar.cpp \ - $$PWD/qquickmenubaritem.cpp \ $$PWD/qquickmenuitem.cpp \ $$PWD/qquickmenuseparator.cpp \ $$PWD/qquickoverlay.cpp \ $$PWD/qquickpage.cpp \ $$PWD/qquickpageindicator.cpp \ - $$PWD/qquickpalette.cpp \ - $$PWD/qquickpaletteprovider.cpp \ + $$PWD/qquickpagelayout.cpp \ $$PWD/qquickpane.cpp \ $$PWD/qquickpopup.cpp \ - $$PWD/qquickpopupanchors.cpp \ $$PWD/qquickpopupitem.cpp \ $$PWD/qquickpopuppositioner.cpp \ $$PWD/qquickpresshandler.cpp \ @@ -161,7 +138,6 @@ $$PWD/qquicktabbutton.cpp \ $$PWD/qquicktextarea.cpp \ $$PWD/qquicktextfield.cpp \ - $$PWD/qquicktheme.cpp \ $$PWD/qquicktoolbar.cpp \ $$PWD/qquicktoolbutton.cpp \ $$PWD/qquicktoolseparator.cpp \ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/quicktemplates2.pro qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/quicktemplates2.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/src/quicktemplates2/quicktemplates2.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/src/quicktemplates2/quicktemplates2.pro 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,6 @@ TARGET = QtQuickTemplates2 MODULE = quicktemplates2 +CONFIG += internal_module QT += quick QT_PRIVATE += core-private gui-private qml-private quick-private diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/.tag qtquickcontrols2-opensource-src-5.9.5/.tag --- qtquickcontrols2-opensource-src-5.12.5+dfsg/.tag 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/.tag 2018-03-21 07:59:29.000000000 +0000 @@ -1 +1 @@ -6a3356dfd8a98131d2912d16c666419d5eeaa10e +c51eea88704938fec93632c01d32c4587a6da015 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/abstractbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/abstractbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/abstractbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/abstractbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.0 AbstractButton { text: "AbstractButton" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/busyindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/busyindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/busyindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/busyindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 BusyIndicator { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Button { text: "Button" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/checkbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/checkbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/checkbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/checkbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 CheckBox { text: "CheckBox" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/checkdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/checkdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/checkdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/checkdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 CheckDelegate { text: "CheckDelegate" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/combobox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/combobox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/combobox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/combobox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 ComboBox { model: ["ComboBox"] diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/container.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/container.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/container.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/container.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.0 Container { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/control.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/control.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Control { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/dayofweekrow-2.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/dayofweekrow-2.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/dayofweekrow-2.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/dayofweekrow-2.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 +import QtQuick 2.5 import Qt.labs.calendar 1.0 DayOfWeekRow { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/dayofweekrow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/dayofweekrow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/dayofweekrow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/dayofweekrow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 +import QtQuick 2.5 import Qt.labs.calendar 1.0 DayOfWeekRow { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/dialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Dialog { title: "Dialog" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/dial.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/dial.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Dial { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/drawer.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.0 Drawer { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/frame.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Frame { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/groupbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/groupbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/groupbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/groupbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 GroupBox { title: "GroupBox" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/itemdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/itemdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/itemdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/itemdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 ItemDelegate { text: "ItemDelegate" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/label.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Label { text: "Label" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/menuitem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/menuitem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/menuitem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/menuitem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 MenuItem { text: "MenuItem" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/menu.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Menu { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/monthgrid-2.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/monthgrid-2.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/monthgrid-2.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/monthgrid-2.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 +import QtQuick 2.5 import Qt.labs.calendar 1.0 MonthGrid { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/monthgrid.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/monthgrid.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/monthgrid.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/monthgrid.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 +import QtQuick 2.5 import Qt.labs.calendar 1.0 MonthGrid { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/pageindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/pageindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/pageindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/pageindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 PageIndicator { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/page.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/page.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Page { title: "Page" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/pane.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Pane { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/popup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Popup { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/progressbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/progressbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/progressbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/progressbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 ProgressBar { from: 0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/radiobutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/radiobutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/radiobutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/radiobutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 RadioButton { text: "RadioButton" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/radiodelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/radiodelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/radiodelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/radiodelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.0 RadioDelegate { text: "RadioDelegate" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/rangeslider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/rangeslider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/rangeslider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/rangeslider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 RangeSlider { from: 0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/roundbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/roundbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/roundbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/roundbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 RoundButton { text: "RoundButton" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/scrollbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/scrollbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/scrollbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/scrollbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 ScrollBar { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/scrollindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/scrollindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/scrollindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/scrollindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 ScrollIndicator { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/slider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Slider { from: 0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/spinbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/spinbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/spinbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/spinbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 SpinBox { from: 0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/stackview.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/stackview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/stackview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/stackview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.0 StackView { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/swipedelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/swipedelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/swipedelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/swipedelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.0 SwipeDelegate { text: "SwipeDelegate" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/swipeview.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/swipeview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/swipeview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/swipeview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.0 SwipeView { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/switchdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/switchdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/switchdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/switchdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 SwitchDelegate { text: "SwitchDelegate" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/switch.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Switch { text: "Switch" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/tabbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/tabbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/tabbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/tabbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 TabBar { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/tabbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/tabbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/tabbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/tabbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 TabButton { text: "TabButton" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/textarea.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/textarea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/textarea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/textarea.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 TextArea { text: "TextArea" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/textfield.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/textfield.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/textfield.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/textfield.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 TextField { text: "TextField" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/toolbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/toolbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/toolbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/toolbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 ToolBar { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/toolbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/toolbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/toolbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/toolbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 ToolButton { text: "ToolButton" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/tooltip.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/tooltip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/tooltip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/tooltip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 ToolTip { text: "ToolTip" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/tumbler.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/tumbler.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.0 Tumbler { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/weeknumbercolumn-2.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/weeknumbercolumn-2.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/weeknumbercolumn-2.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/weeknumbercolumn-2.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 +import QtQuick 2.5 import Qt.labs.calendar 1.0 WeekNumberColumn { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/weeknumbercolumn.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/weeknumbercolumn.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/data/weeknumbercolumn.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/data/weeknumbercolumn.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 +import QtQuick 2.5 import Qt.labs.calendar 1.0 WeekNumberColumn { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/tst_accessibility.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/tst_accessibility.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/accessibility/tst_accessibility.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/accessibility/tst_accessibility.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -43,9 +43,6 @@ #include "../shared/util.h" #if QT_CONFIG(accessibility) -#include -#include -#include #include #endif @@ -64,70 +61,72 @@ void tst_accessibility::a11y_data() { QTest::addColumn("name"); - QTest::addColumn("role"); + QTest::addColumn("role"); QTest::addColumn("text"); - QTest::newRow("AbstractButton") << "abstractbutton" << QAccessible::Button << "AbstractButton"; - QTest::newRow("BusyIndicator") << "busyindicator" << QAccessible::Indicator << ""; - QTest::newRow("Button") << "button" << QAccessible::Button << "Button"; - QTest::newRow("CheckBox") << "checkbox" << QAccessible::CheckBox << "CheckBox"; - QTest::newRow("CheckDelegate") << "checkdelegate" << QAccessible::CheckBox << "CheckDelegate"; - QTest::newRow("ComboBox") << "combobox" << QAccessible::ComboBox << "ComboBox"; - QTest::newRow("Container") << "container" << QAccessible::NoRole << ""; - QTest::newRow("Control") << "control" << QAccessible::NoRole << ""; - QTest::newRow("Dial") << "dial" << QAccessible::Dial << ""; - QTest::newRow("Dialog") << "dialog" << QAccessible::Dialog << "Dialog"; - QTest::newRow("Drawer") << "drawer" << QAccessible::Dialog << ""; - QTest::newRow("Frame") << "frame" << QAccessible::Border << ""; - QTest::newRow("GroupBox") << "groupbox" << QAccessible::Grouping << "GroupBox"; - QTest::newRow("ItemDelegate") << "itemdelegate" << QAccessible::ListItem << "ItemDelegate"; - QTest::newRow("Label") << "label" << QAccessible::StaticText << "Label"; - QTest::newRow("Menu") << "menu" << QAccessible::PopupMenu << ""; - QTest::newRow("MenuItem") << "menuitem" << QAccessible::MenuItem << "MenuItem"; - QTest::newRow("Page") << "page" << QAccessible::PageTab << "Page"; - QTest::newRow("PageIndicator") << "pageindicator" << QAccessible::Indicator << ""; - QTest::newRow("Pane") << "pane" << QAccessible::Pane << ""; - QTest::newRow("Popup") << "popup" << QAccessible::Dialog << ""; - QTest::newRow("ProgressBar") << "progressbar" << QAccessible::ProgressBar << ""; - QTest::newRow("RadioButton") << "radiobutton" << QAccessible::RadioButton << "RadioButton"; - QTest::newRow("RadioDelegate") << "radiodelegate" << QAccessible::RadioButton << "RadioDelegate"; - QTest::newRow("RangeSlider") << "rangeslider" << QAccessible::Slider << ""; - QTest::newRow("RoundButton") << "roundbutton" << QAccessible::Button << "RoundButton"; - QTest::newRow("ScrollBar") << "scrollbar" << QAccessible::ScrollBar << ""; - QTest::newRow("ScrollIndicator") << "scrollindicator" << QAccessible::Indicator << ""; - QTest::newRow("Slider") << "slider" << QAccessible::Slider << ""; - QTest::newRow("SpinBox") << "spinbox" << QAccessible::SpinBox << ""; - QTest::newRow("StackView") << "stackview" << QAccessible::LayeredPane << ""; - QTest::newRow("SwipeDelegate") << "swipedelegate" << QAccessible::ListItem << "SwipeDelegate"; - QTest::newRow("SwipeView") << "swipeview" << QAccessible::PageTabList << ""; - QTest::newRow("Switch") << "switch" << QAccessible::CheckBox << "Switch"; - QTest::newRow("SwitchDelegate") << "switchdelegate" << QAccessible::ListItem << "SwitchDelegate"; - QTest::newRow("TabBar") << "tabbar" << QAccessible::PageTabList << ""; - QTest::newRow("TabButton") << "tabbutton" << QAccessible::PageTab << "TabButton"; - QTest::newRow("TextArea") << "textarea" << QAccessible::EditableText << ""; - QTest::newRow("TextField") << "textfield" << QAccessible::EditableText << ""; - QTest::newRow("ToolBar") << "toolbar" << QAccessible::ToolBar << ""; - QTest::newRow("ToolButton") << "toolbutton" << QAccessible::Button << "ToolButton"; - QTest::newRow("ToolTip") << "tooltip" << QAccessible::ToolTip << "ToolTip"; - QTest::newRow("Tumbler") << "tumbler" << QAccessible::NoRole << ""; // TODO - - QTest::newRow("DayOfWeekRow") << "dayofweekrow" << QAccessible::NoRole << "DayOfWeekRow"; - QTest::newRow("MonthGrid") << "monthgrid" << QAccessible::NoRole << "MonthGrid"; - QTest::newRow("WeekNumberColumn") << "weeknumbercolumn" << QAccessible::NoRole << "WeekNumberColumn"; + QTest::newRow("AbstractButton") << "abstractbutton" << 0x0000002B << "AbstractButton"; //QAccessible::Button + QTest::newRow("BusyIndicator") << "busyindicator" << 0x00000027 << ""; //QAccessible::Indicator + QTest::newRow("Button") << "button" << 0x0000002B << "Button"; //QAccessible::Button + QTest::newRow("CheckBox") << "checkbox" << 0x0000002C << "CheckBox"; //QAccessible::CheckBox + QTest::newRow("CheckDelegate") << "checkdelegate" << 0x0000002C << "CheckDelegate"; //QAccessible::CheckBox + QTest::newRow("ComboBox") << "combobox" << 0x0000002E << "ComboBox"; //QAccessible::ComboBox + QTest::newRow("Container") << "container" << 0x00000000 << ""; //QAccessible::NoRole + QTest::newRow("Control") << "control" << 0x00000000 << ""; //QAccessible::NoRole + QTest::newRow("Dial") << "dial" << 0x00000031 << ""; //QAccessible::Dial + QTest::newRow("Dialog") << "dialog" << 0x00000012 << "Dialog"; //QAccessible::Dialog + QTest::newRow("Drawer") << "drawer" << 0x00000012 << ""; //QAccessible::Dialog + QTest::newRow("Frame") << "frame" << 0x00000013 << ""; //QAccessible::Border + QTest::newRow("GroupBox") << "groupbox" << 0x00000014 << "GroupBox"; //QAccessible::Grouping + QTest::newRow("ItemDelegate") << "itemdelegate" << 0x00000022 << "ItemDelegate"; //QAccessible::ListItem + QTest::newRow("Label") << "label" << 0x00000029 << "Label"; //QAccessible::StaticText + QTest::newRow("Menu") << "menu" << 0x0000000B << ""; //QAccessible::PopupMenu + QTest::newRow("MenuItem") << "menuitem" << 0x0000000C << "MenuItem"; //QAccessible::MenuItem + QTest::newRow("Page") << "page" << 0x00000025 << "Page"; //QAccessible::PageTab + QTest::newRow("PageIndicator") << "pageindicator" << 0x00000027 << ""; //QAccessible::Indicator + QTest::newRow("Pane") << "pane" << 0x00000010 << ""; //QAccessible::Pane + QTest::newRow("Popup") << "popup" << 0x00000012 << ""; //QAccessible::Dialog + QTest::newRow("ProgressBar") << "progressbar" << 0x00000030 << ""; //QAccessible::ProgressBar + QTest::newRow("RadioButton") << "radiobutton" << 0x0000002D << "RadioButton"; //QAccessible::RadioButton + QTest::newRow("RadioDelegate") << "radiodelegate" << 0x0000002D << "RadioDelegate"; //QAccessible::RadioButton + QTest::newRow("RangeSlider") << "rangeslider" << 0x00000033 << ""; //QAccessible::Slider + QTest::newRow("RoundButton") << "roundbutton" << 0x0000002B << "RoundButton"; //QAccessible::Button + QTest::newRow("ScrollBar") << "scrollbar" << 0x00000003 << ""; //QAccessible::ScrollBar + QTest::newRow("ScrollIndicator") << "scrollindicator" << 0x00000027 << ""; //QAccessible::Indicator + QTest::newRow("Slider") << "slider" << 0x00000033 << ""; //QAccessible::Slider + QTest::newRow("SpinBox") << "spinbox" << 0x00000034 << ""; //QAccessible::SpinBox + QTest::newRow("StackView") << "stackview" << 0x00000080 << ""; //QAccessible::LayeredPane + QTest::newRow("SwipeDelegate") << "swipedelegate" << 0x00000022 << "SwipeDelegate"; //QAccessible::ListItem + QTest::newRow("SwipeView") << "swipeview" << 0x0000003C << ""; //QAccessible::Pane + QTest::newRow("Switch") << "switch" << 0x0000002B << "Switch"; //QAccessible::Button + QTest::newRow("SwitchDelegate") << "switchdelegate" << 0x00000022 << "SwitchDelegate"; //QAccessible::ListItem + QTest::newRow("TabBar") << "tabbar" << 0x0000003C << ""; //QAccessible::PageTabList + QTest::newRow("TabButton") << "tabbutton" << 0x00000025 << "TabButton"; //QAccessible::PageTab + QTest::newRow("TextArea") << "textarea" << 0x0000002A << ""; //QAccessible::Accessible.EditableText + QTest::newRow("TextField") << "textfield" << 0x0000002A << ""; //QAccessible::Accessible.EditableText + QTest::newRow("ToolBar") << "toolbar" << 0x00000016 << ""; //QAccessible::ToolBar + QTest::newRow("ToolButton") << "toolbutton" << 0x0000002B << "ToolButton"; //QAccessible::Button + QTest::newRow("ToolTip") << "tooltip" << 0x0000000D << "ToolTip"; //QAccessible::ToolTip + QTest::newRow("Tumbler") << "tumbler" << 0x00000000 << ""; //QAccessible::NoRole (TODO) + + QTest::newRow("DayOfWeekRow") << "dayofweekrow" << 0x0 << "DayOfWeekRow"; //QAccessible::NoRole + QTest::newRow("MonthGrid") << "monthgrid" << 0x0 << "MonthGrid"; //QAccessible::NoRole + QTest::newRow("WeekNumberColumn") << "weeknumbercolumn" << 0x0 << "WeekNumberColumn"; //QAccessible::NoRole } #if QT_CONFIG(accessibility) -static QPlatformAccessibility *platformAccessibility() +static QQuickAccessibleAttached *accessibleAttached(QQuickItem *item) { - QPlatformIntegration *pfIntegration = QGuiApplicationPrivate::platformIntegration(); - return pfIntegration ? pfIntegration->accessibility() : nullptr; + QQuickAccessibleAttached *acc = qobject_cast(qmlAttachedPropertiesObject(item, false)); + if (!acc) + acc = item->findChild(); + return acc; } #endif void tst_accessibility::a11y() { QFETCH(QString, name); - QFETCH(QAccessible::Role, role); + QFETCH(int, role); QFETCH(QString, text); QString fn = name; @@ -153,7 +152,7 @@ QVERIFY(item); #if QT_CONFIG(accessibility) - QQuickAccessibleAttached *acc = QQuickAccessibleAttached::attachedProperties(item); + QQuickAccessibleAttached *acc = accessibleAttached(item); if (name != QLatin1Literal("dayofweekrow") && name != QLatin1Literal("monthgrid") && name != QLatin1Literal("weeknumbercolumn")) { @@ -161,19 +160,18 @@ QVERIFY(acc); } else { QVERIFY(!acc); - QPlatformAccessibility *accessibility = platformAccessibility(); - if (!accessibility) - QSKIP("No QPlatformAccessibility available."); - accessibility->setActive(true); - acc = QQuickAccessibleAttached::attachedProperties(item); + QAccessible::setActive(true); + acc = accessibleAttached(item); } } QVERIFY(acc); - QCOMPARE(acc->role(), role); + QCOMPARE(acc->role(), (QAccessible::Role)role); QCOMPARE(acc->name(), text); #else Q_UNUSED(role) Q_UNUSED(text) + QObject *acc = qmlAttachedPropertiesObject(item, false); + QVERIFY(!acc); #endif } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/auto.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/auto.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/auto.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/auto.pro 2018-03-21 07:59:29.000000000 +0000 @@ -5,23 +5,15 @@ controls \ cursor \ customization \ - designer \ focus \ font \ - palette \ platform \ pressandhold \ qquickapplicationwindow \ - qquickcolor \ qquickdrawer \ - qquickiconimage \ - qquickiconlabel \ - qquickimaginestyle \ qquickmaterialstyle \ qquickmaterialstyleconf \ qquickmenu \ - qquickmenubar \ - qquickninepatchimage \ qquickpopup \ qquickstyle \ qquickstyleselector \ @@ -30,3 +22,9 @@ revisions \ sanity \ snippets + +# QTBUG-60268 +boot2qt: SUBDIRS -= qquickapplicationwindow calendar controls cursor customization \ + qquickdrawer focus font qquickmenu platform qquickpopup qquickmaterialstyle \ + qquickmaterialstyleconf qquickuniversalstyle \ + qquickuniversalstyleconf snippets diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt qtquickcontrols2-opensource-src-5.9.5/tests/auto/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,10983 +0,0 @@ -Class std::__failure_type - size=1 align=1 - base size=0 base align=1 -std::__failure_type (0x0x7fba168d6720) 0 empty - -Class std::__do_is_destructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_destructible_impl (0x0x7fba16930ea0) 0 empty - -Class std::__do_is_nt_destructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_nt_destructible_impl (0x0x7fba1645e120) 0 empty - -Class std::__do_is_default_constructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_default_constructible_impl (0x0x7fba1645e360) 0 empty - -Class std::__do_is_static_castable_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_static_castable_impl (0x0x7fba1645e5a0) 0 empty - -Class std::__do_is_direct_constructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_direct_constructible_impl (0x0x7fba1645e720) 0 empty - -Class std::__do_is_nary_constructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_nary_constructible_impl (0x0x7fba1645eae0) 0 empty - -Class std::__do_common_type_impl - size=1 align=1 - base size=0 base align=1 -std::__do_common_type_impl (0x0x7fba165172a0) 0 empty - -Class std::__do_member_type_wrapper - size=1 align=1 - base size=0 base align=1 -std::__do_member_type_wrapper (0x0x7fba16517360) 0 empty - -Class std::__result_of_memfun_ref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memfun_ref_impl (0x0x7fba165176c0) 0 empty - -Class std::__result_of_memfun_deref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memfun_deref_impl (0x0x7fba16517780) 0 empty - -Class std::__result_of_memobj_ref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memobj_ref_impl (0x0x7fba16517840) 0 empty - -Class std::__result_of_memobj_deref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memobj_deref_impl (0x0x7fba16517900) 0 empty - -Class std::__result_of_other_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_other_impl (0x0x7fba16517ba0) 0 empty - -Class std::piecewise_construct_t - size=1 align=1 - base size=0 base align=1 -std::piecewise_construct_t (0x0x7fba16517d80) 0 empty - -Class std::__true_type - size=1 align=1 - base size=0 base align=1 -std::__true_type (0x0x7fba16595240) 0 empty - -Class std::__false_type - size=1 align=1 - base size=0 base align=1 -std::__false_type (0x0x7fba165952a0) 0 empty - -Class std::input_iterator_tag - size=1 align=1 - base size=0 base align=1 -std::input_iterator_tag (0x0x7fba165cff00) 0 empty - -Class std::output_iterator_tag - size=1 align=1 - base size=0 base align=1 -std::output_iterator_tag (0x0x7fba165cff60) 0 empty - -Class std::forward_iterator_tag - size=1 align=1 - base size=1 base align=1 -std::forward_iterator_tag (0x0x7fba16547340) 0 empty - std::input_iterator_tag (0x0x7fba165fe000) 0 empty - -Class std::bidirectional_iterator_tag - size=1 align=1 - base size=1 base align=1 -std::bidirectional_iterator_tag (0x0x7fba165473a8) 0 empty - std::forward_iterator_tag (0x0x7fba16547410) 0 empty - std::input_iterator_tag (0x0x7fba165fe060) 0 empty - -Class std::random_access_iterator_tag - size=1 align=1 - base size=1 base align=1 -std::random_access_iterator_tag (0x0x7fba16547478) 0 empty - std::bidirectional_iterator_tag (0x0x7fba165474e0) 0 empty - std::forward_iterator_tag (0x0x7fba16547548) 0 empty - std::input_iterator_tag (0x0x7fba165fe0c0) 0 empty - -Class __gnu_cxx::__ops::_Iter_less_iter - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_less_iter (0x0x7fba165fed20) 0 empty - -Class __gnu_cxx::__ops::_Iter_less_val - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_less_val (0x0x7fba165fed80) 0 empty - -Class __gnu_cxx::__ops::_Val_less_iter - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Val_less_iter (0x0x7fba165fede0) 0 empty - -Class __gnu_cxx::__ops::_Iter_equal_to_iter - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_equal_to_iter (0x0x7fba165fee40) 0 empty - -Class __gnu_cxx::__ops::_Iter_equal_to_val - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_equal_to_val (0x0x7fba165feea0) 0 empty - -Class wait - size=4 align=4 - base size=4 base align=4 -wait (0x0x7fba162c19c0) 0 - -Class __locale_struct - size=232 align=8 - base size=232 base align=8 -__locale_struct (0x0x7fba162c1c00) 0 - -Class timespec - size=16 align=8 - base size=16 base align=8 -timespec (0x0x7fba162c1cc0) 0 - -Class timeval - size=16 align=8 - base size=16 base align=8 -timeval (0x0x7fba162c1d20) 0 - -Class pthread_attr_t - size=56 align=8 - base size=56 base align=8 -pthread_attr_t (0x0x7fba162c1de0) 0 - -Class __pthread_internal_list - size=16 align=8 - base size=16 base align=8 -__pthread_internal_list (0x0x7fba162c1e40) 0 - -Class random_data - size=48 align=8 - base size=48 base align=8 -random_data (0x0x7fba16365300) 0 - -Class drand48_data - size=24 align=8 - base size=24 base align=8 -drand48_data (0x0x7fba16365360) 0 - -Vtable for std::exception -std::exception::_ZTVSt9exception: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt9exception) -16 (int (*)(...))std::exception::~exception -24 (int (*)(...))std::exception::~exception -32 (int (*)(...))std::exception::what - -Class std::exception - size=8 align=8 - base size=8 base align=8 -std::exception (0x0x7fba163653c0) 0 nearly-empty - vptr=((& std::exception::_ZTVSt9exception) + 16u) - -Vtable for std::bad_exception -std::bad_exception::_ZTVSt13bad_exception: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13bad_exception) -16 (int (*)(...))std::bad_exception::~bad_exception -24 (int (*)(...))std::bad_exception::~bad_exception -32 (int (*)(...))std::bad_exception::what - -Class std::bad_exception - size=8 align=8 - base size=8 base align=8 -std::bad_exception (0x0x7fba16547a90) 0 nearly-empty - vptr=((& std::bad_exception::_ZTVSt13bad_exception) + 16u) - std::exception (0x0x7fba16365420) 0 nearly-empty - primary-for std::bad_exception (0x0x7fba16547a90) - -Class std::__exception_ptr::exception_ptr - size=8 align=8 - base size=8 base align=8 -std::__exception_ptr::exception_ptr (0x0x7fba16365480) 0 - -Vtable for std::nested_exception -std::nested_exception::_ZTVSt16nested_exception: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt16nested_exception) -16 (int (*)(...))std::nested_exception::~nested_exception -24 (int (*)(...))std::nested_exception::~nested_exception - -Class std::nested_exception - size=16 align=8 - base size=16 base align=8 -std::nested_exception (0x0x7fba163654e0) 0 - vptr=((& std::nested_exception::_ZTVSt16nested_exception) + 16u) - -Vtable for std::bad_alloc -std::bad_alloc::_ZTVSt9bad_alloc: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt9bad_alloc) -16 (int (*)(...))std::bad_alloc::~bad_alloc -24 (int (*)(...))std::bad_alloc::~bad_alloc -32 (int (*)(...))std::bad_alloc::what - -Class std::bad_alloc - size=8 align=8 - base size=8 base align=8 -std::bad_alloc (0x0x7fba16547c98) 0 nearly-empty - vptr=((& std::bad_alloc::_ZTVSt9bad_alloc) + 16u) - std::exception (0x0x7fba16365900) 0 nearly-empty - primary-for std::bad_alloc (0x0x7fba16547c98) - -Vtable for std::bad_array_new_length -std::bad_array_new_length::_ZTVSt20bad_array_new_length: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt20bad_array_new_length) -16 (int (*)(...))std::bad_array_new_length::~bad_array_new_length -24 (int (*)(...))std::bad_array_new_length::~bad_array_new_length -32 (int (*)(...))std::bad_array_new_length::what - -Class std::bad_array_new_length - size=8 align=8 - base size=8 base align=8 -std::bad_array_new_length (0x0x7fba16547d00) 0 nearly-empty - vptr=((& std::bad_array_new_length::_ZTVSt20bad_array_new_length) + 16u) - std::bad_alloc (0x0x7fba16547d68) 0 nearly-empty - primary-for std::bad_array_new_length (0x0x7fba16547d00) - std::exception (0x0x7fba16365960) 0 nearly-empty - primary-for std::bad_alloc (0x0x7fba16547d68) - -Class std::nothrow_t - size=1 align=1 - base size=0 base align=1 -std::nothrow_t (0x0x7fba163659c0) 0 empty - -Class __exception - size=40 align=8 - base size=40 base align=8 -__exception (0x0x7fba160da600) 0 - -Class lconv - size=96 align=8 - base size=96 base align=8 -lconv (0x0x7fba15eec300) 0 - -Vtable for __cxxabiv1::__forced_unwind -__cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN10__cxxabiv115__forced_unwindE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class __cxxabiv1::__forced_unwind - size=8 align=8 - base size=8 base align=8 -__cxxabiv1::__forced_unwind (0x0x7fba15eec360) 0 nearly-empty - vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 16u) - -Class sched_param - size=4 align=4 - base size=4 base align=4 -sched_param (0x0x7fba15f8d240) 0 - -Class __sched_param - size=4 align=4 - base size=4 base align=4 -__sched_param (0x0x7fba15f8d2a0) 0 - -Class timex - size=208 align=8 - base size=208 base align=8 -timex (0x0x7fba15f8d360) 0 - -Class tm - size=56 align=8 - base size=56 base align=8 -tm (0x0x7fba15f8d3c0) 0 - -Class itimerspec - size=32 align=8 - base size=32 base align=8 -itimerspec (0x0x7fba15f8d420) 0 - -Class _pthread_cleanup_buffer - size=32 align=8 - base size=32 base align=8 -_pthread_cleanup_buffer (0x0x7fba15f8d480) 0 - -Class __pthread_cleanup_frame - size=24 align=8 - base size=24 base align=8 -__pthread_cleanup_frame (0x0x7fba15f8d5a0) 0 - -Class __pthread_cleanup_class - size=24 align=8 - base size=24 base align=8 -__pthread_cleanup_class (0x0x7fba15f8d600) 0 - -Class _IO_marker - size=24 align=8 - base size=24 base align=8 -_IO_marker (0x0x7fba15f8da20) 0 - -Class _IO_FILE - size=216 align=8 - base size=216 base align=8 -_IO_FILE (0x0x7fba15f8da80) 0 - -Class std::_Hash_impl - size=1 align=1 - base size=0 base align=1 -std::_Hash_impl (0x0x7fba15aac2a0) 0 empty - -Class std::_Fnv_hash_impl - size=1 align=1 - base size=0 base align=1 -std::_Fnv_hash_impl (0x0x7fba15aac300) 0 empty - -Class std::__numeric_limits_base - size=1 align=1 - base size=0 base align=1 -std::__numeric_limits_base (0x0x7fba15b7d2a0) 0 empty - -Class std::_Bit_reference - size=16 align=8 - base size=16 base align=8 -std::_Bit_reference (0x0x7fba159350c0) 0 - -Class std::_Bit_iterator_base - size=16 align=8 - base size=12 base align=8 -std::_Bit_iterator_base (0x0x7fba15ac6af8) 0 - std::iterator (0x0x7fba15935180) 0 empty - -Class std::_Bit_iterator - size=16 align=8 - base size=12 base align=8 -std::_Bit_iterator (0x0x7fba15ac6b60) 0 - std::_Bit_iterator_base (0x0x7fba15ac6bc8) 0 - std::iterator (0x0x7fba159351e0) 0 empty - -Class std::_Bit_const_iterator - size=16 align=8 - base size=12 base align=8 -std::_Bit_const_iterator (0x0x7fba15ac6c30) 0 - std::_Bit_iterator_base (0x0x7fba15ac6c98) 0 - std::iterator (0x0x7fba15935240) 0 empty - -Class std::random_device - size=5000 align=8 - base size=5000 base align=8 -std::random_device (0x0x7fba15756060) 0 - -Class std::bernoulli_distribution::param_type - size=8 align=8 - base size=8 base align=8 -std::bernoulli_distribution::param_type (0x0x7fba15756de0) 0 - -Class std::bernoulli_distribution - size=8 align=8 - base size=8 base align=8 -std::bernoulli_distribution (0x0x7fba15756d80) 0 - -Class std::seed_seq - size=24 align=8 - base size=24 base align=8 -std::seed_seq (0x0x7fba1549fd80) 0 - -Class qIsNull(double)::U - size=8 align=8 - base size=8 base align=8 -qIsNull(double)::U (0x0x7fba140858a0) 0 - -Class qIsNull(float)::U - size=4 align=4 - base size=4 base align=4 -qIsNull(float)::U (0x0x7fba14085900) 0 - -Class QSysInfo - size=1 align=1 - base size=0 base align=1 -QSysInfo (0x0x7fba1416e3c0) 0 empty - -Class QMessageLogContext - size=32 align=8 - base size=32 base align=8 -QMessageLogContext (0x0x7fba1416e420) 0 - -Class QMessageLogger - size=32 align=8 - base size=32 base align=8 -QMessageLogger (0x0x7fba1416e480) 0 - -Class QFlag - size=4 align=4 - base size=4 base align=4 -QFlag (0x0x7fba1416e4e0) 0 - -Class QIncompatibleFlag - size=4 align=4 - base size=4 base align=4 -QIncompatibleFlag (0x0x7fba1416e780) 0 - -Class std::__atomic_flag_base - size=1 align=1 - base size=1 base align=1 -std::__atomic_flag_base (0x0x7fba1416ecc0) 0 - -Class std::atomic_flag - size=1 align=1 - base size=1 base align=1 -std::atomic_flag (0x0x7fba1415f9c0) 0 - std::__atomic_flag_base (0x0x7fba1416ed20) 0 - -Class QAtomicInt - size=4 align=4 - base size=4 base align=4 -QAtomicInt (0x0x7fba13d91138) 0 - QAtomicInteger (0x0x7fba13d911a0) 0 - QBasicAtomicInteger (0x0x7fba13d0e480) 0 - -Class QInternal - size=1 align=1 - base size=0 base align=1 -QInternal (0x0x7fba13bc5a20) 0 empty - -Class QtPrivate::QSlotObjectBase - size=16 align=8 - base size=16 base align=8 -QtPrivate::QSlotObjectBase (0x0x7fba139c7a80) 0 - -Class QGenericArgument - size=16 align=8 - base size=16 base align=8 -QGenericArgument (0x0x7fba139c7ba0) 0 - -Class QGenericReturnArgument - size=16 align=8 - base size=16 base align=8 -QGenericReturnArgument (0x0x7fba13b97bc8) 0 - QGenericArgument (0x0x7fba139c7c00) 0 - -Class QMetaObject - size=48 align=8 - base size=48 base align=8 -QMetaObject (0x0x7fba139c7d80) 0 - -Class QMetaObject::Connection - size=8 align=8 - base size=8 base align=8 -QMetaObject::Connection (0x0x7fba139c7e40) 0 - -Class QLatin1Char - size=1 align=1 - base size=1 base align=1 -QLatin1Char (0x0x7fba13681ea0) 0 - -Class QChar - size=2 align=2 - base size=2 base align=2 -QChar (0x0x7fba13681f00) 0 - -Class QtPrivate::RefCount - size=4 align=4 - base size=4 base align=4 -QtPrivate::RefCount (0x0x7fba1372b1e0) 0 - -Class QArrayData - size=24 align=8 - base size=24 base align=8 -QArrayData (0x0x7fba1372b240) 0 - -Class QtPrivate::QContainerImplHelper - size=1 align=1 - base size=0 base align=1 -QtPrivate::QContainerImplHelper (0x0x7fba1372b5a0) 0 empty - -Class std::locale - size=8 align=8 - base size=8 base align=8 -std::locale (0x0x7fba1372b600) 0 - -Vtable for std::locale::facet -std::locale::facet::_ZTVNSt6locale5facetE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt6locale5facetE) -16 (int (*)(...))std::locale::facet::~facet -24 (int (*)(...))std::locale::facet::~facet - -Class std::locale::facet - size=16 align=8 - base size=12 base align=8 -std::locale::facet (0x0x7fba1372b660) 0 - vptr=((& std::locale::facet::_ZTVNSt6locale5facetE) + 16u) - -Class std::locale::id - size=8 align=8 - base size=8 base align=8 -std::locale::id (0x0x7fba1372b6c0) 0 - -Class std::locale::_Impl - size=40 align=8 - base size=40 base align=8 -std::locale::_Impl (0x0x7fba1372b720) 0 - -Class std::__cow_string - size=8 align=8 - base size=8 base align=8 -std::__cow_string (0x0x7fba1372bae0) 0 - -Vtable for std::logic_error -std::logic_error::_ZTVSt11logic_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt11logic_error) -16 (int (*)(...))std::logic_error::~logic_error -24 (int (*)(...))std::logic_error::~logic_error -32 (int (*)(...))std::logic_error::what - -Class std::logic_error - size=16 align=8 - base size=16 base align=8 -std::logic_error (0x0x7fba1342f138) 0 - vptr=((& std::logic_error::_ZTVSt11logic_error) + 16u) - std::exception (0x0x7fba1372bba0) 0 nearly-empty - primary-for std::logic_error (0x0x7fba1342f138) - -Vtable for std::domain_error -std::domain_error::_ZTVSt12domain_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12domain_error) -16 (int (*)(...))std::domain_error::~domain_error -24 (int (*)(...))std::domain_error::~domain_error -32 (int (*)(...))std::logic_error::what - -Class std::domain_error - size=16 align=8 - base size=16 base align=8 -std::domain_error (0x0x7fba1342f1a0) 0 - vptr=((& std::domain_error::_ZTVSt12domain_error) + 16u) - std::logic_error (0x0x7fba1342f208) 0 - primary-for std::domain_error (0x0x7fba1342f1a0) - std::exception (0x0x7fba1372bc00) 0 nearly-empty - primary-for std::logic_error (0x0x7fba1342f208) - -Vtable for std::invalid_argument -std::invalid_argument::_ZTVSt16invalid_argument: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt16invalid_argument) -16 (int (*)(...))std::invalid_argument::~invalid_argument -24 (int (*)(...))std::invalid_argument::~invalid_argument -32 (int (*)(...))std::logic_error::what - -Class std::invalid_argument - size=16 align=8 - base size=16 base align=8 -std::invalid_argument (0x0x7fba1342f270) 0 - vptr=((& std::invalid_argument::_ZTVSt16invalid_argument) + 16u) - std::logic_error (0x0x7fba1342f2d8) 0 - primary-for std::invalid_argument (0x0x7fba1342f270) - std::exception (0x0x7fba1372bc60) 0 nearly-empty - primary-for std::logic_error (0x0x7fba1342f2d8) - -Vtable for std::length_error -std::length_error::_ZTVSt12length_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12length_error) -16 (int (*)(...))std::length_error::~length_error -24 (int (*)(...))std::length_error::~length_error -32 (int (*)(...))std::logic_error::what - -Class std::length_error - size=16 align=8 - base size=16 base align=8 -std::length_error (0x0x7fba1342f340) 0 - vptr=((& std::length_error::_ZTVSt12length_error) + 16u) - std::logic_error (0x0x7fba1342f3a8) 0 - primary-for std::length_error (0x0x7fba1342f340) - std::exception (0x0x7fba1372bcc0) 0 nearly-empty - primary-for std::logic_error (0x0x7fba1342f3a8) - -Vtable for std::out_of_range -std::out_of_range::_ZTVSt12out_of_range: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12out_of_range) -16 (int (*)(...))std::out_of_range::~out_of_range -24 (int (*)(...))std::out_of_range::~out_of_range -32 (int (*)(...))std::logic_error::what - -Class std::out_of_range - size=16 align=8 - base size=16 base align=8 -std::out_of_range (0x0x7fba1342f410) 0 - vptr=((& std::out_of_range::_ZTVSt12out_of_range) + 16u) - std::logic_error (0x0x7fba1342f478) 0 - primary-for std::out_of_range (0x0x7fba1342f410) - std::exception (0x0x7fba1372bd20) 0 nearly-empty - primary-for std::logic_error (0x0x7fba1342f478) - -Vtable for std::runtime_error -std::runtime_error::_ZTVSt13runtime_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13runtime_error) -16 (int (*)(...))std::runtime_error::~runtime_error -24 (int (*)(...))std::runtime_error::~runtime_error -32 (int (*)(...))std::runtime_error::what - -Class std::runtime_error - size=16 align=8 - base size=16 base align=8 -std::runtime_error (0x0x7fba1342f4e0) 0 - vptr=((& std::runtime_error::_ZTVSt13runtime_error) + 16u) - std::exception (0x0x7fba1372bd80) 0 nearly-empty - primary-for std::runtime_error (0x0x7fba1342f4e0) - -Vtable for std::range_error -std::range_error::_ZTVSt11range_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt11range_error) -16 (int (*)(...))std::range_error::~range_error -24 (int (*)(...))std::range_error::~range_error -32 (int (*)(...))std::runtime_error::what - -Class std::range_error - size=16 align=8 - base size=16 base align=8 -std::range_error (0x0x7fba1342f548) 0 - vptr=((& std::range_error::_ZTVSt11range_error) + 16u) - std::runtime_error (0x0x7fba1342f5b0) 0 - primary-for std::range_error (0x0x7fba1342f548) - std::exception (0x0x7fba1372bde0) 0 nearly-empty - primary-for std::runtime_error (0x0x7fba1342f5b0) - -Vtable for std::overflow_error -std::overflow_error::_ZTVSt14overflow_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14overflow_error) -16 (int (*)(...))std::overflow_error::~overflow_error -24 (int (*)(...))std::overflow_error::~overflow_error -32 (int (*)(...))std::runtime_error::what - -Class std::overflow_error - size=16 align=8 - base size=16 base align=8 -std::overflow_error (0x0x7fba1342f618) 0 - vptr=((& std::overflow_error::_ZTVSt14overflow_error) + 16u) - std::runtime_error (0x0x7fba1342f680) 0 - primary-for std::overflow_error (0x0x7fba1342f618) - std::exception (0x0x7fba1372be40) 0 nearly-empty - primary-for std::runtime_error (0x0x7fba1342f680) - -Vtable for std::underflow_error -std::underflow_error::_ZTVSt15underflow_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt15underflow_error) -16 (int (*)(...))std::underflow_error::~underflow_error -24 (int (*)(...))std::underflow_error::~underflow_error -32 (int (*)(...))std::runtime_error::what - -Class std::underflow_error - size=16 align=8 - base size=16 base align=8 -std::underflow_error (0x0x7fba1342f6e8) 0 - vptr=((& std::underflow_error::_ZTVSt15underflow_error) + 16u) - std::runtime_error (0x0x7fba1342f750) 0 - primary-for std::underflow_error (0x0x7fba1342f6e8) - std::exception (0x0x7fba1372bea0) 0 nearly-empty - primary-for std::runtime_error (0x0x7fba1342f750) - -Vtable for std::_V2::error_category -std::_V2::error_category::_ZTVNSt3_V214error_categoryE: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt3_V214error_categoryE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))std::_V2::error_category::_M_message -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))std::_V2::error_category::default_error_condition -64 (int (*)(...))std::_V2::error_category::equivalent -72 (int (*)(...))std::_V2::error_category::equivalent - -Class std::_V2::error_category - size=8 align=8 - base size=8 base align=8 -std::_V2::error_category (0x0x7fba1346e060) 0 nearly-empty - vptr=((& std::_V2::error_category::_ZTVNSt3_V214error_categoryE) + 16u) - -Class std::error_code - size=16 align=8 - base size=16 base align=8 -std::error_code (0x0x7fba1346e2a0) 0 - -Class std::error_condition - size=16 align=8 - base size=16 base align=8 -std::error_condition (0x0x7fba1346e420) 0 - -Vtable for std::system_error -std::system_error::_ZTVSt12system_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12system_error) -16 (int (*)(...))std::system_error::~system_error -24 (int (*)(...))std::system_error::~system_error -32 (int (*)(...))std::runtime_error::what - -Class std::system_error - size=32 align=8 - base size=32 base align=8 -std::system_error (0x0x7fba1342fc30) 0 - vptr=((& std::system_error::_ZTVSt12system_error) + 16u) - std::runtime_error (0x0x7fba1342fc98) 0 - primary-for std::system_error (0x0x7fba1342fc30) - std::exception (0x0x7fba1346e660) 0 nearly-empty - primary-for std::runtime_error (0x0x7fba1342fc98) - -Vtable for std::ios_base::failure -std::ios_base::failure::_ZTVNSt8ios_base7failureB5cxx11E: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt8ios_base7failureB5cxx11E) -16 (int (*)(...))std::ios_base::failure::~failure -24 (int (*)(...))std::ios_base::failure::~failure -32 (int (*)(...))std::ios_base::failure::what - -Class std::ios_base::failure - size=32 align=8 - base size=32 base align=8 -std::ios_base::failure (0x0x7fba134cc888) 0 - vptr=((& std::ios_base::failure::_ZTVNSt8ios_base7failureB5cxx11E) + 16u) - std::system_error (0x0x7fba134cc8f0) 0 - primary-for std::ios_base::failure (0x0x7fba134cc888) - std::runtime_error (0x0x7fba134cc958) 0 - primary-for std::system_error (0x0x7fba134cc8f0) - std::exception (0x0x7fba1346e960) 0 nearly-empty - primary-for std::runtime_error (0x0x7fba134cc958) - -Class std::ios_base::_Callback_list - size=24 align=8 - base size=24 base align=8 -std::ios_base::_Callback_list (0x0x7fba1346e9c0) 0 - -Class std::ios_base::_Words - size=16 align=8 - base size=16 base align=8 -std::ios_base::_Words (0x0x7fba1346ea20) 0 - -Class std::ios_base::Init - size=1 align=1 - base size=0 base align=1 -std::ios_base::Init (0x0x7fba1346ea80) 0 empty - -Vtable for std::ios_base -std::ios_base::_ZTVSt8ios_base: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt8ios_base) -16 (int (*)(...))std::ios_base::~ios_base -24 (int (*)(...))std::ios_base::~ios_base - -Class std::ios_base - size=216 align=8 - base size=216 base align=8 -std::ios_base (0x0x7fba1346e900) 0 - vptr=((& std::ios_base::_ZTVSt8ios_base) + 16u) - -Class std::ctype_base - size=1 align=1 - base size=0 base align=1 -std::ctype_base (0x0x7fba131a2240) 0 empty - -Class std::__num_base - size=1 align=1 - base size=0 base align=1 -std::__num_base (0x0x7fba131a2900) 0 empty - -VTT for std::basic_ostream -std::basic_ostream::_ZTTSo: 2u entries -0 ((& std::basic_ostream::_ZTVSo) + 24u) -8 ((& std::basic_ostream::_ZTVSo) + 64u) - -VTT for std::basic_ostream -std::basic_ostream::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries -0 ((& std::basic_ostream::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 24u) -8 ((& std::basic_ostream::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 64u) - -VTT for std::basic_istream -std::basic_istream::_ZTTSi: 2u entries -0 ((& std::basic_istream::_ZTVSi) + 24u) -8 ((& std::basic_istream::_ZTVSi) + 64u) - -VTT for std::basic_istream -std::basic_istream::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries -0 ((& std::basic_istream::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 24u) -8 ((& std::basic_istream::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 64u) - -Construction vtable for std::basic_istream (0x0x7fba1318e208 instance) in std::basic_iostream -std::basic_iostream::_ZTCSd0_Si: 10u entries -0 24u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISi) -24 0u -32 0u -40 18446744073709551592u -48 (int (*)(...))-24 -56 (int (*)(...))(& _ZTISi) -64 0u -72 0u - -Construction vtable for std::basic_ostream (0x0x7fba1318e2d8 instance) in std::basic_iostream -std::basic_iostream::_ZTCSd16_So: 10u entries -0 8u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISo) -24 0u -32 0u -40 18446744073709551608u -48 (int (*)(...))-8 -56 (int (*)(...))(& _ZTISo) -64 0u -72 0u - -VTT for std::basic_iostream -std::basic_iostream::_ZTTSd: 7u entries -0 ((& std::basic_iostream::_ZTVSd) + 24u) -8 ((& std::basic_iostream::_ZTCSd0_Si) + 24u) -16 ((& std::basic_iostream::_ZTCSd0_Si) + 64u) -24 ((& std::basic_iostream::_ZTCSd16_So) + 24u) -32 ((& std::basic_iostream::_ZTCSd16_So) + 64u) -40 ((& std::basic_iostream::_ZTVSd) + 104u) -48 ((& std::basic_iostream::_ZTVSd) + 64u) - -Construction vtable for std::basic_istream (0x0x7fba1318e680 instance) in std::basic_iostream -std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries -0 24u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -24 0u -32 0u -40 18446744073709551592u -48 (int (*)(...))-24 -56 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -64 0u -72 0u - -Construction vtable for std::basic_ostream (0x0x7fba1318e750 instance) in std::basic_iostream -std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE16_St13basic_ostreamIwS1_E: 10u entries -0 8u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -24 0u -32 0u -40 18446744073709551608u -48 (int (*)(...))-8 -56 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -64 0u -72 0u - -VTT for std::basic_iostream -std::basic_iostream::_ZTTSt14basic_iostreamIwSt11char_traitsIwEE: 7u entries -0 ((& std::basic_iostream::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 24u) -8 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E) + 24u) -16 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E) + 64u) -24 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE16_St13basic_ostreamIwS1_E) + 24u) -32 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE16_St13basic_ostreamIwS1_E) + 64u) -40 ((& std::basic_iostream::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 104u) -48 ((& std::basic_iostream::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 64u) - -Class QByteArrayDataPtr - size=8 align=8 - base size=8 base align=8 -QByteArrayDataPtr (0x0x7fba12ddd180) 0 - -Class QByteArray - size=8 align=8 - base size=8 base align=8 -QByteArray (0x0x7fba12ddd1e0) 0 - -Class QByteRef - size=16 align=8 - base size=12 base align=8 -QByteRef (0x0x7fba12edb540) 0 - -Class QStringDataPtr - size=8 align=8 - base size=8 base align=8 -QStringDataPtr (0x0x7fba12edb8a0) 0 - -Class QStringView - size=16 align=8 - base size=16 base align=8 -QStringView (0x0x7fba12edbd20) 0 - -Class QLatin1String - size=16 align=8 - base size=16 base align=8 -QLatin1String (0x0x7fba12c09ba0) 0 - -Class QString::Null - size=1 align=1 - base size=0 base align=1 -QString::Null (0x0x7fba12c98240) 0 empty - -Class QString - size=8 align=8 - base size=8 base align=8 -QString (0x0x7fba12c981e0) 0 - -Class QCharRef - size=16 align=8 - base size=12 base align=8 -QCharRef (0x0x7fba12a41300) 0 - -Class QStringRef - size=16 align=8 - base size=16 base align=8 -QStringRef (0x0x7fba12a41f00) 0 - -Class QtPrivate::QHashCombine - size=1 align=1 - base size=0 base align=1 -QtPrivate::QHashCombine (0x0x7fba1283fb40) 0 empty - -Class QtPrivate::QHashCombineCommutative - size=1 align=1 - base size=0 base align=1 -QtPrivate::QHashCombineCommutative (0x0x7fba1283fba0) 0 empty - -Class std::__detail::_List_node_base - size=16 align=8 - base size=16 base align=8 -std::__detail::_List_node_base (0x0x7fba1283fc00) 0 - -Class QListData::NotArrayCompatibleLayout - size=1 align=1 - base size=0 base align=1 -QListData::NotArrayCompatibleLayout (0x0x7fba12676000) 0 empty - -Class QListData::NotIndirectLayout - size=1 align=1 - base size=0 base align=1 -QListData::NotIndirectLayout (0x0x7fba12676060) 0 empty - -Class QListData::ArrayCompatibleLayout - size=1 align=1 - base size=1 base align=1 -QListData::ArrayCompatibleLayout (0x0x7fba125bd1a0) 0 empty - QListData::NotIndirectLayout (0x0x7fba126760c0) 0 empty - -Class QListData::InlineWithPaddingLayout - size=1 align=1 - base size=1 base align=1 -QListData::InlineWithPaddingLayout (0x0x7fba12679150) 0 empty - QListData::NotArrayCompatibleLayout (0x0x7fba12676120) 0 empty - QListData::NotIndirectLayout (0x0x7fba12676180) 0 empty - -Class QListData::IndirectLayout - size=1 align=1 - base size=1 base align=1 -QListData::IndirectLayout (0x0x7fba125bd208) 0 empty - QListData::NotArrayCompatibleLayout (0x0x7fba126761e0) 0 empty - -Class QListData::Data - size=24 align=8 - base size=24 base align=8 -QListData::Data (0x0x7fba12676240) 0 - -Class QListData - size=8 align=8 - base size=8 base align=8 -QListData (0x0x7fba1283ff60) 0 - -Class QRegExp - size=8 align=8 - base size=8 base align=8 -QRegExp (0x0x7fba126766c0) 0 - -Class QStringMatcher::Data - size=272 align=8 - base size=272 base align=8 -QStringMatcher::Data (0x0x7fba12420900) 0 - -Class QStringMatcher - size=1048 align=8 - base size=1048 base align=8 -QStringMatcher (0x0x7fba124208a0) 0 - -Class QStringList - size=8 align=8 - base size=8 base align=8 -QStringList (0x0x7fba1241fc30) 0 - QList (0x0x7fba1241fc98) 0 - QListSpecialMethods (0x0x7fba12420ae0) 0 empty - -Class QScopedPointerPodDeleter - size=1 align=1 - base size=0 base align=1 -QScopedPointerPodDeleter (0x0x7fba12420f00) 0 empty - -Class std::_Rb_tree_node_base - size=32 align=8 - base size=32 base align=8 -std::_Rb_tree_node_base (0x0x7fba124c2a20) 0 - -Class std::allocator_arg_t - size=1 align=1 - base size=0 base align=1 -std::allocator_arg_t (0x0x7fba122c70c0) 0 empty - -Class std::__uses_alloc_base - size=1 align=1 - base size=0 base align=1 -std::__uses_alloc_base (0x0x7fba122c7240) 0 empty - -Class std::__uses_alloc0::_Sink - size=1 align=1 - base size=0 base align=1 -std::__uses_alloc0::_Sink (0x0x7fba122c7300) 0 empty - -Class std::__uses_alloc0 - size=1 align=1 - base size=1 base align=1 -std::__uses_alloc0 (0x0x7fba1249c5b0) 0 - std::__uses_alloc_base (0x0x7fba122c72a0) 0 empty - -Class std::_Swallow_assign - size=1 align=1 - base size=0 base align=1 -std::_Swallow_assign (0x0x7fba11fb7360) 0 empty - -Class QtPrivate::AbstractDebugStreamFunction - size=16 align=8 - base size=16 base align=8 -QtPrivate::AbstractDebugStreamFunction (0x0x7fba11fb75a0) 0 - -Class QtPrivate::AbstractComparatorFunction - size=24 align=8 - base size=24 base align=8 -QtPrivate::AbstractComparatorFunction (0x0x7fba11fb7660) 0 - -Class QtPrivate::AbstractConverterFunction - size=8 align=8 - base size=8 base align=8 -QtPrivate::AbstractConverterFunction (0x0x7fba11fb7780) 0 - -Class QMetaType - size=80 align=8 - base size=80 base align=8 -QMetaType (0x0x7fba11fb7900) 0 - -Class QtMetaTypePrivate::VariantData - size=24 align=8 - base size=20 base align=8 -QtMetaTypePrivate::VariantData (0x0x7fba11fb7d20) 0 - -Class QtMetaTypePrivate::VectorBoolElements - size=1 align=1 - base size=0 base align=1 -QtMetaTypePrivate::VectorBoolElements (0x0x7fba11fb7e40) 0 empty - -Class QtMetaTypePrivate::QSequentialIterableImpl - size=104 align=8 - base size=104 base align=8 -QtMetaTypePrivate::QSequentialIterableImpl (0x0x7fba1211c7e0) 0 - -Class QtMetaTypePrivate::QAssociativeIterableImpl - size=112 align=8 - base size=112 base align=8 -QtMetaTypePrivate::QAssociativeIterableImpl (0x0x7fba1211cc00) 0 - -Class QtMetaTypePrivate::QPairVariantInterfaceImpl - size=40 align=8 - base size=40 base align=8 -QtMetaTypePrivate::QPairVariantInterfaceImpl (0x0x7fba1211cf00) 0 - -Class std::chrono::_V2::system_clock - size=1 align=1 - base size=0 base align=1 -std::chrono::_V2::system_clock (0x0x7fba11c0a780) 0 empty - -Class std::chrono::_V2::steady_clock - size=1 align=1 - base size=0 base align=1 -std::chrono::_V2::steady_clock (0x0x7fba11d59600) 0 empty - -Vtable for QObjectData -QObjectData::_ZTV11QObjectData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QObjectData) -16 (int (*)(...))__cxa_pure_virtual -24 (int (*)(...))__cxa_pure_virtual - -Class QObjectData - size=48 align=8 - base size=48 base align=8 -QObjectData (0x0x7fba11d59660) 0 - vptr=((& QObjectData::_ZTV11QObjectData) + 16u) - -Class QObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QObject::QPrivateSignal (0x0x7fba11d59840) 0 empty - -Vtable for QObject -QObject::_ZTV7QObject: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QObject) -16 (int (*)(...))QObject::metaObject -24 (int (*)(...))QObject::qt_metacast -32 (int (*)(...))QObject::qt_metacall -40 (int (*)(...))QObject::~QObject -48 (int (*)(...))QObject::~QObject -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QObject - size=16 align=8 - base size=16 base align=8 -QObject (0x0x7fba11d597e0) 0 - vptr=((& QObject::_ZTV7QObject) + 16u) - -Vtable for QObjectUserData -QObjectUserData::_ZTV15QObjectUserData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QObjectUserData) -16 (int (*)(...))QObjectUserData::~QObjectUserData -24 (int (*)(...))QObjectUserData::~QObjectUserData - -Class QObjectUserData - size=8 align=8 - base size=8 base align=8 -QObjectUserData (0x0x7fba11a1fae0) 0 nearly-empty - vptr=((& QObjectUserData::_ZTV15QObjectUserData) + 16u) - -Class QSignalBlocker - size=16 align=8 - base size=10 base align=8 -QSignalBlocker (0x0x7fba11a1fb40) 0 - -Class QAbstractAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractAnimation::QPrivateSignal (0x0x7fba11a1fc00) 0 empty - -Vtable for QAbstractAnimation -QAbstractAnimation::_ZTV18QAbstractAnimation: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QAbstractAnimation) -16 (int (*)(...))QAbstractAnimation::metaObject -24 (int (*)(...))QAbstractAnimation::qt_metacast -32 (int (*)(...))QAbstractAnimation::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAbstractAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection - -Class QAbstractAnimation - size=16 align=8 - base size=16 base align=8 -QAbstractAnimation (0x0x7fba11a487b8) 0 - vptr=((& QAbstractAnimation::_ZTV18QAbstractAnimation) + 16u) - QObject (0x0x7fba11a1fba0) 0 - primary-for QAbstractAnimation (0x0x7fba11a487b8) - -Class QAnimationDriver::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAnimationDriver::QPrivateSignal (0x0x7fba11a1fcc0) 0 empty - -Vtable for QAnimationDriver -QAnimationDriver::_ZTV16QAnimationDriver: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QAnimationDriver) -16 (int (*)(...))QAnimationDriver::metaObject -24 (int (*)(...))QAnimationDriver::qt_metacast -32 (int (*)(...))QAnimationDriver::qt_metacall -40 (int (*)(...))QAnimationDriver::~QAnimationDriver -48 (int (*)(...))QAnimationDriver::~QAnimationDriver -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAnimationDriver::advance -120 (int (*)(...))QAnimationDriver::elapsed -128 (int (*)(...))QAnimationDriver::start -136 (int (*)(...))QAnimationDriver::stop - -Class QAnimationDriver - size=16 align=8 - base size=16 base align=8 -QAnimationDriver (0x0x7fba11a48820) 0 - vptr=((& QAnimationDriver::_ZTV16QAnimationDriver) + 16u) - QObject (0x0x7fba11a1fc60) 0 - primary-for QAnimationDriver (0x0x7fba11a48820) - -Class QEventLoop::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QEventLoop::QPrivateSignal (0x0x7fba11a1fd80) 0 empty - -Vtable for QEventLoop -QEventLoop::_ZTV10QEventLoop: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QEventLoop) -16 (int (*)(...))QEventLoop::metaObject -24 (int (*)(...))QEventLoop::qt_metacast -32 (int (*)(...))QEventLoop::qt_metacall -40 (int (*)(...))QEventLoop::~QEventLoop -48 (int (*)(...))QEventLoop::~QEventLoop -56 (int (*)(...))QEventLoop::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QEventLoop - size=16 align=8 - base size=16 base align=8 -QEventLoop (0x0x7fba11a48888) 0 - vptr=((& QEventLoop::_ZTV10QEventLoop) + 16u) - QObject (0x0x7fba11a1fd20) 0 - primary-for QEventLoop (0x0x7fba11a48888) - -Class QEventLoopLocker - size=8 align=8 - base size=8 base align=8 -QEventLoopLocker (0x0x7fba11a1ff60) 0 - -Class QAbstractEventDispatcher::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractEventDispatcher::QPrivateSignal (0x0x7fba11ad8060) 0 empty - -Class QAbstractEventDispatcher::TimerInfo - size=12 align=4 - base size=12 base align=4 -QAbstractEventDispatcher::TimerInfo (0x0x7fba11ad80c0) 0 - -Vtable for QAbstractEventDispatcher -QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 28u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QAbstractEventDispatcher) -16 (int (*)(...))QAbstractEventDispatcher::metaObject -24 (int (*)(...))QAbstractEventDispatcher::qt_metacast -32 (int (*)(...))QAbstractEventDispatcher::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))__cxa_pure_virtual -176 (int (*)(...))__cxa_pure_virtual -184 (int (*)(...))__cxa_pure_virtual -192 (int (*)(...))__cxa_pure_virtual -200 (int (*)(...))__cxa_pure_virtual -208 (int (*)(...))QAbstractEventDispatcher::startingUp -216 (int (*)(...))QAbstractEventDispatcher::closingDown - -Class QAbstractEventDispatcher - size=16 align=8 - base size=16 base align=8 -QAbstractEventDispatcher (0x0x7fba11a489c0) 0 - vptr=((& QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher) + 16u) - QObject (0x0x7fba11ad8000) 0 - primary-for QAbstractEventDispatcher (0x0x7fba11a489c0) - -Vtable for std::type_info -std::type_info::_ZTVSt9type_info: 8u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt9type_info) -16 (int (*)(...))std::type_info::~type_info -24 (int (*)(...))std::type_info::~type_info -32 (int (*)(...))std::type_info::__is_pointer_p -40 (int (*)(...))std::type_info::__is_function_p -48 (int (*)(...))std::type_info::__do_catch -56 (int (*)(...))std::type_info::__do_upcast - -Class std::type_info - size=16 align=8 - base size=16 base align=8 -std::type_info (0x0x7fba11ad8360) 0 - vptr=((& std::type_info::_ZTVSt9type_info) + 16u) - -Vtable for std::bad_cast -std::bad_cast::_ZTVSt8bad_cast: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt8bad_cast) -16 (int (*)(...))std::bad_cast::~bad_cast -24 (int (*)(...))std::bad_cast::~bad_cast -32 (int (*)(...))std::bad_cast::what - -Class std::bad_cast - size=8 align=8 - base size=8 base align=8 -std::bad_cast (0x0x7fba11a48bc8) 0 nearly-empty - vptr=((& std::bad_cast::_ZTVSt8bad_cast) + 16u) - std::exception (0x0x7fba11ad83c0) 0 nearly-empty - primary-for std::bad_cast (0x0x7fba11a48bc8) - -Vtable for std::bad_typeid -std::bad_typeid::_ZTVSt10bad_typeid: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt10bad_typeid) -16 (int (*)(...))std::bad_typeid::~bad_typeid -24 (int (*)(...))std::bad_typeid::~bad_typeid -32 (int (*)(...))std::bad_typeid::what - -Class std::bad_typeid - size=8 align=8 - base size=8 base align=8 -std::bad_typeid (0x0x7fba11a48c30) 0 nearly-empty - vptr=((& std::bad_typeid::_ZTVSt10bad_typeid) + 16u) - std::exception (0x0x7fba11ad8420) 0 nearly-empty - primary-for std::bad_typeid (0x0x7fba11a48c30) - -Vtable for std::bad_function_call -std::bad_function_call::_ZTVSt17bad_function_call: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt17bad_function_call) -16 (int (*)(...))std::bad_function_call::~bad_function_call -24 (int (*)(...))std::bad_function_call::~bad_function_call -32 (int (*)(...))std::bad_function_call::what - -Class std::bad_function_call - size=8 align=8 - base size=8 base align=8 -std::bad_function_call (0x0x7fba11799ea0) 0 nearly-empty - vptr=((& std::bad_function_call::_ZTVSt17bad_function_call) + 16u) - std::exception (0x0x7fba118714e0) 0 nearly-empty - primary-for std::bad_function_call (0x0x7fba11799ea0) - -Class std::_Nocopy_types - size=16 align=8 - base size=16 base align=8 -std::_Nocopy_types (0x0x7fba118715a0) 0 - -Class std::_Any_data - size=16 align=8 - base size=16 base align=8 -std::_Any_data (0x0x7fba11871600) 0 - -Class std::_Function_base - size=24 align=8 - base size=24 base align=8 -std::_Function_base (0x0x7fba11871720) 0 - -Class QMapNodeBase - size=24 align=8 - base size=24 base align=8 -QMapNodeBase (0x0x7fba11871c00) 0 - -Class QMapDataBase - size=40 align=8 - base size=40 base align=8 -QMapDataBase (0x0x7fba11923180) 0 - -Class QHashData::Node - size=16 align=8 - base size=16 base align=8 -QHashData::Node (0x0x7fba11923540) 0 - -Class QHashData - size=48 align=8 - base size=44 base align=8 -QHashData (0x0x7fba119234e0) 0 - -Class QHashDummyValue - size=1 align=1 - base size=0 base align=1 -QHashDummyValue (0x0x7fba119235a0) 0 empty - -Class QVariant::PrivateShared - size=16 align=8 - base size=12 base align=8 -QVariant::PrivateShared (0x0x7fba11923e40) 0 - -Class QVariant::Private::Data - size=8 align=8 - base size=8 base align=8 -QVariant::Private::Data (0x0x7fba11923f00) 0 - -Class QVariant::Private - size=16 align=8 - base size=12 base align=8 -QVariant::Private (0x0x7fba11923ea0) 0 - -Class QVariant::Handler - size=72 align=8 - base size=72 base align=8 -QVariant::Handler (0x0x7fba11923f60) 0 - -Class QVariant - size=16 align=8 - base size=16 base align=8 -QVariant (0x0x7fba11923de0) 0 - -Class QVariantComparisonHelper - size=8 align=8 - base size=8 base align=8 -QVariantComparisonHelper (0x0x7fba11400a80) 0 - -Class QSequentialIterable::const_iterator - size=112 align=8 - base size=112 base align=8 -QSequentialIterable::const_iterator (0x0x7fba114a8120) 0 - -Class QSequentialIterable - size=104 align=8 - base size=104 base align=8 -QSequentialIterable (0x0x7fba114a80c0) 0 - -Class QAssociativeIterable::const_iterator - size=120 align=8 - base size=120 base align=8 -QAssociativeIterable::const_iterator (0x0x7fba114a81e0) 0 - -Class QAssociativeIterable - size=112 align=8 - base size=112 base align=8 -QAssociativeIterable (0x0x7fba114a8180) 0 - -Class QModelIndex - size=24 align=8 - base size=24 base align=8 -QModelIndex (0x0x7fba111c24e0) 0 - -Class QPersistentModelIndex - size=8 align=8 - base size=8 base align=8 -QPersistentModelIndex (0x0x7fba111c2ba0) 0 - -Class QAbstractItemModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractItemModel::QPrivateSignal (0x0x7fba10f97300) 0 empty - -Vtable for QAbstractItemModel -QAbstractItemModel::_ZTV18QAbstractItemModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QAbstractItemModel) -16 (int (*)(...))QAbstractItemModel::metaObject -24 (int (*)(...))QAbstractItemModel::qt_metacast -32 (int (*)(...))QAbstractItemModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractItemModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAbstractItemModel::hasChildren -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractItemModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractItemModel::dropMimeData -240 (int (*)(...))QAbstractItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QAbstractItemModel::flags -328 (int (*)(...))QAbstractItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QAbstractItemModel - size=16 align=8 - base size=16 base align=8 -QAbstractItemModel (0x0x7fba10f81c30) 0 - vptr=((& QAbstractItemModel::_ZTV18QAbstractItemModel) + 16u) - QObject (0x0x7fba10f972a0) 0 - primary-for QAbstractItemModel (0x0x7fba10f81c30) - -Class QAbstractTableModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractTableModel::QPrivateSignal (0x0x7fba10f97660) 0 empty - -Vtable for QAbstractTableModel -QAbstractTableModel::_ZTV19QAbstractTableModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QAbstractTableModel) -16 (int (*)(...))QAbstractTableModel::metaObject -24 (int (*)(...))QAbstractTableModel::qt_metacast -32 (int (*)(...))QAbstractTableModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractTableModel::index -120 (int (*)(...))QAbstractTableModel::parent -128 (int (*)(...))QAbstractTableModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAbstractTableModel::hasChildren -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractItemModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractTableModel::dropMimeData -240 (int (*)(...))QAbstractItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QAbstractTableModel::flags -328 (int (*)(...))QAbstractItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QAbstractTableModel - size=16 align=8 - base size=16 base align=8 -QAbstractTableModel (0x0x7fba10f81e38) 0 - vptr=((& QAbstractTableModel::_ZTV19QAbstractTableModel) + 16u) - QAbstractItemModel (0x0x7fba10f81ea0) 0 - primary-for QAbstractTableModel (0x0x7fba10f81e38) - QObject (0x0x7fba10f97600) 0 - primary-for QAbstractItemModel (0x0x7fba10f81ea0) - -Class QAbstractListModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractListModel::QPrivateSignal (0x0x7fba10f97720) 0 empty - -Vtable for QAbstractListModel -QAbstractListModel::_ZTV18QAbstractListModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QAbstractListModel) -16 (int (*)(...))QAbstractListModel::metaObject -24 (int (*)(...))QAbstractListModel::qt_metacast -32 (int (*)(...))QAbstractListModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractListModel::index -120 (int (*)(...))QAbstractListModel::parent -128 (int (*)(...))QAbstractListModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))QAbstractListModel::columnCount -152 (int (*)(...))QAbstractListModel::hasChildren -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractItemModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractListModel::dropMimeData -240 (int (*)(...))QAbstractItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QAbstractListModel::flags -328 (int (*)(...))QAbstractItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QAbstractListModel - size=16 align=8 - base size=16 base align=8 -QAbstractListModel (0x0x7fba10f81f08) 0 - vptr=((& QAbstractListModel::_ZTV18QAbstractListModel) + 16u) - QAbstractItemModel (0x0x7fba10f81f70) 0 - primary-for QAbstractListModel (0x0x7fba10f81f08) - QObject (0x0x7fba10f976c0) 0 - primary-for QAbstractItemModel (0x0x7fba10f81f70) - -Vtable for QAbstractNativeEventFilter -QAbstractNativeEventFilter::_ZTV26QAbstractNativeEventFilter: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAbstractNativeEventFilter) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QAbstractNativeEventFilter - size=16 align=8 - base size=16 base align=8 -QAbstractNativeEventFilter (0x0x7fba10f979c0) 0 - vptr=((& QAbstractNativeEventFilter::_ZTV26QAbstractNativeEventFilter) + 16u) - -Class QAbstractProxyModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractProxyModel::QPrivateSignal (0x0x7fba10f97a80) 0 empty - -Vtable for QAbstractProxyModel -QAbstractProxyModel::_ZTV19QAbstractProxyModel: 53u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QAbstractProxyModel) -16 (int (*)(...))QAbstractProxyModel::metaObject -24 (int (*)(...))QAbstractProxyModel::qt_metacast -32 (int (*)(...))QAbstractProxyModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractProxyModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAbstractProxyModel::hasChildren -160 (int (*)(...))QAbstractProxyModel::data -168 (int (*)(...))QAbstractProxyModel::setData -176 (int (*)(...))QAbstractProxyModel::headerData -184 (int (*)(...))QAbstractProxyModel::setHeaderData -192 (int (*)(...))QAbstractProxyModel::itemData -200 (int (*)(...))QAbstractProxyModel::setItemData -208 (int (*)(...))QAbstractProxyModel::mimeTypes -216 (int (*)(...))QAbstractProxyModel::mimeData -224 (int (*)(...))QAbstractProxyModel::canDropMimeData -232 (int (*)(...))QAbstractProxyModel::dropMimeData -240 (int (*)(...))QAbstractProxyModel::supportedDropActions -248 (int (*)(...))QAbstractProxyModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractProxyModel::fetchMore -312 (int (*)(...))QAbstractProxyModel::canFetchMore -320 (int (*)(...))QAbstractProxyModel::flags -328 (int (*)(...))QAbstractProxyModel::sort -336 (int (*)(...))QAbstractProxyModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractProxyModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractProxyModel::submit -376 (int (*)(...))QAbstractProxyModel::revert -384 (int (*)(...))QAbstractProxyModel::setSourceModel -392 (int (*)(...))__cxa_pure_virtual -400 (int (*)(...))__cxa_pure_virtual -408 (int (*)(...))QAbstractProxyModel::mapSelectionToSource -416 (int (*)(...))QAbstractProxyModel::mapSelectionFromSource - -Class QAbstractProxyModel - size=16 align=8 - base size=16 base align=8 -QAbstractProxyModel (0x0x7fba1106e0d0) 0 - vptr=((& QAbstractProxyModel::_ZTV19QAbstractProxyModel) + 16u) - QAbstractItemModel (0x0x7fba1106e138) 0 - primary-for QAbstractProxyModel (0x0x7fba1106e0d0) - QObject (0x0x7fba10f97a20) 0 - primary-for QAbstractItemModel (0x0x7fba1106e138) - -Class QAbstractState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractState::QPrivateSignal (0x0x7fba10f97b40) 0 empty - -Vtable for QAbstractState -QAbstractState::_ZTV14QAbstractState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QAbstractState) -16 (int (*)(...))QAbstractState::metaObject -24 (int (*)(...))QAbstractState::qt_metacast -32 (int (*)(...))QAbstractState::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAbstractState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QAbstractState - size=16 align=8 - base size=16 base align=8 -QAbstractState (0x0x7fba1106e1a0) 0 - vptr=((& QAbstractState::_ZTV14QAbstractState) + 16u) - QObject (0x0x7fba10f97ae0) 0 - primary-for QAbstractState (0x0x7fba1106e1a0) - -Class QAbstractTransition::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractTransition::QPrivateSignal (0x0x7fba10f97c00) 0 empty - -Vtable for QAbstractTransition -QAbstractTransition::_ZTV19QAbstractTransition: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QAbstractTransition) -16 (int (*)(...))QAbstractTransition::metaObject -24 (int (*)(...))QAbstractTransition::qt_metacast -32 (int (*)(...))QAbstractTransition::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAbstractTransition::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QAbstractTransition - size=16 align=8 - base size=16 base align=8 -QAbstractTransition (0x0x7fba1106e208) 0 - vptr=((& QAbstractTransition::_ZTV19QAbstractTransition) + 16u) - QObject (0x0x7fba10f97ba0) 0 - primary-for QAbstractTransition (0x0x7fba1106e208) - -Class QAnimationGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAnimationGroup::QPrivateSignal (0x0x7fba10f97cc0) 0 empty - -Vtable for QAnimationGroup -QAnimationGroup::_ZTV15QAnimationGroup: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QAnimationGroup) -16 (int (*)(...))QAnimationGroup::metaObject -24 (int (*)(...))QAnimationGroup::qt_metacast -32 (int (*)(...))QAnimationGroup::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAnimationGroup::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection - -Class QAnimationGroup - size=16 align=8 - base size=16 base align=8 -QAnimationGroup (0x0x7fba1106e270) 0 - vptr=((& QAnimationGroup::_ZTV15QAnimationGroup) + 16u) - QAbstractAnimation (0x0x7fba1106e2d8) 0 - primary-for QAnimationGroup (0x0x7fba1106e270) - QObject (0x0x7fba10f97c60) 0 - primary-for QAbstractAnimation (0x0x7fba1106e2d8) - -Class QBasicTimer - size=4 align=4 - base size=4 base align=4 -QBasicTimer (0x0x7fba1110fa20) 0 - -Class QBitArray - size=8 align=8 - base size=8 base align=8 -QBitArray (0x0x7fba1110fcc0) 0 - -Class QBitRef - size=16 align=8 - base size=12 base align=8 -QBitRef (0x0x7fba1110fd80) 0 - -Class QIODevice::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIODevice::QPrivateSignal (0x0x7fba10da20c0) 0 empty - -Vtable for QIODevice -QIODevice::_ZTV9QIODevice: 30u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QIODevice) -16 (int (*)(...))QIODevice::metaObject -24 (int (*)(...))QIODevice::qt_metacast -32 (int (*)(...))QIODevice::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QIODevice::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QIODevice::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QIODevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))__cxa_pure_virtual -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))__cxa_pure_virtual - -Class QIODevice - size=16 align=8 - base size=16 base align=8 -QIODevice (0x0x7fba1106e958) 0 - vptr=((& QIODevice::_ZTV9QIODevice) + 16u) - QObject (0x0x7fba10da2060) 0 - primary-for QIODevice (0x0x7fba1106e958) - -Class QBuffer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QBuffer::QPrivateSignal (0x0x7fba10da2300) 0 empty - -Vtable for QBuffer -QBuffer::_ZTV7QBuffer: 30u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QBuffer) -16 (int (*)(...))QBuffer::metaObject -24 (int (*)(...))QBuffer::qt_metacast -32 (int (*)(...))QBuffer::qt_metacall -40 (int (*)(...))QBuffer::~QBuffer -48 (int (*)(...))QBuffer::~QBuffer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QBuffer::connectNotify -104 (int (*)(...))QBuffer::disconnectNotify -112 (int (*)(...))QIODevice::isSequential -120 (int (*)(...))QBuffer::open -128 (int (*)(...))QBuffer::close -136 (int (*)(...))QBuffer::pos -144 (int (*)(...))QBuffer::size -152 (int (*)(...))QBuffer::seek -160 (int (*)(...))QBuffer::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QBuffer::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QBuffer::readData -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QBuffer::writeData - -Class QBuffer - size=16 align=8 - base size=16 base align=8 -QBuffer (0x0x7fba1106ea90) 0 - vptr=((& QBuffer::_ZTV7QBuffer) + 16u) - QIODevice (0x0x7fba1106eaf8) 0 - primary-for QBuffer (0x0x7fba1106ea90) - QObject (0x0x7fba10da22a0) 0 - primary-for QIODevice (0x0x7fba1106eaf8) - -Class QByteArrayMatcher::Data - size=272 align=8 - base size=272 base align=8 -QByteArrayMatcher::Data (0x0x7fba10da23c0) 0 - -Class QByteArrayMatcher - size=1040 align=8 - base size=1040 base align=8 -QByteArrayMatcher (0x0x7fba10da2360) 0 - -Class QStaticByteArrayMatcherBase::Skiptable - size=256 align=1 - base size=256 base align=1 -QStaticByteArrayMatcherBase::Skiptable (0x0x7fba10da24e0) 0 - -Class QStaticByteArrayMatcherBase - size=256 align=16 - base size=256 base align=16 -QStaticByteArrayMatcherBase (0x0x7fba10da2480) 0 - -Class QSharedData - size=4 align=4 - base size=4 base align=4 -QSharedData (0x0x7fba10da26c0) 0 - -Class QLocale - size=8 align=8 - base size=8 base align=8 -QLocale (0x0x7fba10da28a0) 0 - -Class QCollatorSortKey - size=8 align=8 - base size=8 base align=8 -QCollatorSortKey (0x0x7fba10da2ea0) 0 - -Class QCollator - size=8 align=8 - base size=8 base align=8 -QCollator (0x0x7fba10da2f60) 0 - -Class QCommandLineOption - size=8 align=8 - base size=8 base align=8 -QCommandLineOption (0x0x7fba10b89f60) 0 - -Vtable for QEvent -QEvent::_ZTV6QEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QEvent) -16 (int (*)(...))QEvent::~QEvent -24 (int (*)(...))QEvent::~QEvent - -Class QEvent - size=24 align=8 - base size=20 base align=8 -QEvent (0x0x7fba10bc0420) 0 - vptr=((& QEvent::_ZTV6QEvent) + 16u) - -Vtable for QTimerEvent -QTimerEvent::_ZTV11QTimerEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTimerEvent) -16 (int (*)(...))QTimerEvent::~QTimerEvent -24 (int (*)(...))QTimerEvent::~QTimerEvent - -Class QTimerEvent - size=24 align=8 - base size=24 base align=8 -QTimerEvent (0x0x7fba10c19000) 0 - vptr=((& QTimerEvent::_ZTV11QTimerEvent) + 16u) - QEvent (0x0x7fba10bc0480) 0 - primary-for QTimerEvent (0x0x7fba10c19000) - -Vtable for QChildEvent -QChildEvent::_ZTV11QChildEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QChildEvent) -16 (int (*)(...))QChildEvent::~QChildEvent -24 (int (*)(...))QChildEvent::~QChildEvent - -Class QChildEvent - size=32 align=8 - base size=32 base align=8 -QChildEvent (0x0x7fba10c19068) 0 - vptr=((& QChildEvent::_ZTV11QChildEvent) + 16u) - QEvent (0x0x7fba10bc04e0) 0 - primary-for QChildEvent (0x0x7fba10c19068) - -Vtable for QDynamicPropertyChangeEvent -QDynamicPropertyChangeEvent::_ZTV27QDynamicPropertyChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QDynamicPropertyChangeEvent) -16 (int (*)(...))QDynamicPropertyChangeEvent::~QDynamicPropertyChangeEvent -24 (int (*)(...))QDynamicPropertyChangeEvent::~QDynamicPropertyChangeEvent - -Class QDynamicPropertyChangeEvent - size=32 align=8 - base size=32 base align=8 -QDynamicPropertyChangeEvent (0x0x7fba10c195b0) 0 - vptr=((& QDynamicPropertyChangeEvent::_ZTV27QDynamicPropertyChangeEvent) + 16u) - QEvent (0x0x7fba10bc09c0) 0 - primary-for QDynamicPropertyChangeEvent (0x0x7fba10c195b0) - -Vtable for QDeferredDeleteEvent -QDeferredDeleteEvent::_ZTV20QDeferredDeleteEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QDeferredDeleteEvent) -16 (int (*)(...))QDeferredDeleteEvent::~QDeferredDeleteEvent -24 (int (*)(...))QDeferredDeleteEvent::~QDeferredDeleteEvent - -Class QDeferredDeleteEvent - size=24 align=8 - base size=24 base align=8 -QDeferredDeleteEvent (0x0x7fba10c19618) 0 - vptr=((& QDeferredDeleteEvent::_ZTV20QDeferredDeleteEvent) + 16u) - QEvent (0x0x7fba10bc0a20) 0 - primary-for QDeferredDeleteEvent (0x0x7fba10c19618) - -Class QCoreApplication::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QCoreApplication::QPrivateSignal (0x0x7fba10bc0ae0) 0 empty - -Vtable for QCoreApplication -QCoreApplication::_ZTV16QCoreApplication: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QCoreApplication) -16 (int (*)(...))QCoreApplication::metaObject -24 (int (*)(...))QCoreApplication::qt_metacast -32 (int (*)(...))QCoreApplication::qt_metacall -40 (int (*)(...))QCoreApplication::~QCoreApplication -48 (int (*)(...))QCoreApplication::~QCoreApplication -56 (int (*)(...))QCoreApplication::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QCoreApplication::notify -120 (int (*)(...))QCoreApplication::compressEvent - -Class QCoreApplication - size=16 align=8 - base size=16 base align=8 -QCoreApplication (0x0x7fba10c19680) 0 - vptr=((& QCoreApplication::_ZTV16QCoreApplication) + 16u) - QObject (0x0x7fba10bc0a80) 0 - primary-for QCoreApplication (0x0x7fba10c19680) - -Class QCommandLineParser - size=8 align=8 - base size=8 base align=8 -QCommandLineParser (0x0x7fba10bc0b40) 0 - -Class QContiguousCacheData - size=24 align=4 - base size=24 base align=4 -QContiguousCacheData (0x0x7fba10bc0ba0) 0 - -Class QCryptographicHash - size=8 align=8 - base size=8 base align=8 -QCryptographicHash (0x0x7fba10caa1e0) 0 - -Class QDataStream - size=32 align=8 - base size=32 base align=8 -QDataStream (0x0x7fba10caa240) 0 - -Class QtPrivate::StreamStateSaver - size=16 align=8 - base size=12 base align=8 -QtPrivate::StreamStateSaver (0x0x7fba10caa300) 0 - -Class QDate - size=8 align=8 - base size=8 base align=8 -QDate (0x0x7fba10caa7e0) 0 - -Class QTime - size=4 align=4 - base size=4 base align=4 -QTime (0x0x7fba10caaa80) 0 - -Class QDateTime::ShortData - size=8 align=8 - base size=8 base align=8 -QDateTime::ShortData (0x0x7fba1097d240) 0 - -Class QDateTime::Data - size=8 align=8 - base size=8 base align=8 -QDateTime::Data (0x0x7fba1097d2a0) 0 - -Class QDateTime - size=8 align=8 - base size=8 base align=8 -QDateTime (0x0x7fba1097d1e0) 0 - -Class QElapsedTimer - size=16 align=8 - base size=16 base align=8 -QElapsedTimer (0x0x7fba10a263c0) 0 - -Class QDeadlineTimer - size=16 align=8 - base size=16 base align=8 -QDeadlineTimer (0x0x7fba10a268a0) 0 - -Vtable for QTextStream -QTextStream::_ZTV11QTextStream: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTextStream) -16 (int (*)(...))QTextStream::~QTextStream -24 (int (*)(...))QTextStream::~QTextStream - -Class QTextStream - size=16 align=8 - base size=16 base align=8 -QTextStream (0x0x7fba10744840) 0 - vptr=((& QTextStream::_ZTV11QTextStream) + 16u) - -Class QTextStreamManipulator - size=40 align=8 - base size=38 base align=8 -QTextStreamManipulator (0x0x7fba10744ae0) 0 - -Class QtSharedPointer::NormalDeleter - size=1 align=1 - base size=0 base align=1 -QtSharedPointer::NormalDeleter (0x0x7fba10744d20) 0 empty - -Class QtSharedPointer::ExternalRefCountData - size=16 align=8 - base size=16 base align=8 -QtSharedPointer::ExternalRefCountData (0x0x7fba10744ea0) 0 - -Class QDebug::Stream - size=80 align=8 - base size=76 base align=8 -QDebug::Stream (0x0x7fba1088f420) 0 - -Class QDebug - size=8 align=8 - base size=8 base align=8 -QDebug (0x0x7fba1088f3c0) 0 - -Class QDebugStateSaver - size=8 align=8 - base size=8 base align=8 -QDebugStateSaver (0x0x7fba105e1900) 0 - -Class QNoDebug - size=1 align=1 - base size=0 base align=1 -QNoDebug (0x0x7fba105e19c0) 0 empty - -Class QFileDevice::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFileDevice::QPrivateSignal (0x0x7fba106b1b40) 0 empty - -Vtable for QFileDevice -QFileDevice::_ZTV11QFileDevice: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QFileDevice) -16 (int (*)(...))QFileDevice::metaObject -24 (int (*)(...))QFileDevice::qt_metacast -32 (int (*)(...))QFileDevice::qt_metacall -40 (int (*)(...))QFileDevice::~QFileDevice -48 (int (*)(...))QFileDevice::~QFileDevice -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QFileDevice::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFileDevice::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QFileDevice::writeData -240 (int (*)(...))QFileDevice::fileName -248 (int (*)(...))QFileDevice::resize -256 (int (*)(...))QFileDevice::permissions -264 (int (*)(...))QFileDevice::setPermissions - -Class QFileDevice - size=16 align=8 - base size=16 base align=8 -QFileDevice (0x0x7fba106c75b0) 0 - vptr=((& QFileDevice::_ZTV11QFileDevice) + 16u) - QIODevice (0x0x7fba106c7618) 0 - primary-for QFileDevice (0x0x7fba106c75b0) - QObject (0x0x7fba106b1ae0) 0 - primary-for QIODevice (0x0x7fba106c7618) - -Class QFile::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFile::QPrivateSignal (0x0x7fba106b1d80) 0 empty - -Vtable for QFile -QFile::_ZTV5QFile: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI5QFile) -16 (int (*)(...))QFile::metaObject -24 (int (*)(...))QFile::qt_metacast -32 (int (*)(...))QFile::qt_metacall -40 (int (*)(...))QFile::~QFile -48 (int (*)(...))QFile::~QFile -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QFile::open -128 (int (*)(...))QFileDevice::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFile::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QFileDevice::writeData -240 (int (*)(...))QFile::fileName -248 (int (*)(...))QFile::resize -256 (int (*)(...))QFile::permissions -264 (int (*)(...))QFile::setPermissions - -Class QFile - size=16 align=8 - base size=16 base align=8 -QFile (0x0x7fba106c7750) 0 - vptr=((& QFile::_ZTV5QFile) + 16u) - QFileDevice (0x0x7fba106c77b8) 0 - primary-for QFile (0x0x7fba106c7750) - QIODevice (0x0x7fba106c7820) 0 - primary-for QFileDevice (0x0x7fba106c77b8) - QObject (0x0x7fba106b1d20) 0 - primary-for QIODevice (0x0x7fba106c7820) - -Class QFileInfo - size=8 align=8 - base size=8 base align=8 -QFileInfo (0x0x7fba106b1f60) 0 - -Class QDir - size=8 align=8 - base size=8 base align=8 -QDir (0x0x7fba103633c0) 0 - -Class QDirIterator - size=8 align=8 - base size=8 base align=8 -QDirIterator (0x0x7fba10363d80) 0 - -Class QEasingCurve - size=8 align=8 - base size=8 base align=8 -QEasingCurve (0x0x7fba10458000) 0 - -Class QEventTransition::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QEventTransition::QPrivateSignal (0x0x7fba104e5420) 0 empty - -Vtable for QEventTransition -QEventTransition::_ZTV16QEventTransition: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QEventTransition) -16 (int (*)(...))QEventTransition::metaObject -24 (int (*)(...))QEventTransition::qt_metacast -32 (int (*)(...))QEventTransition::qt_metacall -40 (int (*)(...))QEventTransition::~QEventTransition -48 (int (*)(...))QEventTransition::~QEventTransition -56 (int (*)(...))QEventTransition::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QEventTransition::eventTest -120 (int (*)(...))QEventTransition::onTransition - -Class QEventTransition - size=16 align=8 - base size=16 base align=8 -QEventTransition (0x0x7fba104d8a28) 0 - vptr=((& QEventTransition::_ZTV16QEventTransition) + 16u) - QAbstractTransition (0x0x7fba104d8a90) 0 - primary-for QEventTransition (0x0x7fba104d8a28) - QObject (0x0x7fba104e53c0) 0 - primary-for QAbstractTransition (0x0x7fba104d8a90) - -Vtable for QException -QException::_ZTV10QException: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QException) -16 (int (*)(...))QException::~QException -24 (int (*)(...))QException::~QException -32 (int (*)(...))std::exception::what -40 (int (*)(...))QException::raise -48 (int (*)(...))QException::clone - -Class QException - size=8 align=8 - base size=8 base align=8 -QException (0x0x7fba104d8af8) 0 nearly-empty - vptr=((& QException::_ZTV10QException) + 16u) - std::exception (0x0x7fba104e5480) 0 nearly-empty - primary-for QException (0x0x7fba104d8af8) - -Vtable for QUnhandledException -QUnhandledException::_ZTV19QUnhandledException: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QUnhandledException) -16 (int (*)(...))QUnhandledException::~QUnhandledException -24 (int (*)(...))QUnhandledException::~QUnhandledException -32 (int (*)(...))std::exception::what -40 (int (*)(...))QUnhandledException::raise -48 (int (*)(...))QUnhandledException::clone - -Class QUnhandledException - size=8 align=8 - base size=8 base align=8 -QUnhandledException (0x0x7fba104d8b60) 0 nearly-empty - vptr=((& QUnhandledException::_ZTV19QUnhandledException) + 16u) - QException (0x0x7fba104d8bc8) 0 nearly-empty - primary-for QUnhandledException (0x0x7fba104d8b60) - std::exception (0x0x7fba104e54e0) 0 nearly-empty - primary-for QException (0x0x7fba104d8bc8) - -Class QtPrivate::ExceptionHolder - size=8 align=8 - base size=8 base align=8 -QtPrivate::ExceptionHolder (0x0x7fba104e5540) 0 - -Class QtPrivate::ExceptionStore - size=8 align=8 - base size=8 base align=8 -QtPrivate::ExceptionStore (0x0x7fba104e5600) 0 - -Vtable for QFactoryInterface -QFactoryInterface::_ZTV17QFactoryInterface: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QFactoryInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QFactoryInterface - size=8 align=8 - base size=8 base align=8 -QFactoryInterface (0x0x7fba104e5660) 0 nearly-empty - vptr=((& QFactoryInterface::_ZTV17QFactoryInterface) + 16u) - -Class QFileSelector::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFileSelector::QPrivateSignal (0x0x7fba104e5780) 0 empty - -Vtable for QFileSelector -QFileSelector::_ZTV13QFileSelector: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QFileSelector) -16 (int (*)(...))QFileSelector::metaObject -24 (int (*)(...))QFileSelector::qt_metacast -32 (int (*)(...))QFileSelector::qt_metacall -40 (int (*)(...))QFileSelector::~QFileSelector -48 (int (*)(...))QFileSelector::~QFileSelector -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QFileSelector - size=16 align=8 - base size=16 base align=8 -QFileSelector (0x0x7fba104d8c30) 0 - vptr=((& QFileSelector::_ZTV13QFileSelector) + 16u) - QObject (0x0x7fba104e5720) 0 - primary-for QFileSelector (0x0x7fba104d8c30) - -Class QFileSystemWatcher::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFileSystemWatcher::QPrivateSignal (0x0x7fba104e5840) 0 empty - -Vtable for QFileSystemWatcher -QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QFileSystemWatcher) -16 (int (*)(...))QFileSystemWatcher::metaObject -24 (int (*)(...))QFileSystemWatcher::qt_metacast -32 (int (*)(...))QFileSystemWatcher::qt_metacall -40 (int (*)(...))QFileSystemWatcher::~QFileSystemWatcher -48 (int (*)(...))QFileSystemWatcher::~QFileSystemWatcher -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QFileSystemWatcher - size=16 align=8 - base size=16 base align=8 -QFileSystemWatcher (0x0x7fba104d8c98) 0 - vptr=((& QFileSystemWatcher::_ZTV18QFileSystemWatcher) + 16u) - QObject (0x0x7fba104e57e0) 0 - primary-for QFileSystemWatcher (0x0x7fba104d8c98) - -Class QFinalState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFinalState::QPrivateSignal (0x0x7fba104e5900) 0 empty - -Vtable for QFinalState -QFinalState::_ZTV11QFinalState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QFinalState) -16 (int (*)(...))QFinalState::metaObject -24 (int (*)(...))QFinalState::qt_metacast -32 (int (*)(...))QFinalState::qt_metacall -40 (int (*)(...))QFinalState::~QFinalState -48 (int (*)(...))QFinalState::~QFinalState -56 (int (*)(...))QFinalState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFinalState::onEntry -120 (int (*)(...))QFinalState::onExit - -Class QFinalState - size=16 align=8 - base size=16 base align=8 -QFinalState (0x0x7fba104d8d00) 0 - vptr=((& QFinalState::_ZTV11QFinalState) + 16u) - QAbstractState (0x0x7fba104d8d68) 0 - primary-for QFinalState (0x0x7fba104d8d00) - QObject (0x0x7fba104e58a0) 0 - primary-for QAbstractState (0x0x7fba104d8d68) - -Vtable for QRunnable -QRunnable::_ZTV9QRunnable: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QRunnable) -16 (int (*)(...))__cxa_pure_virtual -24 0u -32 0u - -Class QRunnable - size=16 align=8 - base size=12 base align=8 -QRunnable (0x0x7fba104e5960) 0 - vptr=((& QRunnable::_ZTV9QRunnable) + 16u) - -Class QBasicMutex - size=8 align=8 - base size=8 base align=8 -QBasicMutex (0x0x7fba104e59c0) 0 - -Class QMutex - size=8 align=8 - base size=8 base align=8 -QMutex (0x0x7fba104d8ea0) 0 - QBasicMutex (0x0x7fba104e5ba0) 0 - -Class QMutexLocker - size=8 align=8 - base size=8 base align=8 -QMutexLocker (0x0x7fba104e5c00) 0 - -Class QtPrivate::ResultItem - size=16 align=8 - base size=16 base align=8 -QtPrivate::ResultItem (0x0x7fba104e5c60) 0 - -Class QtPrivate::ResultIteratorBase - size=16 align=8 - base size=12 base align=8 -QtPrivate::ResultIteratorBase (0x0x7fba104e5cc0) 0 - -Vtable for QtPrivate::ResultStoreBase -QtPrivate::ResultStoreBase::_ZTVN9QtPrivate15ResultStoreBaseE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9QtPrivate15ResultStoreBaseE) -16 (int (*)(...))QtPrivate::ResultStoreBase::~ResultStoreBase -24 (int (*)(...))QtPrivate::ResultStoreBase::~ResultStoreBase - -Class QtPrivate::ResultStoreBase - size=48 align=8 - base size=44 base align=8 -QtPrivate::ResultStoreBase (0x0x7fba104e5de0) 0 - vptr=((& QtPrivate::ResultStoreBase::_ZTVN9QtPrivate15ResultStoreBaseE) + 16u) - -Vtable for QFutureInterfaceBase -QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QFutureInterfaceBase) -16 (int (*)(...))QFutureInterfaceBase::~QFutureInterfaceBase -24 (int (*)(...))QFutureInterfaceBase::~QFutureInterfaceBase - -Class QFutureInterfaceBase - size=16 align=8 - base size=16 base align=8 -QFutureInterfaceBase (0x0x7fba10268660) 0 - vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 16u) - -Class QFutureWatcherBase::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFutureWatcherBase::QPrivateSignal (0x0x7fba10268e40) 0 empty - -Vtable for QFutureWatcherBase -QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QFutureWatcherBase) -16 (int (*)(...))QFutureWatcherBase::metaObject -24 (int (*)(...))QFutureWatcherBase::qt_metacast -32 (int (*)(...))QFutureWatcherBase::qt_metacall -40 0u -48 0u -56 (int (*)(...))QFutureWatcherBase::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QFutureWatcherBase::connectNotify -104 (int (*)(...))QFutureWatcherBase::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QFutureWatcherBase - size=16 align=8 - base size=16 base align=8 -QFutureWatcherBase (0x0x7fba10316000) 0 - vptr=((& QFutureWatcherBase::_ZTV18QFutureWatcherBase) + 16u) - QObject (0x0x7fba10268de0) 0 - primary-for QFutureWatcherBase (0x0x7fba10316000) - -Class QHistoryState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QHistoryState::QPrivateSignal (0x0x7fba0ff46480) 0 empty - -Vtable for QHistoryState -QHistoryState::_ZTV13QHistoryState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QHistoryState) -16 (int (*)(...))QHistoryState::metaObject -24 (int (*)(...))QHistoryState::qt_metacast -32 (int (*)(...))QHistoryState::qt_metacall -40 (int (*)(...))QHistoryState::~QHistoryState -48 (int (*)(...))QHistoryState::~QHistoryState -56 (int (*)(...))QHistoryState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QHistoryState::onEntry -120 (int (*)(...))QHistoryState::onExit - -Class QHistoryState - size=16 align=8 - base size=16 base align=8 -QHistoryState (0x0x7fba103168f0) 0 - vptr=((& QHistoryState::_ZTV13QHistoryState) + 16u) - QAbstractState (0x0x7fba10316958) 0 - primary-for QHistoryState (0x0x7fba103168f0) - QObject (0x0x7fba0ff46420) 0 - primary-for QAbstractState (0x0x7fba10316958) - -Class QIdentityProxyModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIdentityProxyModel::QPrivateSignal (0x0x7fba0ff46540) 0 empty - -Vtable for QIdentityProxyModel -QIdentityProxyModel::_ZTV19QIdentityProxyModel: 53u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QIdentityProxyModel) -16 (int (*)(...))QIdentityProxyModel::metaObject -24 (int (*)(...))QIdentityProxyModel::qt_metacast -32 (int (*)(...))QIdentityProxyModel::qt_metacall -40 (int (*)(...))QIdentityProxyModel::~QIdentityProxyModel -48 (int (*)(...))QIdentityProxyModel::~QIdentityProxyModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QIdentityProxyModel::index -120 (int (*)(...))QIdentityProxyModel::parent -128 (int (*)(...))QIdentityProxyModel::sibling -136 (int (*)(...))QIdentityProxyModel::rowCount -144 (int (*)(...))QIdentityProxyModel::columnCount -152 (int (*)(...))QAbstractProxyModel::hasChildren -160 (int (*)(...))QAbstractProxyModel::data -168 (int (*)(...))QAbstractProxyModel::setData -176 (int (*)(...))QIdentityProxyModel::headerData -184 (int (*)(...))QAbstractProxyModel::setHeaderData -192 (int (*)(...))QAbstractProxyModel::itemData -200 (int (*)(...))QAbstractProxyModel::setItemData -208 (int (*)(...))QAbstractProxyModel::mimeTypes -216 (int (*)(...))QAbstractProxyModel::mimeData -224 (int (*)(...))QAbstractProxyModel::canDropMimeData -232 (int (*)(...))QIdentityProxyModel::dropMimeData -240 (int (*)(...))QAbstractProxyModel::supportedDropActions -248 (int (*)(...))QAbstractProxyModel::supportedDragActions -256 (int (*)(...))QIdentityProxyModel::insertRows -264 (int (*)(...))QIdentityProxyModel::insertColumns -272 (int (*)(...))QIdentityProxyModel::removeRows -280 (int (*)(...))QIdentityProxyModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractProxyModel::fetchMore -312 (int (*)(...))QAbstractProxyModel::canFetchMore -320 (int (*)(...))QAbstractProxyModel::flags -328 (int (*)(...))QAbstractProxyModel::sort -336 (int (*)(...))QAbstractProxyModel::buddy -344 (int (*)(...))QIdentityProxyModel::match -352 (int (*)(...))QAbstractProxyModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractProxyModel::submit -376 (int (*)(...))QAbstractProxyModel::revert -384 (int (*)(...))QIdentityProxyModel::setSourceModel -392 (int (*)(...))QIdentityProxyModel::mapToSource -400 (int (*)(...))QIdentityProxyModel::mapFromSource -408 (int (*)(...))QIdentityProxyModel::mapSelectionToSource -416 (int (*)(...))QIdentityProxyModel::mapSelectionFromSource - -Class QIdentityProxyModel - size=16 align=8 - base size=16 base align=8 -QIdentityProxyModel (0x0x7fba103169c0) 0 - vptr=((& QIdentityProxyModel::_ZTV19QIdentityProxyModel) + 16u) - QAbstractProxyModel (0x0x7fba10316a28) 0 - primary-for QIdentityProxyModel (0x0x7fba103169c0) - QAbstractItemModel (0x0x7fba10316a90) 0 - primary-for QAbstractProxyModel (0x0x7fba10316a28) - QObject (0x0x7fba0ff464e0) 0 - primary-for QAbstractItemModel (0x0x7fba10316a90) - -Class QItemSelectionRange - size=16 align=8 - base size=16 base align=8 -QItemSelectionRange (0x0x7fba0ff465a0) 0 - -Class QItemSelectionModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QItemSelectionModel::QPrivateSignal (0x0x7fba0ff46c60) 0 empty - -Vtable for QItemSelectionModel -QItemSelectionModel::_ZTV19QItemSelectionModel: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QItemSelectionModel) -16 (int (*)(...))QItemSelectionModel::metaObject -24 (int (*)(...))QItemSelectionModel::qt_metacast -32 (int (*)(...))QItemSelectionModel::qt_metacall -40 (int (*)(...))QItemSelectionModel::~QItemSelectionModel -48 (int (*)(...))QItemSelectionModel::~QItemSelectionModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QItemSelectionModel::setCurrentIndex -120 (int (*)(...))QItemSelectionModel::select -128 (int (*)(...))QItemSelectionModel::select -136 (int (*)(...))QItemSelectionModel::clear -144 (int (*)(...))QItemSelectionModel::reset -152 (int (*)(...))QItemSelectionModel::clearCurrentIndex - -Class QItemSelectionModel - size=16 align=8 - base size=16 base align=8 -QItemSelectionModel (0x0x7fba0ffb52d8) 0 - vptr=((& QItemSelectionModel::_ZTV19QItemSelectionModel) + 16u) - QObject (0x0x7fba0ff46c00) 0 - primary-for QItemSelectionModel (0x0x7fba0ffb52d8) - -Class QItemSelection - size=8 align=8 - base size=8 base align=8 -QItemSelection (0x0x7fba0ffb54e0) 0 - QList (0x0x7fba0ffb5548) 0 - QListSpecialMethods (0x0x7fba0ff46f60) 0 empty - -Class QJsonValue - size=24 align=8 - base size=20 base align=8 -QJsonValue (0x0x7fba1003f480) 0 - -Class QJsonValueRef - size=16 align=8 - base size=12 base align=8 -QJsonValueRef (0x0x7fba0fdb3ba0) 0 - -Class QJsonValuePtr - size=24 align=8 - base size=24 base align=8 -QJsonValuePtr (0x0x7fba0fe18120) 0 - -Class QJsonValueRefPtr - size=16 align=8 - base size=16 base align=8 -QJsonValueRefPtr (0x0x7fba0fe18180) 0 - -Class QJsonArray::iterator - size=16 align=8 - base size=12 base align=8 -QJsonArray::iterator (0x0x7fba0fe18360) 0 - -Class QJsonArray::const_iterator - size=16 align=8 - base size=12 base align=8 -QJsonArray::const_iterator (0x0x7fba0fe183c0) 0 - -Class QJsonArray - size=16 align=8 - base size=16 base align=8 -QJsonArray (0x0x7fba0fe18300) 0 - -Class QJsonParseError - size=8 align=4 - base size=8 base align=4 -QJsonParseError (0x0x7fba0fed4600) 0 - -Class QJsonDocument - size=8 align=8 - base size=8 base align=8 -QJsonDocument (0x0x7fba0fed4660) 0 - -Class QJsonObject::iterator - size=16 align=8 - base size=12 base align=8 -QJsonObject::iterator (0x0x7fba0fed4cc0) 0 - -Class QJsonObject::const_iterator - size=16 align=8 - base size=12 base align=8 -QJsonObject::const_iterator (0x0x7fba0fed4d20) 0 - -Class QJsonObject - size=16 align=8 - base size=16 base align=8 -QJsonObject (0x0x7fba0fed4c60) 0 - -Class QLibrary::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QLibrary::QPrivateSignal (0x0x7fba0fc1e000) 0 empty - -Vtable for QLibrary -QLibrary::_ZTV8QLibrary: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QLibrary) -16 (int (*)(...))QLibrary::metaObject -24 (int (*)(...))QLibrary::qt_metacast -32 (int (*)(...))QLibrary::qt_metacall -40 (int (*)(...))QLibrary::~QLibrary -48 (int (*)(...))QLibrary::~QLibrary -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QLibrary - size=32 align=8 - base size=25 base align=8 -QLibrary (0x0x7fba0fbdc888) 0 - vptr=((& QLibrary::_ZTV8QLibrary) + 16u) - QObject (0x0x7fba0fbc2f60) 0 - primary-for QLibrary (0x0x7fba0fbdc888) - -Class QVersionNumber::SegmentStorage - size=8 align=8 - base size=8 base align=8 -QVersionNumber::SegmentStorage (0x0x7fba0fc1e6c0) 0 - -Class QVersionNumber - size=8 align=8 - base size=8 base align=8 -QVersionNumber (0x0x7fba0fc1e1e0) 0 - -Class QLibraryInfo - size=1 align=1 - base size=0 base align=1 -QLibraryInfo (0x0x7fba0fc1eba0) 0 empty - -Class QPoint - size=8 align=4 - base size=8 base align=4 -QPoint (0x0x7fba0fc1ec00) 0 - -Class QPointF - size=16 align=8 - base size=16 base align=8 -QPointF (0x0x7fba0fc1eea0) 0 - -Class QLine - size=16 align=4 - base size=16 base align=4 -QLine (0x0x7fba0f926180) 0 - -Class QLineF - size=32 align=8 - base size=32 base align=8 -QLineF (0x0x7fba0f926ae0) 0 - -Class QLinkedListData - size=32 align=8 - base size=25 base align=8 -QLinkedListData (0x0x7fba0f9b4480) 0 - -Class QLockFile - size=8 align=8 - base size=8 base align=8 -QLockFile (0x0x7fba0f9b47e0) 0 - -Class QLoggingCategory::AtomicBools - size=4 align=1 - base size=4 base align=1 -QLoggingCategory::AtomicBools (0x0x7fba0f9b4960) 0 - -Class QLoggingCategory - size=24 align=8 - base size=24 base align=8 -QLoggingCategory (0x0x7fba0f9b4900) 0 - -Class QMargins - size=16 align=4 - base size=16 base align=4 -QMargins (0x0x7fba0f9b4ae0) 0 - -Class QMarginsF - size=32 align=8 - base size=32 base align=8 -QMarginsF (0x0x7fba0f9b4d80) 0 - -Class QMessageAuthenticationCode - size=8 align=8 - base size=8 base align=8 -QMessageAuthenticationCode (0x0x7fba0f739420) 0 - -Class QMetaMethod - size=16 align=8 - base size=12 base align=8 -QMetaMethod (0x0x7fba0f739480) 0 - -Class QMetaEnum - size=16 align=8 - base size=12 base align=8 -QMetaEnum (0x0x7fba0f739a80) 0 - -Class QMetaProperty - size=32 align=8 - base size=32 base align=8 -QMetaProperty (0x0x7fba0f739d80) 0 - -Class QMetaClassInfo - size=16 align=8 - base size=12 base align=8 -QMetaClassInfo (0x0x7fba0f739de0) 0 - -Class QMimeData::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QMimeData::QPrivateSignal (0x0x7fba0f7ef120) 0 empty - -Vtable for QMimeData -QMimeData::_ZTV9QMimeData: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QMimeData) -16 (int (*)(...))QMimeData::metaObject -24 (int (*)(...))QMimeData::qt_metacast -32 (int (*)(...))QMimeData::qt_metacall -40 (int (*)(...))QMimeData::~QMimeData -48 (int (*)(...))QMimeData::~QMimeData -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QMimeData::hasFormat -120 (int (*)(...))QMimeData::formats -128 (int (*)(...))QMimeData::retrieveData - -Class QMimeData - size=16 align=8 - base size=16 base align=8 -QMimeData (0x0x7fba0f756af8) 0 - vptr=((& QMimeData::_ZTV9QMimeData) + 16u) - QObject (0x0x7fba0f7ef0c0) 0 - primary-for QMimeData (0x0x7fba0f756af8) - -Class QMimeType - size=8 align=8 - base size=8 base align=8 -QMimeType (0x0x7fba0f7ef180) 0 - -Class QMimeDatabase - size=8 align=8 - base size=8 base align=8 -QMimeDatabase (0x0x7fba0f7ef480) 0 - -Class QObjectCleanupHandler::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QObjectCleanupHandler::QPrivateSignal (0x0x7fba0f7ef540) 0 empty - -Vtable for QObjectCleanupHandler -QObjectCleanupHandler::_ZTV21QObjectCleanupHandler: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QObjectCleanupHandler) -16 (int (*)(...))QObjectCleanupHandler::metaObject -24 (int (*)(...))QObjectCleanupHandler::qt_metacast -32 (int (*)(...))QObjectCleanupHandler::qt_metacall -40 (int (*)(...))QObjectCleanupHandler::~QObjectCleanupHandler -48 (int (*)(...))QObjectCleanupHandler::~QObjectCleanupHandler -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QObjectCleanupHandler - size=24 align=8 - base size=24 base align=8 -QObjectCleanupHandler (0x0x7fba0f756d00) 0 - vptr=((& QObjectCleanupHandler::_ZTV21QObjectCleanupHandler) + 16u) - QObject (0x0x7fba0f7ef4e0) 0 - primary-for QObjectCleanupHandler (0x0x7fba0f756d00) - -Class QOperatingSystemVersion - size=16 align=4 - base size=16 base align=4 -QOperatingSystemVersion (0x0x7fba0f7ef5a0) 0 - -Class QParallelAnimationGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QParallelAnimationGroup::QPrivateSignal (0x0x7fba0f7efd20) 0 empty - -Vtable for QParallelAnimationGroup -QParallelAnimationGroup::_ZTV23QParallelAnimationGroup: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QParallelAnimationGroup) -16 (int (*)(...))QParallelAnimationGroup::metaObject -24 (int (*)(...))QParallelAnimationGroup::qt_metacast -32 (int (*)(...))QParallelAnimationGroup::qt_metacall -40 (int (*)(...))QParallelAnimationGroup::~QParallelAnimationGroup -48 (int (*)(...))QParallelAnimationGroup::~QParallelAnimationGroup -56 (int (*)(...))QParallelAnimationGroup::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QParallelAnimationGroup::duration -120 (int (*)(...))QParallelAnimationGroup::updateCurrentTime -128 (int (*)(...))QParallelAnimationGroup::updateState -136 (int (*)(...))QParallelAnimationGroup::updateDirection - -Class QParallelAnimationGroup - size=16 align=8 - base size=16 base align=8 -QParallelAnimationGroup (0x0x7fba0f851410) 0 - vptr=((& QParallelAnimationGroup::_ZTV23QParallelAnimationGroup) + 16u) - QAnimationGroup (0x0x7fba0f851478) 0 - primary-for QParallelAnimationGroup (0x0x7fba0f851410) - QAbstractAnimation (0x0x7fba0f8514e0) 0 - primary-for QAnimationGroup (0x0x7fba0f851478) - QObject (0x0x7fba0f7efcc0) 0 - primary-for QAbstractAnimation (0x0x7fba0f8514e0) - -Class QPauseAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPauseAnimation::QPrivateSignal (0x0x7fba0f7efde0) 0 empty - -Vtable for QPauseAnimation -QPauseAnimation::_ZTV15QPauseAnimation: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QPauseAnimation) -16 (int (*)(...))QPauseAnimation::metaObject -24 (int (*)(...))QPauseAnimation::qt_metacast -32 (int (*)(...))QPauseAnimation::qt_metacall -40 (int (*)(...))QPauseAnimation::~QPauseAnimation -48 (int (*)(...))QPauseAnimation::~QPauseAnimation -56 (int (*)(...))QPauseAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QPauseAnimation::duration -120 (int (*)(...))QPauseAnimation::updateCurrentTime -128 (int (*)(...))QAbstractAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection - -Class QPauseAnimation - size=16 align=8 - base size=16 base align=8 -QPauseAnimation (0x0x7fba0f851548) 0 - vptr=((& QPauseAnimation::_ZTV15QPauseAnimation) + 16u) - QAbstractAnimation (0x0x7fba0f8515b0) 0 - primary-for QPauseAnimation (0x0x7fba0f851548) - QObject (0x0x7fba0f7efd80) 0 - primary-for QAbstractAnimation (0x0x7fba0f8515b0) - -Class QStaticPlugin - size=16 align=8 - base size=16 base align=8 -QStaticPlugin (0x0x7fba0f8a2000) 0 - -Class QPluginLoader::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPluginLoader::QPrivateSignal (0x0x7fba0f8a2300) 0 empty - -Vtable for QPluginLoader -QPluginLoader::_ZTV13QPluginLoader: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QPluginLoader) -16 (int (*)(...))QPluginLoader::metaObject -24 (int (*)(...))QPluginLoader::qt_metacast -32 (int (*)(...))QPluginLoader::qt_metacall -40 (int (*)(...))QPluginLoader::~QPluginLoader -48 (int (*)(...))QPluginLoader::~QPluginLoader -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QPluginLoader - size=32 align=8 - base size=25 base align=8 -QPluginLoader (0x0x7fba0f8517b8) 0 - vptr=((& QPluginLoader::_ZTV13QPluginLoader) + 16u) - QObject (0x0x7fba0f8a22a0) 0 - primary-for QPluginLoader (0x0x7fba0f8517b8) - -Class QProcessEnvironment - size=8 align=8 - base size=8 base align=8 -QProcessEnvironment (0x0x7fba0f8a2360) 0 - -Class QProcess::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QProcess::QPrivateSignal (0x0x7fba0f8a2a20) 0 empty - -Vtable for QProcess -QProcess::_ZTV8QProcess: 31u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QProcess) -16 (int (*)(...))QProcess::metaObject -24 (int (*)(...))QProcess::qt_metacast -32 (int (*)(...))QProcess::qt_metacall -40 (int (*)(...))QProcess::~QProcess -48 (int (*)(...))QProcess::~QProcess -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QProcess::isSequential -120 (int (*)(...))QProcess::open -128 (int (*)(...))QProcess::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QProcess::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QProcess::bytesAvailable -184 (int (*)(...))QProcess::bytesToWrite -192 (int (*)(...))QProcess::canReadLine -200 (int (*)(...))QProcess::waitForReadyRead -208 (int (*)(...))QProcess::waitForBytesWritten -216 (int (*)(...))QProcess::readData -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QProcess::writeData -240 (int (*)(...))QProcess::setupChildProcess - -Class QProcess - size=16 align=8 - base size=16 base align=8 -QProcess (0x0x7fba0f851e38) 0 - vptr=((& QProcess::_ZTV8QProcess) + 16u) - QIODevice (0x0x7fba0f851ea0) 0 - primary-for QProcess (0x0x7fba0f851e38) - QObject (0x0x7fba0f8a29c0) 0 - primary-for QIODevice (0x0x7fba0f851ea0) - -Class QVariantAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QVariantAnimation::QPrivateSignal (0x0x7fba0f8a2ae0) 0 empty - -Vtable for QVariantAnimation -QVariantAnimation::_ZTV17QVariantAnimation: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QVariantAnimation) -16 (int (*)(...))QVariantAnimation::metaObject -24 (int (*)(...))QVariantAnimation::qt_metacast -32 (int (*)(...))QVariantAnimation::qt_metacall -40 (int (*)(...))QVariantAnimation::~QVariantAnimation -48 (int (*)(...))QVariantAnimation::~QVariantAnimation -56 (int (*)(...))QVariantAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QVariantAnimation::duration -120 (int (*)(...))QVariantAnimation::updateCurrentTime -128 (int (*)(...))QVariantAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection -144 (int (*)(...))QVariantAnimation::updateCurrentValue -152 (int (*)(...))QVariantAnimation::interpolated - -Class QVariantAnimation - size=16 align=8 - base size=16 base align=8 -QVariantAnimation (0x0x7fba0f851f08) 0 - vptr=((& QVariantAnimation::_ZTV17QVariantAnimation) + 16u) - QAbstractAnimation (0x0x7fba0f851f70) 0 - primary-for QVariantAnimation (0x0x7fba0f851f08) - QObject (0x0x7fba0f8a2a80) 0 - primary-for QAbstractAnimation (0x0x7fba0f851f70) - -Class QPropertyAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPropertyAnimation::QPrivateSignal (0x0x7fba0f8a2ba0) 0 empty - -Vtable for QPropertyAnimation -QPropertyAnimation::_ZTV18QPropertyAnimation: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QPropertyAnimation) -16 (int (*)(...))QPropertyAnimation::metaObject -24 (int (*)(...))QPropertyAnimation::qt_metacast -32 (int (*)(...))QPropertyAnimation::qt_metacall -40 (int (*)(...))QPropertyAnimation::~QPropertyAnimation -48 (int (*)(...))QPropertyAnimation::~QPropertyAnimation -56 (int (*)(...))QPropertyAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QVariantAnimation::duration -120 (int (*)(...))QVariantAnimation::updateCurrentTime -128 (int (*)(...))QPropertyAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection -144 (int (*)(...))QPropertyAnimation::updateCurrentValue -152 (int (*)(...))QVariantAnimation::interpolated - -Class QPropertyAnimation - size=16 align=8 - base size=16 base align=8 -QPropertyAnimation (0x0x7fba0f52a068) 0 - vptr=((& QPropertyAnimation::_ZTV18QPropertyAnimation) + 16u) - QVariantAnimation (0x0x7fba0f52a0d0) 0 - primary-for QPropertyAnimation (0x0x7fba0f52a068) - QAbstractAnimation (0x0x7fba0f52a138) 0 - primary-for QVariantAnimation (0x0x7fba0f52a0d0) - QObject (0x0x7fba0f8a2b40) 0 - primary-for QAbstractAnimation (0x0x7fba0f52a138) - -Class QRandomGenerator::Storage - size=2504 align=8 - base size=2504 base align=8 -QRandomGenerator::Storage (0x0x7fba0f8a2cc0) 0 - -Class QRandomGenerator - size=2512 align=8 - base size=2512 base align=8 -QRandomGenerator (0x0x7fba0f8a2c60) 0 - -Class QRandomGenerator64 - size=2512 align=8 - base size=2512 base align=8 -QRandomGenerator64 (0x0x7fba0f5ca410) 0 - QRandomGenerator (0x0x7fba0f5adc60) 0 - -Class QReadWriteLock - size=8 align=8 - base size=8 base align=8 -QReadWriteLock (0x0x7fba0f5add20) 0 - -Class QReadLocker - size=8 align=8 - base size=8 base align=8 -QReadLocker (0x0x7fba0f66a000) 0 - -Class QWriteLocker - size=8 align=8 - base size=8 base align=8 -QWriteLocker (0x0x7fba0f66a0c0) 0 - -Class QSize - size=8 align=4 - base size=8 base align=4 -QSize (0x0x7fba0f66a180) 0 - -Class QSizeF - size=16 align=8 - base size=16 base align=8 -QSizeF (0x0x7fba0f66a420) 0 - -Class QRect - size=16 align=4 - base size=16 base align=4 -QRect (0x0x7fba0f66a6c0) 0 - -Class QRectF - size=32 align=8 - base size=32 base align=8 -QRectF (0x0x7fba0f66a960) 0 - -Class QRegularExpression - size=8 align=8 - base size=8 base align=8 -QRegularExpression (0x0x7fba0f66ac00) 0 - -Class QRegularExpressionMatch - size=8 align=8 - base size=8 base align=8 -QRegularExpressionMatch (0x0x7fba0f46a240) 0 - -Class QRegularExpressionMatchIterator - size=8 align=8 - base size=8 base align=8 -QRegularExpressionMatchIterator (0x0x7fba0f46a540) 0 - -Class QResource - size=8 align=8 - base size=8 base align=8 -QResource (0x0x7fba0f46a840) 0 - -Class QSaveFile::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSaveFile::QPrivateSignal (0x0x7fba0f46a9c0) 0 empty - -Vtable for QSaveFile -QSaveFile::_ZTV9QSaveFile: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QSaveFile) -16 (int (*)(...))QSaveFile::metaObject -24 (int (*)(...))QSaveFile::qt_metacast -32 (int (*)(...))QSaveFile::qt_metacall -40 (int (*)(...))QSaveFile::~QSaveFile -48 (int (*)(...))QSaveFile::~QSaveFile -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QSaveFile::open -128 (int (*)(...))QSaveFile::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFileDevice::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QSaveFile::writeData -240 (int (*)(...))QSaveFile::fileName -248 (int (*)(...))QFileDevice::resize -256 (int (*)(...))QFileDevice::permissions -264 (int (*)(...))QFileDevice::setPermissions - -Class QSaveFile - size=16 align=8 - base size=16 base align=8 -QSaveFile (0x0x7fba0f441618) 0 - vptr=((& QSaveFile::_ZTV9QSaveFile) + 16u) - QFileDevice (0x0x7fba0f441680) 0 - primary-for QSaveFile (0x0x7fba0f441618) - QIODevice (0x0x7fba0f4416e8) 0 - primary-for QFileDevice (0x0x7fba0f441680) - QObject (0x0x7fba0f46a960) 0 - primary-for QIODevice (0x0x7fba0f4416e8) - -Class QSemaphore - size=8 align=8 - base size=8 base align=8 -QSemaphore (0x0x7fba0f46aa80) 0 - -Class QSemaphoreReleaser - size=16 align=8 - base size=12 base align=8 -QSemaphoreReleaser (0x0x7fba0f46aae0) 0 - -Class QSequentialAnimationGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSequentialAnimationGroup::QPrivateSignal (0x0x7fba0f1ee120) 0 empty - -Vtable for QSequentialAnimationGroup -QSequentialAnimationGroup::_ZTV25QSequentialAnimationGroup: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QSequentialAnimationGroup) -16 (int (*)(...))QSequentialAnimationGroup::metaObject -24 (int (*)(...))QSequentialAnimationGroup::qt_metacast -32 (int (*)(...))QSequentialAnimationGroup::qt_metacall -40 (int (*)(...))QSequentialAnimationGroup::~QSequentialAnimationGroup -48 (int (*)(...))QSequentialAnimationGroup::~QSequentialAnimationGroup -56 (int (*)(...))QSequentialAnimationGroup::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QSequentialAnimationGroup::duration -120 (int (*)(...))QSequentialAnimationGroup::updateCurrentTime -128 (int (*)(...))QSequentialAnimationGroup::updateState -136 (int (*)(...))QSequentialAnimationGroup::updateDirection - -Class QSequentialAnimationGroup - size=16 align=8 - base size=16 base align=8 -QSequentialAnimationGroup (0x0x7fba0f1d0f08) 0 - vptr=((& QSequentialAnimationGroup::_ZTV25QSequentialAnimationGroup) + 16u) - QAnimationGroup (0x0x7fba0f1d0f70) 0 - primary-for QSequentialAnimationGroup (0x0x7fba0f1d0f08) - QAbstractAnimation (0x0x7fba0f1f1000) 0 - primary-for QAnimationGroup (0x0x7fba0f1d0f70) - QObject (0x0x7fba0f1ee0c0) 0 - primary-for QAbstractAnimation (0x0x7fba0f1f1000) - -Class QSettings::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSettings::QPrivateSignal (0x0x7fba0f1ee1e0) 0 empty - -Vtable for QSettings -QSettings::_ZTV9QSettings: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QSettings) -16 (int (*)(...))QSettings::metaObject -24 (int (*)(...))QSettings::qt_metacast -32 (int (*)(...))QSettings::qt_metacall -40 (int (*)(...))QSettings::~QSettings -48 (int (*)(...))QSettings::~QSettings -56 (int (*)(...))QSettings::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSettings - size=16 align=8 - base size=16 base align=8 -QSettings (0x0x7fba0f1f1068) 0 - vptr=((& QSettings::_ZTV9QSettings) + 16u) - QObject (0x0x7fba0f1ee180) 0 - primary-for QSettings (0x0x7fba0f1f1068) - -Class QSharedMemory::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSharedMemory::QPrivateSignal (0x0x7fba0f1ee2a0) 0 empty - -Vtable for QSharedMemory -QSharedMemory::_ZTV13QSharedMemory: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QSharedMemory) -16 (int (*)(...))QSharedMemory::metaObject -24 (int (*)(...))QSharedMemory::qt_metacast -32 (int (*)(...))QSharedMemory::qt_metacall -40 (int (*)(...))QSharedMemory::~QSharedMemory -48 (int (*)(...))QSharedMemory::~QSharedMemory -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSharedMemory - size=16 align=8 - base size=16 base align=8 -QSharedMemory (0x0x7fba0f1f10d0) 0 - vptr=((& QSharedMemory::_ZTV13QSharedMemory) + 16u) - QObject (0x0x7fba0f1ee240) 0 - primary-for QSharedMemory (0x0x7fba0f1f10d0) - -Class QSignalMapper::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSignalMapper::QPrivateSignal (0x0x7fba0f1ee360) 0 empty - -Vtable for QSignalMapper -QSignalMapper::_ZTV13QSignalMapper: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QSignalMapper) -16 (int (*)(...))QSignalMapper::metaObject -24 (int (*)(...))QSignalMapper::qt_metacast -32 (int (*)(...))QSignalMapper::qt_metacall -40 (int (*)(...))QSignalMapper::~QSignalMapper -48 (int (*)(...))QSignalMapper::~QSignalMapper -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSignalMapper - size=16 align=8 - base size=16 base align=8 -QSignalMapper (0x0x7fba0f1f1138) 0 - vptr=((& QSignalMapper::_ZTV13QSignalMapper) + 16u) - QObject (0x0x7fba0f1ee300) 0 - primary-for QSignalMapper (0x0x7fba0f1f1138) - -Class QSignalTransition::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSignalTransition::QPrivateSignal (0x0x7fba0f1ee420) 0 empty - -Vtable for QSignalTransition -QSignalTransition::_ZTV17QSignalTransition: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSignalTransition) -16 (int (*)(...))QSignalTransition::metaObject -24 (int (*)(...))QSignalTransition::qt_metacast -32 (int (*)(...))QSignalTransition::qt_metacall -40 (int (*)(...))QSignalTransition::~QSignalTransition -48 (int (*)(...))QSignalTransition::~QSignalTransition -56 (int (*)(...))QSignalTransition::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QSignalTransition::eventTest -120 (int (*)(...))QSignalTransition::onTransition - -Class QSignalTransition - size=16 align=8 - base size=16 base align=8 -QSignalTransition (0x0x7fba0f1f11a0) 0 - vptr=((& QSignalTransition::_ZTV17QSignalTransition) + 16u) - QAbstractTransition (0x0x7fba0f1f1208) 0 - primary-for QSignalTransition (0x0x7fba0f1f11a0) - QObject (0x0x7fba0f1ee3c0) 0 - primary-for QAbstractTransition (0x0x7fba0f1f1208) - -Class QSocketNotifier::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSocketNotifier::QPrivateSignal (0x0x7fba0f1ee4e0) 0 empty - -Vtable for QSocketNotifier -QSocketNotifier::_ZTV15QSocketNotifier: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QSocketNotifier) -16 (int (*)(...))QSocketNotifier::metaObject -24 (int (*)(...))QSocketNotifier::qt_metacast -32 (int (*)(...))QSocketNotifier::qt_metacall -40 (int (*)(...))QSocketNotifier::~QSocketNotifier -48 (int (*)(...))QSocketNotifier::~QSocketNotifier -56 (int (*)(...))QSocketNotifier::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSocketNotifier - size=16 align=8 - base size=16 base align=8 -QSocketNotifier (0x0x7fba0f1f1270) 0 - vptr=((& QSocketNotifier::_ZTV15QSocketNotifier) + 16u) - QObject (0x0x7fba0f1ee480) 0 - primary-for QSocketNotifier (0x0x7fba0f1f1270) - -Class QSortFilterProxyModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSortFilterProxyModel::QPrivateSignal (0x0x7fba0f1ee5a0) 0 empty - -Vtable for QSortFilterProxyModel -QSortFilterProxyModel::_ZTV21QSortFilterProxyModel: 56u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QSortFilterProxyModel) -16 (int (*)(...))QSortFilterProxyModel::metaObject -24 (int (*)(...))QSortFilterProxyModel::qt_metacast -32 (int (*)(...))QSortFilterProxyModel::qt_metacall -40 (int (*)(...))QSortFilterProxyModel::~QSortFilterProxyModel -48 (int (*)(...))QSortFilterProxyModel::~QSortFilterProxyModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QSortFilterProxyModel::index -120 (int (*)(...))QSortFilterProxyModel::parent -128 (int (*)(...))QSortFilterProxyModel::sibling -136 (int (*)(...))QSortFilterProxyModel::rowCount -144 (int (*)(...))QSortFilterProxyModel::columnCount -152 (int (*)(...))QSortFilterProxyModel::hasChildren -160 (int (*)(...))QSortFilterProxyModel::data -168 (int (*)(...))QSortFilterProxyModel::setData -176 (int (*)(...))QSortFilterProxyModel::headerData -184 (int (*)(...))QSortFilterProxyModel::setHeaderData -192 (int (*)(...))QAbstractProxyModel::itemData -200 (int (*)(...))QAbstractProxyModel::setItemData -208 (int (*)(...))QSortFilterProxyModel::mimeTypes -216 (int (*)(...))QSortFilterProxyModel::mimeData -224 (int (*)(...))QAbstractProxyModel::canDropMimeData -232 (int (*)(...))QSortFilterProxyModel::dropMimeData -240 (int (*)(...))QSortFilterProxyModel::supportedDropActions -248 (int (*)(...))QAbstractProxyModel::supportedDragActions -256 (int (*)(...))QSortFilterProxyModel::insertRows -264 (int (*)(...))QSortFilterProxyModel::insertColumns -272 (int (*)(...))QSortFilterProxyModel::removeRows -280 (int (*)(...))QSortFilterProxyModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QSortFilterProxyModel::fetchMore -312 (int (*)(...))QSortFilterProxyModel::canFetchMore -320 (int (*)(...))QSortFilterProxyModel::flags -328 (int (*)(...))QSortFilterProxyModel::sort -336 (int (*)(...))QSortFilterProxyModel::buddy -344 (int (*)(...))QSortFilterProxyModel::match -352 (int (*)(...))QSortFilterProxyModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractProxyModel::submit -376 (int (*)(...))QAbstractProxyModel::revert -384 (int (*)(...))QSortFilterProxyModel::setSourceModel -392 (int (*)(...))QSortFilterProxyModel::mapToSource -400 (int (*)(...))QSortFilterProxyModel::mapFromSource -408 (int (*)(...))QSortFilterProxyModel::mapSelectionToSource -416 (int (*)(...))QSortFilterProxyModel::mapSelectionFromSource -424 (int (*)(...))QSortFilterProxyModel::filterAcceptsRow -432 (int (*)(...))QSortFilterProxyModel::filterAcceptsColumn -440 (int (*)(...))QSortFilterProxyModel::lessThan - -Class QSortFilterProxyModel - size=16 align=8 - base size=16 base align=8 -QSortFilterProxyModel (0x0x7fba0f1f12d8) 0 - vptr=((& QSortFilterProxyModel::_ZTV21QSortFilterProxyModel) + 16u) - QAbstractProxyModel (0x0x7fba0f1f1340) 0 - primary-for QSortFilterProxyModel (0x0x7fba0f1f12d8) - QAbstractItemModel (0x0x7fba0f1f13a8) 0 - primary-for QAbstractProxyModel (0x0x7fba0f1f1340) - QObject (0x0x7fba0f1ee540) 0 - primary-for QAbstractItemModel (0x0x7fba0f1f13a8) - -Class QStandardPaths - size=1 align=1 - base size=0 base align=1 -QStandardPaths (0x0x7fba0f1ee660) 0 empty - -Class QState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QState::QPrivateSignal (0x0x7fba0f1ee8a0) 0 empty - -Vtable for QState -QState::_ZTV6QState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QState) -16 (int (*)(...))QState::metaObject -24 (int (*)(...))QState::qt_metacast -32 (int (*)(...))QState::qt_metacall -40 (int (*)(...))QState::~QState -48 (int (*)(...))QState::~QState -56 (int (*)(...))QState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QState::onEntry -120 (int (*)(...))QState::onExit - -Class QState - size=16 align=8 - base size=16 base align=8 -QState (0x0x7fba0f1f1548) 0 - vptr=((& QState::_ZTV6QState) + 16u) - QAbstractState (0x0x7fba0f1f15b0) 0 - primary-for QState (0x0x7fba0f1f1548) - QObject (0x0x7fba0f1ee840) 0 - primary-for QAbstractState (0x0x7fba0f1f15b0) - -Class QStateMachine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStateMachine::QPrivateSignal (0x0x7fba0f1ee9c0) 0 empty - -Vtable for QStateMachine::SignalEvent -QStateMachine::SignalEvent::_ZTVN13QStateMachine11SignalEventE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN13QStateMachine11SignalEventE) -16 (int (*)(...))QStateMachine::SignalEvent::~SignalEvent -24 (int (*)(...))QStateMachine::SignalEvent::~SignalEvent - -Class QStateMachine::SignalEvent - size=48 align=8 - base size=48 base align=8 -QStateMachine::SignalEvent (0x0x7fba0f1f1750) 0 - vptr=((& QStateMachine::SignalEvent::_ZTVN13QStateMachine11SignalEventE) + 16u) - QEvent (0x0x7fba0f1eea20) 0 - primary-for QStateMachine::SignalEvent (0x0x7fba0f1f1750) - -Vtable for QStateMachine::WrappedEvent -QStateMachine::WrappedEvent::_ZTVN13QStateMachine12WrappedEventE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN13QStateMachine12WrappedEventE) -16 (int (*)(...))QStateMachine::WrappedEvent::~WrappedEvent -24 (int (*)(...))QStateMachine::WrappedEvent::~WrappedEvent - -Class QStateMachine::WrappedEvent - size=40 align=8 - base size=40 base align=8 -QStateMachine::WrappedEvent (0x0x7fba0f1f17b8) 0 - vptr=((& QStateMachine::WrappedEvent::_ZTVN13QStateMachine12WrappedEventE) + 16u) - QEvent (0x0x7fba0f1eea80) 0 - primary-for QStateMachine::WrappedEvent (0x0x7fba0f1f17b8) - -Vtable for QStateMachine -QStateMachine::_ZTV13QStateMachine: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QStateMachine) -16 (int (*)(...))QStateMachine::metaObject -24 (int (*)(...))QStateMachine::qt_metacast -32 (int (*)(...))QStateMachine::qt_metacall -40 (int (*)(...))QStateMachine::~QStateMachine -48 (int (*)(...))QStateMachine::~QStateMachine -56 (int (*)(...))QStateMachine::event -64 (int (*)(...))QStateMachine::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QStateMachine::onEntry -120 (int (*)(...))QStateMachine::onExit -128 (int (*)(...))QStateMachine::beginSelectTransitions -136 (int (*)(...))QStateMachine::endSelectTransitions -144 (int (*)(...))QStateMachine::beginMicrostep -152 (int (*)(...))QStateMachine::endMicrostep - -Class QStateMachine - size=16 align=8 - base size=16 base align=8 -QStateMachine (0x0x7fba0f1f1618) 0 - vptr=((& QStateMachine::_ZTV13QStateMachine) + 16u) - QState (0x0x7fba0f1f1680) 0 - primary-for QStateMachine (0x0x7fba0f1f1618) - QAbstractState (0x0x7fba0f1f16e8) 0 - primary-for QState (0x0x7fba0f1f1680) - QObject (0x0x7fba0f1ee960) 0 - primary-for QAbstractState (0x0x7fba0f1f16e8) - -Class QStorageInfo - size=8 align=8 - base size=8 base align=8 -QStorageInfo (0x0x7fba0f1eeae0) 0 - -Class QAbstractConcatenable - size=1 align=1 - base size=0 base align=1 -QAbstractConcatenable (0x0x7fba0ef37a20) 0 empty - -Class QStringListModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStringListModel::QPrivateSignal (0x0x7fba0efad540) 0 empty - -Vtable for QStringListModel -QStringListModel::_ZTV16QStringListModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QStringListModel) -16 (int (*)(...))QStringListModel::metaObject -24 (int (*)(...))QStringListModel::qt_metacast -32 (int (*)(...))QStringListModel::qt_metacall -40 (int (*)(...))QStringListModel::~QStringListModel -48 (int (*)(...))QStringListModel::~QStringListModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractListModel::index -120 (int (*)(...))QAbstractListModel::parent -128 (int (*)(...))QStringListModel::sibling -136 (int (*)(...))QStringListModel::rowCount -144 (int (*)(...))QAbstractListModel::columnCount -152 (int (*)(...))QAbstractListModel::hasChildren -160 (int (*)(...))QStringListModel::data -168 (int (*)(...))QStringListModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractListModel::dropMimeData -240 (int (*)(...))QStringListModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QStringListModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QStringListModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QStringListModel::flags -328 (int (*)(...))QStringListModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QStringListModel - size=24 align=8 - base size=24 base align=8 -QStringListModel (0x0x7fba0ef55c98) 0 - vptr=((& QStringListModel::_ZTV16QStringListModel) + 16u) - QAbstractListModel (0x0x7fba0ef55d00) 0 - primary-for QStringListModel (0x0x7fba0ef55c98) - QAbstractItemModel (0x0x7fba0ef55d68) 0 - primary-for QAbstractListModel (0x0x7fba0ef55d00) - QObject (0x0x7fba0efad4e0) 0 - primary-for QAbstractItemModel (0x0x7fba0ef55d68) - -Class QSystemSemaphore - size=8 align=8 - base size=8 base align=8 -QSystemSemaphore (0x0x7fba0efad5a0) 0 - -Class QTemporaryDir - size=8 align=8 - base size=8 base align=8 -QTemporaryDir (0x0x7fba0efad660) 0 - -Class QTemporaryFile::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTemporaryFile::QPrivateSignal (0x0x7fba0efad780) 0 empty - -Vtable for QTemporaryFile -QTemporaryFile::_ZTV14QTemporaryFile: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QTemporaryFile) -16 (int (*)(...))QTemporaryFile::metaObject -24 (int (*)(...))QTemporaryFile::qt_metacast -32 (int (*)(...))QTemporaryFile::qt_metacall -40 (int (*)(...))QTemporaryFile::~QTemporaryFile -48 (int (*)(...))QTemporaryFile::~QTemporaryFile -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QTemporaryFile::open -128 (int (*)(...))QFileDevice::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFile::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QFileDevice::writeData -240 (int (*)(...))QTemporaryFile::fileName -248 (int (*)(...))QFile::resize -256 (int (*)(...))QFile::permissions -264 (int (*)(...))QFile::setPermissions - -Class QTemporaryFile - size=16 align=8 - base size=16 base align=8 -QTemporaryFile (0x0x7fba0ef55dd0) 0 - vptr=((& QTemporaryFile::_ZTV14QTemporaryFile) + 16u) - QFile (0x0x7fba0ef55e38) 0 - primary-for QTemporaryFile (0x0x7fba0ef55dd0) - QFileDevice (0x0x7fba0ef55ea0) 0 - primary-for QFile (0x0x7fba0ef55e38) - QIODevice (0x0x7fba0ef55f08) 0 - primary-for QFileDevice (0x0x7fba0ef55ea0) - QObject (0x0x7fba0efad720) 0 - primary-for QIODevice (0x0x7fba0ef55f08) - -Class QTextBoundaryFinder - size=48 align=8 - base size=48 base align=8 -QTextBoundaryFinder (0x0x7fba0efad7e0) 0 - -Class QTextCodec::ConverterState - size=32 align=8 - base size=32 base align=8 -QTextCodec::ConverterState (0x0x7fba0efada20) 0 - -Vtable for QTextCodec -QTextCodec::_ZTV10QTextCodec: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTextCodec) -16 (int (*)(...))__cxa_pure_virtual -24 (int (*)(...))QTextCodec::aliases -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 0u -64 0u - -Class QTextCodec - size=8 align=8 - base size=8 base align=8 -QTextCodec (0x0x7fba0efad9c0) 0 nearly-empty - vptr=((& QTextCodec::_ZTV10QTextCodec) + 16u) - -Class QTextEncoder - size=40 align=8 - base size=40 base align=8 -QTextEncoder (0x0x7fba0efadc00) 0 - -Class QTextDecoder - size=40 align=8 - base size=40 base align=8 -QTextDecoder (0x0x7fba0efadc60) 0 - -Class std::__mutex_base - size=40 align=8 - base size=40 base align=8 -std::__mutex_base (0x0x7fba0efadcc0) 0 - -Class std::__recursive_mutex_base - size=40 align=8 - base size=40 base align=8 -std::__recursive_mutex_base (0x0x7fba0efadd20) 0 - -Class std::mutex - size=40 align=8 - base size=40 base align=8 -std::mutex (0x0x7fba0f033138) 0 - std::__mutex_base (0x0x7fba0efadd80) 0 - -Class std::recursive_mutex - size=40 align=8 - base size=40 base align=8 -std::recursive_mutex (0x0x7fba0f0331a0) 0 - std::__recursive_mutex_base (0x0x7fba0efadde0) 0 - -Class std::timed_mutex - size=40 align=8 - base size=40 base align=8 -std::timed_mutex (0x0x7fba0f0bff50) 0 - std::__mutex_base (0x0x7fba0efadf00) 0 - std::__timed_mutex_impl (0x0x7fba0efadf60) 0 empty - -Class std::recursive_timed_mutex - size=40 align=8 - base size=40 base align=8 -std::recursive_timed_mutex (0x0x7fba0f0d6bd0) 0 - std::__recursive_mutex_base (0x0x7fba0f0e2060) 0 - std::__timed_mutex_impl (0x0x7fba0f0e20c0) 0 empty - -Class std::defer_lock_t - size=1 align=1 - base size=0 base align=1 -std::defer_lock_t (0x0x7fba0f0e2120) 0 empty - -Class std::try_to_lock_t - size=1 align=1 - base size=0 base align=1 -std::try_to_lock_t (0x0x7fba0f0e2180) 0 empty - -Class std::adopt_lock_t - size=1 align=1 - base size=0 base align=1 -std::adopt_lock_t (0x0x7fba0f0e21e0) 0 empty - -Class std::once_flag - size=4 align=4 - base size=4 base align=4 -std::once_flag (0x0x7fba0f0e2420) 0 - -Vtable for __gnu_cxx::__concurrence_lock_error -__gnu_cxx::__concurrence_lock_error::_ZTVN9__gnu_cxx24__concurrence_lock_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx24__concurrence_lock_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_lock_error::~__concurrence_lock_error -24 (int (*)(...))__gnu_cxx::__concurrence_lock_error::~__concurrence_lock_error -32 (int (*)(...))__gnu_cxx::__concurrence_lock_error::what - -Class __gnu_cxx::__concurrence_lock_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_lock_error (0x0x7fba0f0332d8) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_lock_error::_ZTVN9__gnu_cxx24__concurrence_lock_errorE) + 16u) - std::exception (0x0x7fba0f0e24e0) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_lock_error (0x0x7fba0f0332d8) - -Vtable for __gnu_cxx::__concurrence_unlock_error -__gnu_cxx::__concurrence_unlock_error::_ZTVN9__gnu_cxx26__concurrence_unlock_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx26__concurrence_unlock_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_unlock_error::~__concurrence_unlock_error -24 (int (*)(...))__gnu_cxx::__concurrence_unlock_error::~__concurrence_unlock_error -32 (int (*)(...))__gnu_cxx::__concurrence_unlock_error::what - -Class __gnu_cxx::__concurrence_unlock_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_unlock_error (0x0x7fba0f033340) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_unlock_error::_ZTVN9__gnu_cxx26__concurrence_unlock_errorE) + 16u) - std::exception (0x0x7fba0f0e25a0) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_unlock_error (0x0x7fba0f033340) - -Vtable for __gnu_cxx::__concurrence_broadcast_error -__gnu_cxx::__concurrence_broadcast_error::_ZTVN9__gnu_cxx29__concurrence_broadcast_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx29__concurrence_broadcast_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_broadcast_error::~__concurrence_broadcast_error -24 (int (*)(...))__gnu_cxx::__concurrence_broadcast_error::~__concurrence_broadcast_error -32 (int (*)(...))__gnu_cxx::__concurrence_broadcast_error::what - -Class __gnu_cxx::__concurrence_broadcast_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_broadcast_error (0x0x7fba0f0333a8) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_broadcast_error::_ZTVN9__gnu_cxx29__concurrence_broadcast_errorE) + 16u) - std::exception (0x0x7fba0f0e2660) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_broadcast_error (0x0x7fba0f0333a8) - -Vtable for __gnu_cxx::__concurrence_wait_error -__gnu_cxx::__concurrence_wait_error::_ZTVN9__gnu_cxx24__concurrence_wait_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx24__concurrence_wait_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_wait_error::~__concurrence_wait_error -24 (int (*)(...))__gnu_cxx::__concurrence_wait_error::~__concurrence_wait_error -32 (int (*)(...))__gnu_cxx::__concurrence_wait_error::what - -Class __gnu_cxx::__concurrence_wait_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_wait_error (0x0x7fba0f033478) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_wait_error::_ZTVN9__gnu_cxx24__concurrence_wait_errorE) + 16u) - std::exception (0x0x7fba0f0e2720) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_wait_error (0x0x7fba0f033478) - -Class __gnu_cxx::__mutex - size=40 align=8 - base size=40 base align=8 -__gnu_cxx::__mutex (0x0x7fba0f0e27e0) 0 - -Class __gnu_cxx::__recursive_mutex - size=40 align=8 - base size=40 base align=8 -__gnu_cxx::__recursive_mutex (0x0x7fba0f0e2840) 0 - -Class __gnu_cxx::__scoped_lock - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__scoped_lock (0x0x7fba0f0e28a0) 0 - -Class __gnu_cxx::__cond - size=48 align=8 - base size=48 base align=8 -__gnu_cxx::__cond (0x0x7fba0f0e2900) 0 - -Vtable for std::bad_weak_ptr -std::bad_weak_ptr::_ZTVSt12bad_weak_ptr: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12bad_weak_ptr) -16 (int (*)(...))std::bad_weak_ptr::~bad_weak_ptr -24 (int (*)(...))std::bad_weak_ptr::~bad_weak_ptr -32 (int (*)(...))std::bad_weak_ptr::what - -Class std::bad_weak_ptr - size=8 align=8 - base size=8 base align=8 -std::bad_weak_ptr (0x0x7fba0f033750) 0 nearly-empty - vptr=((& std::bad_weak_ptr::_ZTVSt12bad_weak_ptr) + 16u) - std::exception (0x0x7fba0f0e2c60) 0 nearly-empty - primary-for std::bad_weak_ptr (0x0x7fba0f033750) - -Class std::_Sp_make_shared_tag - size=1 align=1 - base size=0 base align=1 -std::_Sp_make_shared_tag (0x0x7fba0ee304e0) 0 empty - -Class std::_Sp_locker - size=2 align=1 - base size=2 base align=1 -std::_Sp_locker (0x0x7fba0ee30cc0) 0 - -Class std::thread::id - size=8 align=8 - base size=8 base align=8 -std::thread::id (0x0x7fba0ee30ea0) 0 - -Vtable for std::thread::_Impl_base -std::thread::_Impl_base::_ZTVNSt6thread10_Impl_baseE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt6thread10_Impl_baseE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class std::thread::_Impl_base - size=24 align=8 - base size=24 base align=8 -std::thread::_Impl_base (0x0x7fba0ee30f00) 0 - vptr=((& std::thread::_Impl_base::_ZTVNSt6thread10_Impl_baseE) + 16u) - -Class std::thread - size=8 align=8 - base size=8 base align=8 -std::thread (0x0x7fba0ee30e40) 0 - -Class std::condition_variable - size=48 align=8 - base size=48 base align=8 -std::condition_variable (0x0x7fba0ecddb40) 0 - -Class std::__at_thread_exit_elt - size=16 align=8 - base size=16 base align=8 -std::__at_thread_exit_elt (0x0x7fba0ecddc00) 0 - -Class std::_V2::condition_variable_any - size=64 align=8 - base size=64 base align=8 -std::_V2::condition_variable_any (0x0x7fba0ecddc60) 0 - -Class std::__atomic_futex_unsigned_base - size=1 align=1 - base size=0 base align=1 -std::__atomic_futex_unsigned_base (0x0x7fba0e9ca300) 0 empty - -Vtable for std::future_error -std::future_error::_ZTVSt12future_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12future_error) -16 (int (*)(...))std::future_error::~future_error -24 (int (*)(...))std::future_error::~future_error -32 (int (*)(...))std::future_error::what - -Class std::future_error - size=32 align=8 - base size=32 base align=8 -std::future_error (0x0x7fba0e9c5a90) 0 - vptr=((& std::future_error::_ZTVSt12future_error) + 16u) - std::logic_error (0x0x7fba0e9c5af8) 0 - primary-for std::future_error (0x0x7fba0e9c5a90) - std::exception (0x0x7fba0e9ca420) 0 nearly-empty - primary-for std::logic_error (0x0x7fba0e9c5af8) - -Class std::__future_base::_Result_base::_Deleter - size=1 align=1 - base size=0 base align=1 -std::__future_base::_Result_base::_Deleter (0x0x7fba0e9ca540) 0 empty - -Vtable for std::__future_base::_Result_base -std::__future_base::_Result_base::_ZTVNSt13__future_base12_Result_baseE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt13__future_base12_Result_baseE) -16 (int (*)(...))__cxa_pure_virtual -24 0u -32 0u - -Class std::__future_base::_Result_base - size=16 align=8 - base size=16 base align=8 -std::__future_base::_Result_base (0x0x7fba0e9ca4e0) 0 - vptr=((& std::__future_base::_Result_base::_ZTVNSt13__future_base12_Result_baseE) + 16u) - -Class std::__future_base::_State_baseV2::__exception_ptr_tag - size=1 align=1 - base size=0 base align=1 -std::__future_base::_State_baseV2::__exception_ptr_tag (0x0x7fba0e707a80) 0 empty - -Class std::__future_base::_State_baseV2::_Make_ready - size=32 align=8 - base size=32 base align=8 -std::__future_base::_State_baseV2::_Make_ready (0x0x7fba0e7280d0) 0 - std::__at_thread_exit_elt (0x0x7fba0e707b40) 0 - -Vtable for std::__future_base::_State_baseV2 -std::__future_base::_State_baseV2::_ZTVNSt13__future_base13_State_baseV2E: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt13__future_base13_State_baseV2E) -16 (int (*)(...))std::__future_base::_State_baseV2::~_State_baseV2 -24 (int (*)(...))std::__future_base::_State_baseV2::~_State_baseV2 -32 (int (*)(...))std::__future_base::_State_baseV2::_M_complete_async -40 (int (*)(...))std::__future_base::_State_baseV2::_M_is_deferred_future - -Class std::__future_base::_State_baseV2 - size=32 align=8 - base size=28 base align=8 -std::__future_base::_State_baseV2 (0x0x7fba0e9ca6c0) 0 - vptr=((& std::__future_base::_State_baseV2::_ZTVNSt13__future_base13_State_baseV2E) + 16u) - -Class std::__future_base - size=1 align=1 - base size=0 base align=1 -std::__future_base (0x0x7fba0e9ca480) 0 empty - -Vtable for std::__future_base::_Async_state_commonV2 -std::__future_base::_Async_state_commonV2::_ZTVNSt13__future_base21_Async_state_commonV2E: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt13__future_base21_Async_state_commonV2E) -16 (int (*)(...))std::__future_base::_Async_state_commonV2::~_Async_state_commonV2 -24 (int (*)(...))std::__future_base::_Async_state_commonV2::~_Async_state_commonV2 -32 (int (*)(...))std::__future_base::_Async_state_commonV2::_M_complete_async -40 (int (*)(...))std::__future_base::_State_baseV2::_M_is_deferred_future - -Class std::__future_base::_Async_state_commonV2 - size=48 align=8 - base size=44 base align=8 -std::__future_base::_Async_state_commonV2 (0x0x7fba0e470c98) 0 - vptr=((& std::__future_base::_Async_state_commonV2::_ZTVNSt13__future_base21_Async_state_commonV2E) + 16u) - std::__future_base::_State_baseV2 (0x0x7fba0e472a20) 0 - primary-for std::__future_base::_Async_state_commonV2 (0x0x7fba0e470c98) - -Class QThread::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QThread::QPrivateSignal (0x0x7fba0e0f3180) 0 empty - -Vtable for QThread -QThread::_ZTV7QThread: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QThread) -16 (int (*)(...))QThread::metaObject -24 (int (*)(...))QThread::qt_metacast -32 (int (*)(...))QThread::qt_metacall -40 (int (*)(...))QThread::~QThread -48 (int (*)(...))QThread::~QThread -56 (int (*)(...))QThread::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QThread::run - -Class QThread - size=16 align=8 - base size=16 base align=8 -QThread (0x0x7fba0e4d4750) 0 - vptr=((& QThread::_ZTV7QThread) + 16u) - QObject (0x0x7fba0e0f3120) 0 - primary-for QThread (0x0x7fba0e4d4750) - -Class QThreadPool::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QThreadPool::QPrivateSignal (0x0x7fba0e0f32a0) 0 empty - -Vtable for QThreadPool -QThreadPool::_ZTV11QThreadPool: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QThreadPool) -16 (int (*)(...))QThreadPool::metaObject -24 (int (*)(...))QThreadPool::qt_metacast -32 (int (*)(...))QThreadPool::qt_metacall -40 (int (*)(...))QThreadPool::~QThreadPool -48 (int (*)(...))QThreadPool::~QThreadPool -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QThreadPool - size=16 align=8 - base size=16 base align=8 -QThreadPool (0x0x7fba0e4d47b8) 0 - vptr=((& QThreadPool::_ZTV11QThreadPool) + 16u) - QObject (0x0x7fba0e0f3240) 0 - primary-for QThreadPool (0x0x7fba0e4d47b8) - -Class QThreadStorageData - size=4 align=4 - base size=4 base align=4 -QThreadStorageData (0x0x7fba0e0f3300) 0 - -Class QTimeLine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTimeLine::QPrivateSignal (0x0x7fba0e0f3420) 0 empty - -Vtable for QTimeLine -QTimeLine::_ZTV9QTimeLine: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QTimeLine) -16 (int (*)(...))QTimeLine::metaObject -24 (int (*)(...))QTimeLine::qt_metacast -32 (int (*)(...))QTimeLine::qt_metacall -40 (int (*)(...))QTimeLine::~QTimeLine -48 (int (*)(...))QTimeLine::~QTimeLine -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QTimeLine::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTimeLine::valueForTime - -Class QTimeLine - size=16 align=8 - base size=16 base align=8 -QTimeLine (0x0x7fba0e4d4820) 0 - vptr=((& QTimeLine::_ZTV9QTimeLine) + 16u) - QObject (0x0x7fba0e0f33c0) 0 - primary-for QTimeLine (0x0x7fba0e4d4820) - -Class QTimer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTimer::QPrivateSignal (0x0x7fba0e0f34e0) 0 empty - -Vtable for QTimer -QTimer::_ZTV6QTimer: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QTimer) -16 (int (*)(...))QTimer::metaObject -24 (int (*)(...))QTimer::qt_metacast -32 (int (*)(...))QTimer::qt_metacall -40 (int (*)(...))QTimer::~QTimer -48 (int (*)(...))QTimer::~QTimer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QTimer::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTimer - size=32 align=8 - base size=29 base align=8 -QTimer (0x0x7fba0e4d4888) 0 - vptr=((& QTimer::_ZTV6QTimer) + 16u) - QObject (0x0x7fba0e0f3480) 0 - primary-for QTimer (0x0x7fba0e4d4888) - -Class QTimeZone::OffsetData - size=32 align=8 - base size=28 base align=8 -QTimeZone::OffsetData (0x0x7fba0e0f3ba0) 0 - -Class QTimeZone - size=8 align=8 - base size=8 base align=8 -QTimeZone (0x0x7fba0e0f3b40) 0 - -Class QTranslator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTranslator::QPrivateSignal (0x0x7fba0e1c3180) 0 empty - -Vtable for QTranslator -QTranslator::_ZTV11QTranslator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTranslator) -16 (int (*)(...))QTranslator::metaObject -24 (int (*)(...))QTranslator::qt_metacast -32 (int (*)(...))QTranslator::qt_metacall -40 (int (*)(...))QTranslator::~QTranslator -48 (int (*)(...))QTranslator::~QTranslator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTranslator::translate -120 (int (*)(...))QTranslator::isEmpty - -Class QTranslator - size=16 align=8 - base size=16 base align=8 -QTranslator (0x0x7fba0e1bc2d8) 0 - vptr=((& QTranslator::_ZTV11QTranslator) + 16u) - QObject (0x0x7fba0e1c3120) 0 - primary-for QTranslator (0x0x7fba0e1bc2d8) - -Class QUrl - size=8 align=8 - base size=8 base align=8 -QUrl (0x0x7fba0e1c32a0) 0 - -Class QUrlQuery - size=8 align=8 - base size=8 base align=8 -QUrlQuery (0x0x7fba0e2da960) 0 - -Class QUuid - size=16 align=4 - base size=16 base align=4 -QUuid (0x0x7fba0df79000) 0 - -Class QWaitCondition - size=8 align=8 - base size=8 base align=8 -QWaitCondition (0x0x7fba0df79600) 0 - -Class QXmlStreamStringRef - size=16 align=8 - base size=16 base align=8 -QXmlStreamStringRef (0x0x7fba0df79660) 0 - -Class QXmlStreamAttribute - size=80 align=8 - base size=73 base align=8 -QXmlStreamAttribute (0x0x7fba0df79960) 0 - -Class QXmlStreamAttributes - size=8 align=8 - base size=8 base align=8 -QXmlStreamAttributes (0x0x7fba0df78dd0) 0 - QVector (0x0x7fba0df79d20) 0 - -Class QXmlStreamNamespaceDeclaration - size=40 align=8 - base size=40 base align=8 -QXmlStreamNamespaceDeclaration (0x0x7fba0df79d80) 0 - -Class QXmlStreamNotationDeclaration - size=56 align=8 - base size=56 base align=8 -QXmlStreamNotationDeclaration (0x0x7fba0e064060) 0 - -Class QXmlStreamEntityDeclaration - size=88 align=8 - base size=88 base align=8 -QXmlStreamEntityDeclaration (0x0x7fba0e064300) 0 - -Vtable for QXmlStreamEntityResolver -QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QXmlStreamEntityResolver) -16 (int (*)(...))QXmlStreamEntityResolver::~QXmlStreamEntityResolver -24 (int (*)(...))QXmlStreamEntityResolver::~QXmlStreamEntityResolver -32 (int (*)(...))QXmlStreamEntityResolver::resolveEntity -40 (int (*)(...))QXmlStreamEntityResolver::resolveUndeclaredEntity - -Class QXmlStreamEntityResolver - size=8 align=8 - base size=8 base align=8 -QXmlStreamEntityResolver (0x0x7fba0e0645a0) 0 nearly-empty - vptr=((& QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver) + 16u) - -Class QXmlStreamReader - size=8 align=8 - base size=8 base align=8 -QXmlStreamReader (0x0x7fba0e064600) 0 - -Class QXmlStreamWriter - size=8 align=8 - base size=8 base align=8 -QXmlStreamWriter (0x0x7fba0dd12060) 0 - -Class QRgba64 - size=8 align=8 - base size=8 base align=8 -QRgba64 (0x0x7fba0dd12180) 0 - -Class QColor - size=16 align=4 - base size=14 base align=4 -QColor (0x0x7fba0dd12420) 0 - -Class QRegion::QRegionData - size=16 align=8 - base size=16 base align=8 -QRegion::QRegionData (0x0x7fba0dd12de0) 0 - -Class QRegion - size=8 align=8 - base size=8 base align=8 -QRegion (0x0x7fba0dd12d80) 0 - -Class QKeySequence - size=8 align=8 - base size=8 base align=8 -QKeySequence (0x0x7fba0decb180) 0 - -Class QVector2D - size=8 align=4 - base size=8 base align=4 -QVector2D (0x0x7fba0db656c0) 0 - -Class QTouchDevice - size=8 align=8 - base size=8 base align=8 -QTouchDevice (0x0x7fba0db65960) 0 - -Vtable for QInputEvent -QInputEvent::_ZTV11QInputEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QInputEvent) -16 (int (*)(...))QInputEvent::~QInputEvent -24 (int (*)(...))QInputEvent::~QInputEvent - -Class QInputEvent - size=32 align=8 - base size=32 base align=8 -QInputEvent (0x0x7fba0db64bc8) 0 - vptr=((& QInputEvent::_ZTV11QInputEvent) + 16u) - QEvent (0x0x7fba0db65b40) 0 - primary-for QInputEvent (0x0x7fba0db64bc8) - -Vtable for QEnterEvent -QEnterEvent::_ZTV11QEnterEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QEnterEvent) -16 (int (*)(...))QEnterEvent::~QEnterEvent -24 (int (*)(...))QEnterEvent::~QEnterEvent - -Class QEnterEvent - size=72 align=8 - base size=72 base align=8 -QEnterEvent (0x0x7fba0db64c30) 0 - vptr=((& QEnterEvent::_ZTV11QEnterEvent) + 16u) - QEvent (0x0x7fba0db65ba0) 0 - primary-for QEnterEvent (0x0x7fba0db64c30) - -Vtable for QMouseEvent -QMouseEvent::_ZTV11QMouseEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QMouseEvent) -16 (int (*)(...))QMouseEvent::~QMouseEvent -24 (int (*)(...))QMouseEvent::~QMouseEvent - -Class QMouseEvent - size=104 align=8 - base size=100 base align=8 -QMouseEvent (0x0x7fba0db64c98) 0 - vptr=((& QMouseEvent::_ZTV11QMouseEvent) + 16u) - QInputEvent (0x0x7fba0db64d00) 0 - primary-for QMouseEvent (0x0x7fba0db64c98) - QEvent (0x0x7fba0db65c00) 0 - primary-for QInputEvent (0x0x7fba0db64d00) - -Vtable for QHoverEvent -QHoverEvent::_ZTV11QHoverEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QHoverEvent) -16 (int (*)(...))QHoverEvent::~QHoverEvent -24 (int (*)(...))QHoverEvent::~QHoverEvent - -Class QHoverEvent - size=64 align=8 - base size=64 base align=8 -QHoverEvent (0x0x7fba0db64d68) 0 - vptr=((& QHoverEvent::_ZTV11QHoverEvent) + 16u) - QInputEvent (0x0x7fba0db64dd0) 0 - primary-for QHoverEvent (0x0x7fba0db64d68) - QEvent (0x0x7fba0db65c60) 0 - primary-for QInputEvent (0x0x7fba0db64dd0) - -Vtable for QWheelEvent -QWheelEvent::_ZTV11QWheelEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QWheelEvent) -16 (int (*)(...))QWheelEvent::~QWheelEvent -24 (int (*)(...))QWheelEvent::~QWheelEvent - -Class QWheelEvent - size=96 align=8 - base size=96 base align=8 -QWheelEvent (0x0x7fba0db64e38) 0 - vptr=((& QWheelEvent::_ZTV11QWheelEvent) + 16u) - QInputEvent (0x0x7fba0db64ea0) 0 - primary-for QWheelEvent (0x0x7fba0db64e38) - QEvent (0x0x7fba0db65cc0) 0 - primary-for QInputEvent (0x0x7fba0db64ea0) - -Vtable for QTabletEvent -QTabletEvent::_ZTV12QTabletEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QTabletEvent) -16 (int (*)(...))QTabletEvent::~QTabletEvent -24 (int (*)(...))QTabletEvent::~QTabletEvent - -Class QTabletEvent - size=128 align=8 - base size=128 base align=8 -QTabletEvent (0x0x7fba0db64f08) 0 - vptr=((& QTabletEvent::_ZTV12QTabletEvent) + 16u) - QInputEvent (0x0x7fba0db64f70) 0 - primary-for QTabletEvent (0x0x7fba0db64f08) - QEvent (0x0x7fba0db65d20) 0 - primary-for QInputEvent (0x0x7fba0db64f70) - -Vtable for QNativeGestureEvent -QNativeGestureEvent::_ZTV19QNativeGestureEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QNativeGestureEvent) -16 (int (*)(...))QNativeGestureEvent::~QNativeGestureEvent -24 (int (*)(...))QNativeGestureEvent::~QNativeGestureEvent - -Class QNativeGestureEvent - size=112 align=8 - base size=112 base align=8 -QNativeGestureEvent (0x0x7fba0dc6f000) 0 - vptr=((& QNativeGestureEvent::_ZTV19QNativeGestureEvent) + 16u) - QInputEvent (0x0x7fba0dc6f068) 0 - primary-for QNativeGestureEvent (0x0x7fba0dc6f000) - QEvent (0x0x7fba0db65d80) 0 - primary-for QInputEvent (0x0x7fba0dc6f068) - -Vtable for QKeyEvent -QKeyEvent::_ZTV9QKeyEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QKeyEvent) -16 (int (*)(...))QKeyEvent::~QKeyEvent -24 (int (*)(...))QKeyEvent::~QKeyEvent - -Class QKeyEvent - size=64 align=8 - base size=59 base align=8 -QKeyEvent (0x0x7fba0dc6f0d0) 0 - vptr=((& QKeyEvent::_ZTV9QKeyEvent) + 16u) - QInputEvent (0x0x7fba0dc6f138) 0 - primary-for QKeyEvent (0x0x7fba0dc6f0d0) - QEvent (0x0x7fba0db65de0) 0 - primary-for QInputEvent (0x0x7fba0dc6f138) - -Vtable for QFocusEvent -QFocusEvent::_ZTV11QFocusEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QFocusEvent) -16 (int (*)(...))QFocusEvent::~QFocusEvent -24 (int (*)(...))QFocusEvent::~QFocusEvent - -Class QFocusEvent - size=24 align=8 - base size=24 base align=8 -QFocusEvent (0x0x7fba0dc6f1a0) 0 - vptr=((& QFocusEvent::_ZTV11QFocusEvent) + 16u) - QEvent (0x0x7fba0db65e40) 0 - primary-for QFocusEvent (0x0x7fba0dc6f1a0) - -Vtable for QPaintEvent -QPaintEvent::_ZTV11QPaintEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QPaintEvent) -16 (int (*)(...))QPaintEvent::~QPaintEvent -24 (int (*)(...))QPaintEvent::~QPaintEvent - -Class QPaintEvent - size=56 align=8 - base size=49 base align=8 -QPaintEvent (0x0x7fba0dc6f208) 0 - vptr=((& QPaintEvent::_ZTV11QPaintEvent) + 16u) - QEvent (0x0x7fba0db65ea0) 0 - primary-for QPaintEvent (0x0x7fba0dc6f208) - -Vtable for QMoveEvent -QMoveEvent::_ZTV10QMoveEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QMoveEvent) -16 (int (*)(...))QMoveEvent::~QMoveEvent -24 (int (*)(...))QMoveEvent::~QMoveEvent - -Class QMoveEvent - size=40 align=8 - base size=36 base align=8 -QMoveEvent (0x0x7fba0dc6f270) 0 - vptr=((& QMoveEvent::_ZTV10QMoveEvent) + 16u) - QEvent (0x0x7fba0db65f00) 0 - primary-for QMoveEvent (0x0x7fba0dc6f270) - -Vtable for QExposeEvent -QExposeEvent::_ZTV12QExposeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QExposeEvent) -16 (int (*)(...))QExposeEvent::~QExposeEvent -24 (int (*)(...))QExposeEvent::~QExposeEvent - -Class QExposeEvent - size=32 align=8 - base size=32 base align=8 -QExposeEvent (0x0x7fba0dc6f2d8) 0 - vptr=((& QExposeEvent::_ZTV12QExposeEvent) + 16u) - QEvent (0x0x7fba0db65f60) 0 - primary-for QExposeEvent (0x0x7fba0dc6f2d8) - -Vtable for QPlatformSurfaceEvent -QPlatformSurfaceEvent::_ZTV21QPlatformSurfaceEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QPlatformSurfaceEvent) -16 (int (*)(...))QPlatformSurfaceEvent::~QPlatformSurfaceEvent -24 (int (*)(...))QPlatformSurfaceEvent::~QPlatformSurfaceEvent - -Class QPlatformSurfaceEvent - size=24 align=8 - base size=24 base align=8 -QPlatformSurfaceEvent (0x0x7fba0dc6f340) 0 - vptr=((& QPlatformSurfaceEvent::_ZTV21QPlatformSurfaceEvent) + 16u) - QEvent (0x0x7fba0dca4000) 0 - primary-for QPlatformSurfaceEvent (0x0x7fba0dc6f340) - -Vtable for QResizeEvent -QResizeEvent::_ZTV12QResizeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QResizeEvent) -16 (int (*)(...))QResizeEvent::~QResizeEvent -24 (int (*)(...))QResizeEvent::~QResizeEvent - -Class QResizeEvent - size=40 align=8 - base size=36 base align=8 -QResizeEvent (0x0x7fba0dc6f3a8) 0 - vptr=((& QResizeEvent::_ZTV12QResizeEvent) + 16u) - QEvent (0x0x7fba0dca4060) 0 - primary-for QResizeEvent (0x0x7fba0dc6f3a8) - -Vtable for QCloseEvent -QCloseEvent::_ZTV11QCloseEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QCloseEvent) -16 (int (*)(...))QCloseEvent::~QCloseEvent -24 (int (*)(...))QCloseEvent::~QCloseEvent - -Class QCloseEvent - size=24 align=8 - base size=20 base align=8 -QCloseEvent (0x0x7fba0dc6f410) 0 - vptr=((& QCloseEvent::_ZTV11QCloseEvent) + 16u) - QEvent (0x0x7fba0dca40c0) 0 - primary-for QCloseEvent (0x0x7fba0dc6f410) - -Vtable for QIconDragEvent -QIconDragEvent::_ZTV14QIconDragEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QIconDragEvent) -16 (int (*)(...))QIconDragEvent::~QIconDragEvent -24 (int (*)(...))QIconDragEvent::~QIconDragEvent - -Class QIconDragEvent - size=24 align=8 - base size=20 base align=8 -QIconDragEvent (0x0x7fba0dc6f478) 0 - vptr=((& QIconDragEvent::_ZTV14QIconDragEvent) + 16u) - QEvent (0x0x7fba0dca4120) 0 - primary-for QIconDragEvent (0x0x7fba0dc6f478) - -Vtable for QShowEvent -QShowEvent::_ZTV10QShowEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QShowEvent) -16 (int (*)(...))QShowEvent::~QShowEvent -24 (int (*)(...))QShowEvent::~QShowEvent - -Class QShowEvent - size=24 align=8 - base size=20 base align=8 -QShowEvent (0x0x7fba0dc6f4e0) 0 - vptr=((& QShowEvent::_ZTV10QShowEvent) + 16u) - QEvent (0x0x7fba0dca4180) 0 - primary-for QShowEvent (0x0x7fba0dc6f4e0) - -Vtable for QHideEvent -QHideEvent::_ZTV10QHideEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QHideEvent) -16 (int (*)(...))QHideEvent::~QHideEvent -24 (int (*)(...))QHideEvent::~QHideEvent - -Class QHideEvent - size=24 align=8 - base size=20 base align=8 -QHideEvent (0x0x7fba0dc6f548) 0 - vptr=((& QHideEvent::_ZTV10QHideEvent) + 16u) - QEvent (0x0x7fba0dca41e0) 0 - primary-for QHideEvent (0x0x7fba0dc6f548) - -Vtable for QContextMenuEvent -QContextMenuEvent::_ZTV17QContextMenuEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QContextMenuEvent) -16 (int (*)(...))QContextMenuEvent::~QContextMenuEvent -24 (int (*)(...))QContextMenuEvent::~QContextMenuEvent - -Class QContextMenuEvent - size=56 align=8 - base size=49 base align=8 -QContextMenuEvent (0x0x7fba0dc6f5b0) 0 - vptr=((& QContextMenuEvent::_ZTV17QContextMenuEvent) + 16u) - QInputEvent (0x0x7fba0dc6f618) 0 - primary-for QContextMenuEvent (0x0x7fba0dc6f5b0) - QEvent (0x0x7fba0dca4240) 0 - primary-for QInputEvent (0x0x7fba0dc6f618) - -Class QInputMethodEvent::Attribute - size=32 align=8 - base size=32 base align=8 -QInputMethodEvent::Attribute (0x0x7fba0dca4300) 0 - -Vtable for QInputMethodEvent -QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QInputMethodEvent) -16 (int (*)(...))QInputMethodEvent::~QInputMethodEvent -24 (int (*)(...))QInputMethodEvent::~QInputMethodEvent - -Class QInputMethodEvent - size=56 align=8 - base size=56 base align=8 -QInputMethodEvent (0x0x7fba0dc6f680) 0 - vptr=((& QInputMethodEvent::_ZTV17QInputMethodEvent) + 16u) - QEvent (0x0x7fba0dca42a0) 0 - primary-for QInputMethodEvent (0x0x7fba0dc6f680) - -Class QInputMethodQueryEvent::QueryPair - size=24 align=8 - base size=24 base align=8 -QInputMethodQueryEvent::QueryPair (0x0x7fba0dca4780) 0 - -Vtable for QInputMethodQueryEvent -QInputMethodQueryEvent::_ZTV22QInputMethodQueryEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QInputMethodQueryEvent) -16 (int (*)(...))QInputMethodQueryEvent::~QInputMethodQueryEvent -24 (int (*)(...))QInputMethodQueryEvent::~QInputMethodQueryEvent - -Class QInputMethodQueryEvent - size=32 align=8 - base size=32 base align=8 -QInputMethodQueryEvent (0x0x7fba0dc6f9c0) 0 - vptr=((& QInputMethodQueryEvent::_ZTV22QInputMethodQueryEvent) + 16u) - QEvent (0x0x7fba0dca4720) 0 - primary-for QInputMethodQueryEvent (0x0x7fba0dc6f9c0) - -Vtable for QDropEvent -QDropEvent::_ZTV10QDropEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QDropEvent) -16 (int (*)(...))QDropEvent::~QDropEvent -24 (int (*)(...))QDropEvent::~QDropEvent - -Class QDropEvent - size=72 align=8 - base size=72 base align=8 -QDropEvent (0x0x7fba0dc6fc98) 0 - vptr=((& QDropEvent::_ZTV10QDropEvent) + 16u) - QEvent (0x0x7fba0dca4ae0) 0 - primary-for QDropEvent (0x0x7fba0dc6fc98) - -Vtable for QDragMoveEvent -QDragMoveEvent::_ZTV14QDragMoveEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QDragMoveEvent) -16 (int (*)(...))QDragMoveEvent::~QDragMoveEvent -24 (int (*)(...))QDragMoveEvent::~QDragMoveEvent - -Class QDragMoveEvent - size=88 align=8 - base size=88 base align=8 -QDragMoveEvent (0x0x7fba0dc6fd00) 0 - vptr=((& QDragMoveEvent::_ZTV14QDragMoveEvent) + 16u) - QDropEvent (0x0x7fba0dc6fd68) 0 - primary-for QDragMoveEvent (0x0x7fba0dc6fd00) - QEvent (0x0x7fba0dca4b40) 0 - primary-for QDropEvent (0x0x7fba0dc6fd68) - -Vtable for QDragEnterEvent -QDragEnterEvent::_ZTV15QDragEnterEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QDragEnterEvent) -16 (int (*)(...))QDragEnterEvent::~QDragEnterEvent -24 (int (*)(...))QDragEnterEvent::~QDragEnterEvent - -Class QDragEnterEvent - size=88 align=8 - base size=88 base align=8 -QDragEnterEvent (0x0x7fba0dc6fdd0) 0 - vptr=((& QDragEnterEvent::_ZTV15QDragEnterEvent) + 16u) - QDragMoveEvent (0x0x7fba0dc6fe38) 0 - primary-for QDragEnterEvent (0x0x7fba0dc6fdd0) - QDropEvent (0x0x7fba0dc6fea0) 0 - primary-for QDragMoveEvent (0x0x7fba0dc6fe38) - QEvent (0x0x7fba0dca4ba0) 0 - primary-for QDropEvent (0x0x7fba0dc6fea0) - -Vtable for QDragLeaveEvent -QDragLeaveEvent::_ZTV15QDragLeaveEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QDragLeaveEvent) -16 (int (*)(...))QDragLeaveEvent::~QDragLeaveEvent -24 (int (*)(...))QDragLeaveEvent::~QDragLeaveEvent - -Class QDragLeaveEvent - size=24 align=8 - base size=20 base align=8 -QDragLeaveEvent (0x0x7fba0dc6ff08) 0 - vptr=((& QDragLeaveEvent::_ZTV15QDragLeaveEvent) + 16u) - QEvent (0x0x7fba0dca4c00) 0 - primary-for QDragLeaveEvent (0x0x7fba0dc6ff08) - -Vtable for QHelpEvent -QHelpEvent::_ZTV10QHelpEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QHelpEvent) -16 (int (*)(...))QHelpEvent::~QHelpEvent -24 (int (*)(...))QHelpEvent::~QHelpEvent - -Class QHelpEvent - size=40 align=8 - base size=36 base align=8 -QHelpEvent (0x0x7fba0dc6ff70) 0 - vptr=((& QHelpEvent::_ZTV10QHelpEvent) + 16u) - QEvent (0x0x7fba0dca4c60) 0 - primary-for QHelpEvent (0x0x7fba0dc6ff70) - -Vtable for QStatusTipEvent -QStatusTipEvent::_ZTV15QStatusTipEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QStatusTipEvent) -16 (int (*)(...))QStatusTipEvent::~QStatusTipEvent -24 (int (*)(...))QStatusTipEvent::~QStatusTipEvent - -Class QStatusTipEvent - size=32 align=8 - base size=32 base align=8 -QStatusTipEvent (0x0x7fba0d972000) 0 - vptr=((& QStatusTipEvent::_ZTV15QStatusTipEvent) + 16u) - QEvent (0x0x7fba0dca4cc0) 0 - primary-for QStatusTipEvent (0x0x7fba0d972000) - -Vtable for QWhatsThisClickedEvent -QWhatsThisClickedEvent::_ZTV22QWhatsThisClickedEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QWhatsThisClickedEvent) -16 (int (*)(...))QWhatsThisClickedEvent::~QWhatsThisClickedEvent -24 (int (*)(...))QWhatsThisClickedEvent::~QWhatsThisClickedEvent - -Class QWhatsThisClickedEvent - size=32 align=8 - base size=32 base align=8 -QWhatsThisClickedEvent (0x0x7fba0d972068) 0 - vptr=((& QWhatsThisClickedEvent::_ZTV22QWhatsThisClickedEvent) + 16u) - QEvent (0x0x7fba0dca4d20) 0 - primary-for QWhatsThisClickedEvent (0x0x7fba0d972068) - -Vtable for QActionEvent -QActionEvent::_ZTV12QActionEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QActionEvent) -16 (int (*)(...))QActionEvent::~QActionEvent -24 (int (*)(...))QActionEvent::~QActionEvent - -Class QActionEvent - size=40 align=8 - base size=40 base align=8 -QActionEvent (0x0x7fba0d9720d0) 0 - vptr=((& QActionEvent::_ZTV12QActionEvent) + 16u) - QEvent (0x0x7fba0dca4d80) 0 - primary-for QActionEvent (0x0x7fba0d9720d0) - -Vtable for QFileOpenEvent -QFileOpenEvent::_ZTV14QFileOpenEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QFileOpenEvent) -16 (int (*)(...))QFileOpenEvent::~QFileOpenEvent -24 (int (*)(...))QFileOpenEvent::~QFileOpenEvent - -Class QFileOpenEvent - size=40 align=8 - base size=40 base align=8 -QFileOpenEvent (0x0x7fba0d972138) 0 - vptr=((& QFileOpenEvent::_ZTV14QFileOpenEvent) + 16u) - QEvent (0x0x7fba0dca4de0) 0 - primary-for QFileOpenEvent (0x0x7fba0d972138) - -Vtable for QToolBarChangeEvent -QToolBarChangeEvent::_ZTV19QToolBarChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QToolBarChangeEvent) -16 (int (*)(...))QToolBarChangeEvent::~QToolBarChangeEvent -24 (int (*)(...))QToolBarChangeEvent::~QToolBarChangeEvent - -Class QToolBarChangeEvent - size=24 align=8 - base size=21 base align=8 -QToolBarChangeEvent (0x0x7fba0d9721a0) 0 - vptr=((& QToolBarChangeEvent::_ZTV19QToolBarChangeEvent) + 16u) - QEvent (0x0x7fba0dca4e40) 0 - primary-for QToolBarChangeEvent (0x0x7fba0d9721a0) - -Vtable for QShortcutEvent -QShortcutEvent::_ZTV14QShortcutEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QShortcutEvent) -16 (int (*)(...))QShortcutEvent::~QShortcutEvent -24 (int (*)(...))QShortcutEvent::~QShortcutEvent - -Class QShortcutEvent - size=40 align=8 - base size=40 base align=8 -QShortcutEvent (0x0x7fba0d972208) 0 - vptr=((& QShortcutEvent::_ZTV14QShortcutEvent) + 16u) - QEvent (0x0x7fba0dca4ea0) 0 - primary-for QShortcutEvent (0x0x7fba0d972208) - -Vtable for QWindowStateChangeEvent -QWindowStateChangeEvent::_ZTV23QWindowStateChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QWindowStateChangeEvent) -16 (int (*)(...))QWindowStateChangeEvent::~QWindowStateChangeEvent -24 (int (*)(...))QWindowStateChangeEvent::~QWindowStateChangeEvent - -Class QWindowStateChangeEvent - size=32 align=8 - base size=25 base align=8 -QWindowStateChangeEvent (0x0x7fba0d972270) 0 - vptr=((& QWindowStateChangeEvent::_ZTV23QWindowStateChangeEvent) + 16u) - QEvent (0x0x7fba0dca4f00) 0 - primary-for QWindowStateChangeEvent (0x0x7fba0d972270) - -Class QPointingDeviceUniqueId - size=8 align=8 - base size=8 base align=8 -QPointingDeviceUniqueId (0x0x7fba0dca4f60) 0 - -Class QTouchEvent::TouchPoint - size=8 align=8 - base size=8 base align=8 -QTouchEvent::TouchPoint (0x0x7fba0d9a0660) 0 - -Vtable for QTouchEvent -QTouchEvent::_ZTV11QTouchEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTouchEvent) -16 (int (*)(...))QTouchEvent::~QTouchEvent -24 (int (*)(...))QTouchEvent::~QTouchEvent - -Class QTouchEvent - size=72 align=8 - base size=72 base align=8 -QTouchEvent (0x0x7fba0d9728f0) 0 - vptr=((& QTouchEvent::_ZTV11QTouchEvent) + 16u) - QInputEvent (0x0x7fba0d972958) 0 - primary-for QTouchEvent (0x0x7fba0d9728f0) - QEvent (0x0x7fba0d9a0600) 0 - primary-for QInputEvent (0x0x7fba0d972958) - -Vtable for QScrollPrepareEvent -QScrollPrepareEvent::_ZTV19QScrollPrepareEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QScrollPrepareEvent) -16 (int (*)(...))QScrollPrepareEvent::~QScrollPrepareEvent -24 (int (*)(...))QScrollPrepareEvent::~QScrollPrepareEvent - -Class QScrollPrepareEvent - size=112 align=8 - base size=112 base align=8 -QScrollPrepareEvent (0x0x7fba0da831a0) 0 - vptr=((& QScrollPrepareEvent::_ZTV19QScrollPrepareEvent) + 16u) - QEvent (0x0x7fba0da6acc0) 0 - primary-for QScrollPrepareEvent (0x0x7fba0da831a0) - -Vtable for QScrollEvent -QScrollEvent::_ZTV12QScrollEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QScrollEvent) -16 (int (*)(...))QScrollEvent::~QScrollEvent -24 (int (*)(...))QScrollEvent::~QScrollEvent - -Class QScrollEvent - size=64 align=8 - base size=60 base align=8 -QScrollEvent (0x0x7fba0da83208) 0 - vptr=((& QScrollEvent::_ZTV12QScrollEvent) + 16u) - QEvent (0x0x7fba0da6ad20) 0 - primary-for QScrollEvent (0x0x7fba0da83208) - -Vtable for QScreenOrientationChangeEvent -QScreenOrientationChangeEvent::_ZTV29QScreenOrientationChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI29QScreenOrientationChangeEvent) -16 (int (*)(...))QScreenOrientationChangeEvent::~QScreenOrientationChangeEvent -24 (int (*)(...))QScreenOrientationChangeEvent::~QScreenOrientationChangeEvent - -Class QScreenOrientationChangeEvent - size=40 align=8 - base size=36 base align=8 -QScreenOrientationChangeEvent (0x0x7fba0da83270) 0 - vptr=((& QScreenOrientationChangeEvent::_ZTV29QScreenOrientationChangeEvent) + 16u) - QEvent (0x0x7fba0da6ad80) 0 - primary-for QScreenOrientationChangeEvent (0x0x7fba0da83270) - -Vtable for QApplicationStateChangeEvent -QApplicationStateChangeEvent::_ZTV28QApplicationStateChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI28QApplicationStateChangeEvent) -16 (int (*)(...))QApplicationStateChangeEvent::~QApplicationStateChangeEvent -24 (int (*)(...))QApplicationStateChangeEvent::~QApplicationStateChangeEvent - -Class QApplicationStateChangeEvent - size=24 align=8 - base size=24 base align=8 -QApplicationStateChangeEvent (0x0x7fba0da832d8) 0 - vptr=((& QApplicationStateChangeEvent::_ZTV28QApplicationStateChangeEvent) + 16u) - QEvent (0x0x7fba0da6ade0) 0 - primary-for QApplicationStateChangeEvent (0x0x7fba0da832d8) - -Class QFont - size=16 align=8 - base size=12 base align=8 -QFont (0x0x7fba0da6ae40) 0 - -Class QPolygon - size=8 align=8 - base size=8 base align=8 -QPolygon (0x0x7fba0d751068) 0 - QVector (0x0x7fba0d71bb40) 0 - -Class QPolygonF - size=8 align=8 - base size=8 base align=8 -QPolygonF (0x0x7fba0d751410) 0 - QVector (0x0x7fba0d7cf000) 0 - -Class QMatrix - size=48 align=8 - base size=48 base align=8 -QMatrix (0x0x7fba0d7cf3c0) 0 - -Class QPainterPath::Element - size=24 align=8 - base size=24 base align=8 -QPainterPath::Element (0x0x7fba0d7cf6c0) 0 - -Class QPainterPath - size=8 align=8 - base size=8 base align=8 -QPainterPath (0x0x7fba0d7cf660) 0 - -Class QPainterPathStroker - size=8 align=8 - base size=8 base align=8 -QPainterPathStroker (0x0x7fba0d89f0c0) 0 - -Class QTransform - size=88 align=8 - base size=88 base align=8 -QTransform (0x0x7fba0d89f1e0) 0 - -Vtable for QPaintDevice -QPaintDevice::_ZTV12QPaintDevice: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QPaintDevice) -16 0u -24 0u -32 (int (*)(...))QPaintDevice::devType -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QPaintDevice::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QPaintDevice - size=24 align=8 - base size=24 base align=8 -QPaintDevice (0x0x7fba0d89f900) 0 - vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 16u) - -Class QPixelFormat - size=8 align=8 - base size=8 base align=8 -QPixelFormat (0x0x7fba0d89f960) 0 - -Vtable for QImage -QImage::_ZTV6QImage: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QImage) -16 (int (*)(...))QImage::~QImage -24 (int (*)(...))QImage::~QImage -32 (int (*)(...))QImage::devType -40 (int (*)(...))QImage::paintEngine -48 (int (*)(...))QImage::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QImage - size=32 align=8 - base size=32 base align=8 -QImage (0x0x7fba0d5c72d8) 0 - vptr=((& QImage::_ZTV6QImage) + 16u) - QPaintDevice (0x0x7fba0d5c2420) 0 - primary-for QImage (0x0x7fba0d5c72d8) - -Vtable for QPixmap -QPixmap::_ZTV7QPixmap: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QPixmap) -16 (int (*)(...))QPixmap::~QPixmap -24 (int (*)(...))QPixmap::~QPixmap -32 (int (*)(...))QPixmap::devType -40 (int (*)(...))QPixmap::paintEngine -48 (int (*)(...))QPixmap::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QPixmap - size=32 align=8 - base size=32 base align=8 -QPixmap (0x0x7fba0d68ae38) 0 - vptr=((& QPixmap::_ZTV7QPixmap) + 16u) - QPaintDevice (0x0x7fba0d6953c0) 0 - primary-for QPixmap (0x0x7fba0d68ae38) - -Class QBrush - size=8 align=8 - base size=8 base align=8 -QBrush (0x0x7fba0d6956c0) 0 - -Class QBrushData - size=112 align=8 - base size=112 base align=8 -QBrushData (0x0x7fba0d695e40) 0 - -Class QGradient - size=64 align=8 - base size=64 base align=8 -QGradient (0x0x7fba0d695ea0) 0 - -Class QLinearGradient - size=64 align=8 - base size=64 base align=8 -QLinearGradient (0x0x7fba0d1f27b8) 0 - QGradient (0x0x7fba0d26f180) 0 - -Class QRadialGradient - size=64 align=8 - base size=64 base align=8 -QRadialGradient (0x0x7fba0d1f2820) 0 - QGradient (0x0x7fba0d26f1e0) 0 - -Class QConicalGradient - size=64 align=8 - base size=64 base align=8 -QConicalGradient (0x0x7fba0d1f2888) 0 - QGradient (0x0x7fba0d26f240) 0 - -Class QPen - size=8 align=8 - base size=8 base align=8 -QPen (0x0x7fba0d26f2a0) 0 - -Class QTextOption::Tab - size=16 align=8 - base size=14 base align=8 -QTextOption::Tab (0x0x7fba0d3174e0) 0 - -Class QTextOption - size=32 align=8 - base size=32 base align=8 -QTextOption (0x0x7fba0d317480) 0 - -Class QTextLength - size=16 align=8 - base size=16 base align=8 -QTextLength (0x0x7fba0d317c60) 0 - -Class QTextFormat - size=16 align=8 - base size=12 base align=8 -QTextFormat (0x0x7fba0d39e3c0) 0 - -Class QTextCharFormat - size=16 align=8 - base size=12 base align=8 -QTextCharFormat (0x0x7fba0d013958) 0 - QTextFormat (0x0x7fba0d06f240) 0 - -Class QTextBlockFormat - size=16 align=8 - base size=12 base align=8 -QTextBlockFormat (0x0x7fba0d013b60) 0 - QTextFormat (0x0x7fba0d06f4e0) 0 - -Class QTextListFormat - size=16 align=8 - base size=12 base align=8 -QTextListFormat (0x0x7fba0d013dd0) 0 - QTextFormat (0x0x7fba0d06f780) 0 - -Class QTextImageFormat - size=16 align=8 - base size=12 base align=8 -QTextImageFormat (0x0x7fba0d0130d0) 0 - QTextCharFormat (0x0x7fba0d013270) 0 - QTextFormat (0x0x7fba0d06fa20) 0 - -Class QTextFrameFormat - size=16 align=8 - base size=12 base align=8 -QTextFrameFormat (0x0x7fba0d12f0d0) 0 - QTextFormat (0x0x7fba0d06fcc0) 0 - -Class QTextTableFormat - size=16 align=8 - base size=12 base align=8 -QTextTableFormat (0x0x7fba0d12f2d8) 0 - QTextFrameFormat (0x0x7fba0d12f340) 0 - QTextFormat (0x0x7fba0d06ff60) 0 - -Class QTextTableCellFormat - size=16 align=8 - base size=12 base align=8 -QTextTableCellFormat (0x0x7fba0d12f548) 0 - QTextCharFormat (0x0x7fba0d12f5b0) 0 - QTextFormat (0x0x7fba0d16b2a0) 0 - -Class QFontDatabase - size=8 align=8 - base size=8 base align=8 -QFontDatabase (0x0x7fba0d16b540) 0 - -Class QRawFont - size=8 align=8 - base size=8 base align=8 -QRawFont (0x0x7fba0d16b5a0) 0 - -Class QGlyphRun - size=8 align=8 - base size=8 base align=8 -QGlyphRun (0x0x7fba0d16ba80) 0 - -Class QTextCursor - size=8 align=8 - base size=8 base align=8 -QTextCursor (0x0x7fba0d16bd80) 0 - -Class QTextInlineObject - size=16 align=8 - base size=16 base align=8 -QTextInlineObject (0x0x7fba0ce5b0c0) 0 - -Class QTextLayout::FormatRange - size=24 align=8 - base size=24 base align=8 -QTextLayout::FormatRange (0x0x7fba0ce5b180) 0 - -Class QTextLayout - size=8 align=8 - base size=8 base align=8 -QTextLayout (0x0x7fba0ce5b120) 0 - -Class QTextLine - size=16 align=8 - base size=16 base align=8 -QTextLine (0x0x7fba0ce5bba0) 0 - -Vtable for QAbstractUndoItem -QAbstractUndoItem::_ZTV17QAbstractUndoItem: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAbstractUndoItem) -16 (int (*)(...))__cxa_pure_virtual -24 (int (*)(...))__cxa_pure_virtual -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QAbstractUndoItem - size=8 align=8 - base size=8 base align=8 -QAbstractUndoItem (0x0x7fba0ce5bc00) 0 nearly-empty - vptr=((& QAbstractUndoItem::_ZTV17QAbstractUndoItem) + 16u) - -Class QTextDocument::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextDocument::QPrivateSignal (0x0x7fba0ce5bcc0) 0 empty - -Vtable for QTextDocument -QTextDocument::_ZTV13QTextDocument: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QTextDocument) -16 (int (*)(...))QTextDocument::metaObject -24 (int (*)(...))QTextDocument::qt_metacast -32 (int (*)(...))QTextDocument::qt_metacall -40 (int (*)(...))QTextDocument::~QTextDocument -48 (int (*)(...))QTextDocument::~QTextDocument -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTextDocument::clear -120 (int (*)(...))QTextDocument::createObject -128 (int (*)(...))QTextDocument::loadResource - -Class QTextDocument - size=16 align=8 - base size=16 base align=8 -QTextDocument (0x0x7fba0ceb78f0) 0 - vptr=((& QTextDocument::_ZTV13QTextDocument) + 16u) - QObject (0x0x7fba0ce5bc60) 0 - primary-for QTextDocument (0x0x7fba0ceb78f0) - -Class QPalette::Data - size=4 align=4 - base size=4 base align=4 -QPalette::Data (0x0x7fba0ce5bf00) 0 - -Class QPalette - size=16 align=8 - base size=12 base align=8 -QPalette (0x0x7fba0ce5bea0) 0 - -Class QAbstractTextDocumentLayout::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractTextDocumentLayout::QPrivateSignal (0x0x7fba0cc12000) 0 empty - -Class QAbstractTextDocumentLayout::Selection - size=24 align=8 - base size=24 base align=8 -QAbstractTextDocumentLayout::Selection (0x0x7fba0cc12060) 0 - -Class QAbstractTextDocumentLayout::PaintContext - size=64 align=8 - base size=64 base align=8 -QAbstractTextDocumentLayout::PaintContext (0x0x7fba0cc120c0) 0 - -Vtable for QAbstractTextDocumentLayout -QAbstractTextDocumentLayout::_ZTV27QAbstractTextDocumentLayout: 24u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QAbstractTextDocumentLayout) -16 (int (*)(...))QAbstractTextDocumentLayout::metaObject -24 (int (*)(...))QAbstractTextDocumentLayout::qt_metacast -32 (int (*)(...))QAbstractTextDocumentLayout::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractTextDocumentLayout::resizeInlineObject -176 (int (*)(...))QAbstractTextDocumentLayout::positionInlineObject -184 (int (*)(...))QAbstractTextDocumentLayout::drawInlineObject - -Class QAbstractTextDocumentLayout - size=16 align=8 - base size=16 base align=8 -QAbstractTextDocumentLayout (0x0x7fba0cbed618) 0 - vptr=((& QAbstractTextDocumentLayout::_ZTV27QAbstractTextDocumentLayout) + 16u) - QObject (0x0x7fba0cfcdf60) 0 - primary-for QAbstractTextDocumentLayout (0x0x7fba0cbed618) - -Vtable for QTextObjectInterface -QTextObjectInterface::_ZTV20QTextObjectInterface: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QTextObjectInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QTextObjectInterface - size=8 align=8 - base size=8 base align=8 -QTextObjectInterface (0x0x7fba0cc12660) 0 nearly-empty - vptr=((& QTextObjectInterface::_ZTV20QTextObjectInterface) + 16u) - -Class QAccessible::State - size=8 align=8 - base size=5 base align=8 -QAccessible::State (0x0x7fba0cc12780) 0 - -Vtable for QAccessible::ActivationObserver -QAccessible::ActivationObserver::_ZTVN11QAccessible18ActivationObserverE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN11QAccessible18ActivationObserverE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QAccessible::ActivationObserver - size=8 align=8 - base size=8 base align=8 -QAccessible::ActivationObserver (0x0x7fba0cc127e0) 0 nearly-empty - vptr=((& QAccessible::ActivationObserver::_ZTVN11QAccessible18ActivationObserverE) + 16u) - -Class QAccessible - size=1 align=1 - base size=0 base align=1 -QAccessible (0x0x7fba0cc12720) 0 empty - -Vtable for QAccessibleInterface -QAccessibleInterface::_ZTV20QAccessibleInterface: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QAccessibleInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QAccessibleInterface::window -56 (int (*)(...))QAccessibleInterface::relations -64 (int (*)(...))QAccessibleInterface::focusChild -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAccessibleInterface::foregroundColor -160 (int (*)(...))QAccessibleInterface::backgroundColor -168 (int (*)(...))QAccessibleInterface::virtual_hook -176 (int (*)(...))QAccessibleInterface::interface_cast - -Class QAccessibleInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleInterface (0x0x7fba0cc129c0) 0 nearly-empty - vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 16u) - -Vtable for QAccessibleTextInterface -QAccessibleTextInterface::_ZTV24QAccessibleTextInterface: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QAccessibleTextInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))QAccessibleTextInterface::textBeforeOffset -104 (int (*)(...))QAccessibleTextInterface::textAfterOffset -112 (int (*)(...))QAccessibleTextInterface::textAtOffset -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleTextInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleTextInterface (0x0x7fba0cc12a20) 0 nearly-empty - vptr=((& QAccessibleTextInterface::_ZTV24QAccessibleTextInterface) + 16u) - -Vtable for QAccessibleEditableTextInterface -QAccessibleEditableTextInterface::_ZTV32QAccessibleEditableTextInterface: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI32QAccessibleEditableTextInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleEditableTextInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleEditableTextInterface (0x0x7fba0cc12a80) 0 nearly-empty - vptr=((& QAccessibleEditableTextInterface::_ZTV32QAccessibleEditableTextInterface) + 16u) - -Vtable for QAccessibleValueInterface -QAccessibleValueInterface::_ZTV25QAccessibleValueInterface: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QAccessibleValueInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleValueInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleValueInterface (0x0x7fba0cc12ae0) 0 nearly-empty - vptr=((& QAccessibleValueInterface::_ZTV25QAccessibleValueInterface) + 16u) - -Vtable for QAccessibleTableCellInterface -QAccessibleTableCellInterface::_ZTV29QAccessibleTableCellInterface: 12u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI29QAccessibleTableCellInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleTableCellInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleTableCellInterface (0x0x7fba0cc12b40) 0 nearly-empty - vptr=((& QAccessibleTableCellInterface::_ZTV29QAccessibleTableCellInterface) + 16u) - -Vtable for QAccessibleTableInterface -QAccessibleTableInterface::_ZTV25QAccessibleTableInterface: 24u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QAccessibleTableInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))__cxa_pure_virtual -176 (int (*)(...))__cxa_pure_virtual -184 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleTableInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleTableInterface (0x0x7fba0cc12ba0) 0 nearly-empty - vptr=((& QAccessibleTableInterface::_ZTV25QAccessibleTableInterface) + 16u) - -Vtable for QAccessibleActionInterface -QAccessibleActionInterface::_ZTV26QAccessibleActionInterface: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleActionInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QAccessibleActionInterface::localizedActionName -48 (int (*)(...))QAccessibleActionInterface::localizedActionDescription -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleActionInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleActionInterface (0x0x7fba0cc12c00) 0 nearly-empty - vptr=((& QAccessibleActionInterface::_ZTV26QAccessibleActionInterface) + 16u) - -Vtable for QAccessibleImageInterface -QAccessibleImageInterface::_ZTV25QAccessibleImageInterface: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QAccessibleImageInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleImageInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleImageInterface (0x0x7fba0cc12c60) 0 nearly-empty - vptr=((& QAccessibleImageInterface::_ZTV25QAccessibleImageInterface) + 16u) - -Vtable for QAccessibleEvent -QAccessibleEvent::_ZTV16QAccessibleEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QAccessibleEvent) -16 (int (*)(...))QAccessibleEvent::~QAccessibleEvent -24 (int (*)(...))QAccessibleEvent::~QAccessibleEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleEvent - size=32 align=8 - base size=28 base align=8 -QAccessibleEvent (0x0x7fba0cc12cc0) 0 - vptr=((& QAccessibleEvent::_ZTV16QAccessibleEvent) + 16u) - -Vtable for QAccessibleStateChangeEvent -QAccessibleStateChangeEvent::_ZTV27QAccessibleStateChangeEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QAccessibleStateChangeEvent) -16 (int (*)(...))QAccessibleStateChangeEvent::~QAccessibleStateChangeEvent -24 (int (*)(...))QAccessibleStateChangeEvent::~QAccessibleStateChangeEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleStateChangeEvent - size=40 align=8 - base size=40 base align=8 -QAccessibleStateChangeEvent (0x0x7fba0cd13068) 0 - vptr=((& QAccessibleStateChangeEvent::_ZTV27QAccessibleStateChangeEvent) + 16u) - QAccessibleEvent (0x0x7fba0cd0d240) 0 - primary-for QAccessibleStateChangeEvent (0x0x7fba0cd13068) - -Vtable for QAccessibleTextCursorEvent -QAccessibleTextCursorEvent::_ZTV26QAccessibleTextCursorEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextCursorEvent) -16 (int (*)(...))QAccessibleTextCursorEvent::~QAccessibleTextCursorEvent -24 (int (*)(...))QAccessibleTextCursorEvent::~QAccessibleTextCursorEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextCursorEvent - size=32 align=8 - base size=32 base align=8 -QAccessibleTextCursorEvent (0x0x7fba0cd130d0) 0 - vptr=((& QAccessibleTextCursorEvent::_ZTV26QAccessibleTextCursorEvent) + 16u) - QAccessibleEvent (0x0x7fba0cd0d2a0) 0 - primary-for QAccessibleTextCursorEvent (0x0x7fba0cd130d0) - -Vtable for QAccessibleTextSelectionEvent -QAccessibleTextSelectionEvent::_ZTV29QAccessibleTextSelectionEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI29QAccessibleTextSelectionEvent) -16 (int (*)(...))QAccessibleTextSelectionEvent::~QAccessibleTextSelectionEvent -24 (int (*)(...))QAccessibleTextSelectionEvent::~QAccessibleTextSelectionEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextSelectionEvent - size=40 align=8 - base size=40 base align=8 -QAccessibleTextSelectionEvent (0x0x7fba0cd13138) 0 - vptr=((& QAccessibleTextSelectionEvent::_ZTV29QAccessibleTextSelectionEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7fba0cd131a0) 0 - primary-for QAccessibleTextSelectionEvent (0x0x7fba0cd13138) - QAccessibleEvent (0x0x7fba0cd0d300) 0 - primary-for QAccessibleTextCursorEvent (0x0x7fba0cd131a0) - -Vtable for QAccessibleTextInsertEvent -QAccessibleTextInsertEvent::_ZTV26QAccessibleTextInsertEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextInsertEvent) -16 (int (*)(...))QAccessibleTextInsertEvent::~QAccessibleTextInsertEvent -24 (int (*)(...))QAccessibleTextInsertEvent::~QAccessibleTextInsertEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextInsertEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleTextInsertEvent (0x0x7fba0cd13208) 0 - vptr=((& QAccessibleTextInsertEvent::_ZTV26QAccessibleTextInsertEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7fba0cd13270) 0 - primary-for QAccessibleTextInsertEvent (0x0x7fba0cd13208) - QAccessibleEvent (0x0x7fba0cd0d360) 0 - primary-for QAccessibleTextCursorEvent (0x0x7fba0cd13270) - -Vtable for QAccessibleTextRemoveEvent -QAccessibleTextRemoveEvent::_ZTV26QAccessibleTextRemoveEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextRemoveEvent) -16 (int (*)(...))QAccessibleTextRemoveEvent::~QAccessibleTextRemoveEvent -24 (int (*)(...))QAccessibleTextRemoveEvent::~QAccessibleTextRemoveEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextRemoveEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleTextRemoveEvent (0x0x7fba0cd132d8) 0 - vptr=((& QAccessibleTextRemoveEvent::_ZTV26QAccessibleTextRemoveEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7fba0cd13340) 0 - primary-for QAccessibleTextRemoveEvent (0x0x7fba0cd132d8) - QAccessibleEvent (0x0x7fba0cd0d3c0) 0 - primary-for QAccessibleTextCursorEvent (0x0x7fba0cd13340) - -Vtable for QAccessibleTextUpdateEvent -QAccessibleTextUpdateEvent::_ZTV26QAccessibleTextUpdateEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextUpdateEvent) -16 (int (*)(...))QAccessibleTextUpdateEvent::~QAccessibleTextUpdateEvent -24 (int (*)(...))QAccessibleTextUpdateEvent::~QAccessibleTextUpdateEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextUpdateEvent - size=56 align=8 - base size=56 base align=8 -QAccessibleTextUpdateEvent (0x0x7fba0cd133a8) 0 - vptr=((& QAccessibleTextUpdateEvent::_ZTV26QAccessibleTextUpdateEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7fba0cd13410) 0 - primary-for QAccessibleTextUpdateEvent (0x0x7fba0cd133a8) - QAccessibleEvent (0x0x7fba0cd0d420) 0 - primary-for QAccessibleTextCursorEvent (0x0x7fba0cd13410) - -Vtable for QAccessibleValueChangeEvent -QAccessibleValueChangeEvent::_ZTV27QAccessibleValueChangeEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QAccessibleValueChangeEvent) -16 (int (*)(...))QAccessibleValueChangeEvent::~QAccessibleValueChangeEvent -24 (int (*)(...))QAccessibleValueChangeEvent::~QAccessibleValueChangeEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleValueChangeEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleValueChangeEvent (0x0x7fba0cd13478) 0 - vptr=((& QAccessibleValueChangeEvent::_ZTV27QAccessibleValueChangeEvent) + 16u) - QAccessibleEvent (0x0x7fba0cd0d480) 0 - primary-for QAccessibleValueChangeEvent (0x0x7fba0cd13478) - -Vtable for QAccessibleTableModelChangeEvent -QAccessibleTableModelChangeEvent::_ZTV32QAccessibleTableModelChangeEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI32QAccessibleTableModelChangeEvent) -16 (int (*)(...))QAccessibleTableModelChangeEvent::~QAccessibleTableModelChangeEvent -24 (int (*)(...))QAccessibleTableModelChangeEvent::~QAccessibleTableModelChangeEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTableModelChangeEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleTableModelChangeEvent (0x0x7fba0cd134e0) 0 - vptr=((& QAccessibleTableModelChangeEvent::_ZTV32QAccessibleTableModelChangeEvent) + 16u) - QAccessibleEvent (0x0x7fba0cd0d4e0) 0 - primary-for QAccessibleTableModelChangeEvent (0x0x7fba0cd134e0) - -Vtable for QAccessibleBridge -QAccessibleBridge::_ZTV17QAccessibleBridge: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAccessibleBridge) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleBridge - size=8 align=8 - base size=8 base align=8 -QAccessibleBridge (0x0x7fba0cd0d5a0) 0 nearly-empty - vptr=((& QAccessibleBridge::_ZTV17QAccessibleBridge) + 16u) - -Class QAccessibleBridgePlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessibleBridgePlugin::QPrivateSignal (0x0x7fba0cd0d660) 0 empty - -Vtable for QAccessibleBridgePlugin -QAccessibleBridgePlugin::_ZTV23QAccessibleBridgePlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QAccessibleBridgePlugin) -16 (int (*)(...))QAccessibleBridgePlugin::metaObject -24 (int (*)(...))QAccessibleBridgePlugin::qt_metacast -32 (int (*)(...))QAccessibleBridgePlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleBridgePlugin - size=16 align=8 - base size=16 base align=8 -QAccessibleBridgePlugin (0x0x7fba0cd13548) 0 - vptr=((& QAccessibleBridgePlugin::_ZTV23QAccessibleBridgePlugin) + 16u) - QObject (0x0x7fba0cd0d600) 0 - primary-for QAccessibleBridgePlugin (0x0x7fba0cd13548) - -Vtable for QAccessibleObject -QAccessibleObject::_ZTV17QAccessibleObject: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAccessibleObject) -16 0u -24 0u -32 (int (*)(...))QAccessibleObject::isValid -40 (int (*)(...))QAccessibleObject::object -48 (int (*)(...))QAccessibleInterface::window -56 (int (*)(...))QAccessibleInterface::relations -64 (int (*)(...))QAccessibleInterface::focusChild -72 (int (*)(...))QAccessibleObject::childAt -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QAccessibleObject::setText -128 (int (*)(...))QAccessibleObject::rect -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAccessibleInterface::foregroundColor -160 (int (*)(...))QAccessibleInterface::backgroundColor -168 (int (*)(...))QAccessibleInterface::virtual_hook -176 (int (*)(...))QAccessibleInterface::interface_cast - -Class QAccessibleObject - size=16 align=8 - base size=16 base align=8 -QAccessibleObject (0x0x7fba0cd135b0) 0 - vptr=((& QAccessibleObject::_ZTV17QAccessibleObject) + 16u) - QAccessibleInterface (0x0x7fba0cd0d6c0) 0 nearly-empty - primary-for QAccessibleObject (0x0x7fba0cd135b0) - -Vtable for QAccessibleApplication -QAccessibleApplication::_ZTV22QAccessibleApplication: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QAccessibleApplication) -16 (int (*)(...))QAccessibleApplication::~QAccessibleApplication -24 (int (*)(...))QAccessibleApplication::~QAccessibleApplication -32 (int (*)(...))QAccessibleObject::isValid -40 (int (*)(...))QAccessibleObject::object -48 (int (*)(...))QAccessibleApplication::window -56 (int (*)(...))QAccessibleInterface::relations -64 (int (*)(...))QAccessibleApplication::focusChild -72 (int (*)(...))QAccessibleObject::childAt -80 (int (*)(...))QAccessibleApplication::parent -88 (int (*)(...))QAccessibleApplication::child -96 (int (*)(...))QAccessibleApplication::childCount -104 (int (*)(...))QAccessibleApplication::indexOfChild -112 (int (*)(...))QAccessibleApplication::text -120 (int (*)(...))QAccessibleObject::setText -128 (int (*)(...))QAccessibleObject::rect -136 (int (*)(...))QAccessibleApplication::role -144 (int (*)(...))QAccessibleApplication::state -152 (int (*)(...))QAccessibleInterface::foregroundColor -160 (int (*)(...))QAccessibleInterface::backgroundColor -168 (int (*)(...))QAccessibleInterface::virtual_hook -176 (int (*)(...))QAccessibleInterface::interface_cast - -Class QAccessibleApplication - size=16 align=8 - base size=16 base align=8 -QAccessibleApplication (0x0x7fba0cd13618) 0 - vptr=((& QAccessibleApplication::_ZTV22QAccessibleApplication) + 16u) - QAccessibleObject (0x0x7fba0cd13680) 0 - primary-for QAccessibleApplication (0x0x7fba0cd13618) - QAccessibleInterface (0x0x7fba0cd0d720) 0 nearly-empty - primary-for QAccessibleObject (0x0x7fba0cd13680) - -Class QAccessiblePlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessiblePlugin::QPrivateSignal (0x0x7fba0cd0d7e0) 0 empty - -Vtable for QAccessiblePlugin -QAccessiblePlugin::_ZTV17QAccessiblePlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAccessiblePlugin) -16 (int (*)(...))QAccessiblePlugin::metaObject -24 (int (*)(...))QAccessiblePlugin::qt_metacast -32 (int (*)(...))QAccessiblePlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QAccessiblePlugin - size=16 align=8 - base size=16 base align=8 -QAccessiblePlugin (0x0x7fba0cd136e8) 0 - vptr=((& QAccessiblePlugin::_ZTV17QAccessiblePlugin) + 16u) - QObject (0x0x7fba0cd0d780) 0 - primary-for QAccessiblePlugin (0x0x7fba0cd136e8) - -Class QSurfaceFormat - size=8 align=8 - base size=8 base align=8 -QSurfaceFormat (0x0x7fba0cd0d840) 0 - -Vtable for QSurface -QSurface::_ZTV8QSurface: 8u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QSurface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual - -Class QSurface - size=24 align=8 - base size=24 base align=8 -QSurface (0x0x7fba0cd0da20) 0 - vptr=((& QSurface::_ZTV8QSurface) + 16u) - -Class QIcon - size=8 align=8 - base size=8 base align=8 -QIcon (0x0x7fba0cd0dba0) 0 - -Class QCursor - size=8 align=8 - base size=8 base align=8 -QCursor (0x0x7fba0cacbf60) 0 - -Class QWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QWindow::QPrivateSignal (0x0x7fba0cb7f5a0) 0 empty - -Vtable for QWindow -QWindow::_ZTV7QWindow: 45u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QWindow) -16 (int (*)(...))QWindow::metaObject -24 (int (*)(...))QWindow::qt_metacast -32 (int (*)(...))QWindow::qt_metacall -40 (int (*)(...))QWindow::~QWindow -48 (int (*)(...))QWindow::~QWindow -56 (int (*)(...))QWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QWindow::exposeEvent -160 (int (*)(...))QWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))-16 -304 (int (*)(...))(& _ZTI7QWindow) -312 (int (*)(...))QWindow::_ZThn16_N7QWindowD1Ev -320 (int (*)(...))QWindow::_ZThn16_N7QWindowD0Ev -328 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -336 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -344 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv - -Class QWindow - size=40 align=8 - base size=40 base align=8 -QWindow (0x0x7fba0cb8a150) 0 - vptr=((& QWindow::_ZTV7QWindow) + 16u) - QObject (0x0x7fba0cb7f4e0) 0 - primary-for QWindow (0x0x7fba0cb8a150) - QSurface (0x0x7fba0cb7f540) 16 - vptr=((& QWindow::_ZTV7QWindow) + 312u) - -Class QBackingStore - size=8 align=8 - base size=8 base align=8 -QBackingStore (0x0x7fba0cb7f6c0) 0 - -Vtable for QBitmap -QBitmap::_ZTV7QBitmap: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QBitmap) -16 (int (*)(...))QBitmap::~QBitmap -24 (int (*)(...))QBitmap::~QBitmap -32 (int (*)(...))QPixmap::devType -40 (int (*)(...))QPixmap::paintEngine -48 (int (*)(...))QPixmap::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QBitmap - size=32 align=8 - base size=32 base align=8 -QBitmap (0x0x7fba0cb78750) 0 - vptr=((& QBitmap::_ZTV7QBitmap) + 16u) - QPixmap (0x0x7fba0cb787b8) 0 - primary-for QBitmap (0x0x7fba0cb78750) - QPaintDevice (0x0x7fba0cb7f780) 0 - primary-for QPixmap (0x0x7fba0cb787b8) - -Class QClipboard::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QClipboard::QPrivateSignal (0x0x7fba0cb7fae0) 0 empty - -Vtable for QClipboard -QClipboard::_ZTV10QClipboard: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QClipboard) -16 (int (*)(...))QClipboard::metaObject -24 (int (*)(...))QClipboard::qt_metacast -32 (int (*)(...))QClipboard::qt_metacall -40 (int (*)(...))QClipboard::~QClipboard -48 (int (*)(...))QClipboard::~QClipboard -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QClipboard - size=16 align=8 - base size=16 base align=8 -QClipboard (0x0x7fba0cb78a28) 0 - vptr=((& QClipboard::_ZTV10QClipboard) + 16u) - QObject (0x0x7fba0cb7fa80) 0 - primary-for QClipboard (0x0x7fba0cb78a28) - -Class QDesktopServices - size=1 align=1 - base size=0 base align=1 -QDesktopServices (0x0x7fba0cb7fb40) 0 empty - -Class QDrag::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QDrag::QPrivateSignal (0x0x7fba0cb7fc00) 0 empty - -Vtable for QDrag -QDrag::_ZTV5QDrag: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI5QDrag) -16 (int (*)(...))QDrag::metaObject -24 (int (*)(...))QDrag::qt_metacast -32 (int (*)(...))QDrag::qt_metacall -40 (int (*)(...))QDrag::~QDrag -48 (int (*)(...))QDrag::~QDrag -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QDrag - size=16 align=8 - base size=16 base align=8 -QDrag (0x0x7fba0cb78a90) 0 - vptr=((& QDrag::_ZTV5QDrag) + 16u) - QObject (0x0x7fba0cb7fba0) 0 - primary-for QDrag (0x0x7fba0cb78a90) - -Class QFontInfo - size=8 align=8 - base size=8 base align=8 -QFontInfo (0x0x7fba0cb7fc60) 0 - -Class QFontMetrics - size=8 align=8 - base size=8 base align=8 -QFontMetrics (0x0x7fba0cb7ff00) 0 - -Class QFontMetricsF - size=8 align=8 - base size=8 base align=8 -QFontMetricsF (0x0x7fba0c84e240) 0 - -Class QGenericPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QGenericPlugin::QPrivateSignal (0x0x7fba0c91d9c0) 0 empty - -Vtable for QGenericPlugin -QGenericPlugin::_ZTV14QGenericPlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QGenericPlugin) -16 (int (*)(...))QGenericPlugin::metaObject -24 (int (*)(...))QGenericPlugin::qt_metacast -32 (int (*)(...))QGenericPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QGenericPlugin - size=16 align=8 - base size=16 base align=8 -QGenericPlugin (0x0x7fba0c8815b0) 0 - vptr=((& QGenericPlugin::_ZTV14QGenericPlugin) + 16u) - QObject (0x0x7fba0c91d960) 0 - primary-for QGenericPlugin (0x0x7fba0c8815b0) - -Class QGenericPluginFactory - size=1 align=1 - base size=0 base align=1 -QGenericPluginFactory (0x0x7fba0c91da20) 0 empty - -Class QInputMethod::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QInputMethod::QPrivateSignal (0x0x7fba0c91dae0) 0 empty - -Vtable for QInputMethod -QInputMethod::_ZTV12QInputMethod: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QInputMethod) -16 (int (*)(...))QInputMethod::metaObject -24 (int (*)(...))QInputMethod::qt_metacast -32 (int (*)(...))QInputMethod::qt_metacall -40 (int (*)(...))QInputMethod::~QInputMethod -48 (int (*)(...))QInputMethod::~QInputMethod -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QInputMethod - size=16 align=8 - base size=16 base align=8 -QInputMethod (0x0x7fba0c881618) 0 - vptr=((& QInputMethod::_ZTV12QInputMethod) + 16u) - QObject (0x0x7fba0c91da80) 0 - primary-for QInputMethod (0x0x7fba0c881618) - -Class QGuiApplication::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QGuiApplication::QPrivateSignal (0x0x7fba0c91dba0) 0 empty - -Vtable for QGuiApplication -QGuiApplication::_ZTV15QGuiApplication: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QGuiApplication) -16 (int (*)(...))QGuiApplication::metaObject -24 (int (*)(...))QGuiApplication::qt_metacast -32 (int (*)(...))QGuiApplication::qt_metacall -40 (int (*)(...))QGuiApplication::~QGuiApplication -48 (int (*)(...))QGuiApplication::~QGuiApplication -56 (int (*)(...))QGuiApplication::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QGuiApplication::notify -120 (int (*)(...))QGuiApplication::compressEvent - -Class QGuiApplication - size=16 align=8 - base size=16 base align=8 -QGuiApplication (0x0x7fba0c881680) 0 - vptr=((& QGuiApplication::_ZTV15QGuiApplication) + 16u) - QCoreApplication (0x0x7fba0c8816e8) 0 - primary-for QGuiApplication (0x0x7fba0c881680) - QObject (0x0x7fba0c91db40) 0 - primary-for QCoreApplication (0x0x7fba0c8816e8) - -Class QIconEngine::AvailableSizesArgument - size=16 align=8 - base size=16 base align=8 -QIconEngine::AvailableSizesArgument (0x0x7fba0c603120) 0 - -Class QIconEngine::ScaledPixmapArgument - size=56 align=8 - base size=56 base align=8 -QIconEngine::ScaledPixmapArgument (0x0x7fba0c6032a0) 0 - -Vtable for QIconEngine -QIconEngine::_ZTV11QIconEngine: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QIconEngine) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QIconEngine::actualSize -48 (int (*)(...))QIconEngine::pixmap -56 (int (*)(...))QIconEngine::addPixmap -64 (int (*)(...))QIconEngine::addFile -72 (int (*)(...))QIconEngine::key -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))QIconEngine::read -96 (int (*)(...))QIconEngine::write -104 (int (*)(...))QIconEngine::availableSizes -112 (int (*)(...))QIconEngine::iconName -120 (int (*)(...))QIconEngine::virtual_hook - -Class QIconEngine - size=8 align=8 - base size=8 base align=8 -QIconEngine (0x0x7fba0c6030c0) 0 nearly-empty - vptr=((& QIconEngine::_ZTV11QIconEngine) + 16u) - -Class QIconEnginePlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIconEnginePlugin::QPrivateSignal (0x0x7fba0c603360) 0 empty - -Vtable for QIconEnginePlugin -QIconEnginePlugin::_ZTV17QIconEnginePlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QIconEnginePlugin) -16 (int (*)(...))QIconEnginePlugin::metaObject -24 (int (*)(...))QIconEnginePlugin::qt_metacast -32 (int (*)(...))QIconEnginePlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QIconEnginePlugin - size=16 align=8 - base size=16 base align=8 -QIconEnginePlugin (0x0x7fba0c881d00) 0 - vptr=((& QIconEnginePlugin::_ZTV17QIconEnginePlugin) + 16u) - QObject (0x0x7fba0c603300) 0 - primary-for QIconEnginePlugin (0x0x7fba0c881d00) - -Vtable for QImageIOHandler -QImageIOHandler::_ZTV15QImageIOHandler: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QImageIOHandler) -16 0u -24 0u -32 (int (*)(...))QImageIOHandler::name -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))QImageIOHandler::write -64 (int (*)(...))QImageIOHandler::option -72 (int (*)(...))QImageIOHandler::setOption -80 (int (*)(...))QImageIOHandler::supportsOption -88 (int (*)(...))QImageIOHandler::jumpToNextImage -96 (int (*)(...))QImageIOHandler::jumpToImage -104 (int (*)(...))QImageIOHandler::loopCount -112 (int (*)(...))QImageIOHandler::imageCount -120 (int (*)(...))QImageIOHandler::nextImageDelay -128 (int (*)(...))QImageIOHandler::currentImageNumber -136 (int (*)(...))QImageIOHandler::currentImageRect - -Class QImageIOHandler - size=16 align=8 - base size=16 base align=8 -QImageIOHandler (0x0x7fba0c6033c0) 0 - vptr=((& QImageIOHandler::_ZTV15QImageIOHandler) + 16u) - -Class QImageIOPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QImageIOPlugin::QPrivateSignal (0x0x7fba0c603540) 0 empty - -Vtable for QImageIOPlugin -QImageIOPlugin::_ZTV14QImageIOPlugin: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QImageIOPlugin) -16 (int (*)(...))QImageIOPlugin::metaObject -24 (int (*)(...))QImageIOPlugin::qt_metacast -32 (int (*)(...))QImageIOPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QImageIOPlugin - size=16 align=8 - base size=16 base align=8 -QImageIOPlugin (0x0x7fba0c881d68) 0 - vptr=((& QImageIOPlugin::_ZTV14QImageIOPlugin) + 16u) - QObject (0x0x7fba0c6034e0) 0 - primary-for QImageIOPlugin (0x0x7fba0c881d68) - -Class QImageReader - size=8 align=8 - base size=8 base align=8 -QImageReader (0x0x7fba0c603720) 0 - -Class QImageWriter - size=8 align=8 - base size=8 base align=8 -QImageWriter (0x0x7fba0c603780) 0 - -Class QVector3D - size=12 align=4 - base size=12 base align=4 -QVector3D (0x0x7fba0c6037e0) 0 - -Class QVector4D - size=16 align=4 - base size=16 base align=4 -QVector4D (0x0x7fba0c603a80) 0 - -Class QQuaternion - size=16 align=4 - base size=16 base align=4 -QQuaternion (0x0x7fba0c603d20) 0 - -Class QMatrix4x4 - size=68 align=4 - base size=68 base align=4 -QMatrix4x4 (0x0x7fba0c7b5360) 0 - -Class QMovie::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QMovie::QPrivateSignal (0x0x7fba0c7b5ae0) 0 empty - -Vtable for QMovie -QMovie::_ZTV6QMovie: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QMovie) -16 (int (*)(...))QMovie::metaObject -24 (int (*)(...))QMovie::qt_metacast -32 (int (*)(...))QMovie::qt_metacall -40 (int (*)(...))QMovie::~QMovie -48 (int (*)(...))QMovie::~QMovie -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QMovie - size=16 align=8 - base size=16 base align=8 -QMovie (0x0x7fba0c72ff08) 0 - vptr=((& QMovie::_ZTV6QMovie) + 16u) - QObject (0x0x7fba0c7b5a80) 0 - primary-for QMovie (0x0x7fba0c72ff08) - -Class QOffscreenSurface::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOffscreenSurface::QPrivateSignal (0x0x7fba0c7b5c00) 0 empty - -Vtable for QOffscreenSurface -QOffscreenSurface::_ZTV17QOffscreenSurface: 26u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QOffscreenSurface) -16 (int (*)(...))QOffscreenSurface::metaObject -24 (int (*)(...))QOffscreenSurface::qt_metacast -32 (int (*)(...))QOffscreenSurface::qt_metacall -40 (int (*)(...))QOffscreenSurface::~QOffscreenSurface -48 (int (*)(...))QOffscreenSurface::~QOffscreenSurface -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QOffscreenSurface::surfaceType -120 (int (*)(...))QOffscreenSurface::format -128 (int (*)(...))QOffscreenSurface::size -136 (int (*)(...))QOffscreenSurface::surfaceHandle -144 (int (*)(...))-16 -152 (int (*)(...))(& _ZTI17QOffscreenSurface) -160 (int (*)(...))QOffscreenSurface::_ZThn16_N17QOffscreenSurfaceD1Ev -168 (int (*)(...))QOffscreenSurface::_ZThn16_N17QOffscreenSurfaceD0Ev -176 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface6formatEv -184 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface13surfaceHandleEv -192 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface11surfaceTypeEv -200 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface4sizeEv - -Class QOffscreenSurface - size=40 align=8 - base size=40 base align=8 -QOffscreenSurface (0x0x7fba0c4fae00) 0 - vptr=((& QOffscreenSurface::_ZTV17QOffscreenSurface) + 16u) - QObject (0x0x7fba0c7b5b40) 0 - primary-for QOffscreenSurface (0x0x7fba0c4fae00) - QSurface (0x0x7fba0c7b5ba0) 16 - vptr=((& QOffscreenSurface::_ZTV17QOffscreenSurface) + 160u) - -Class QOpenGLBuffer - size=8 align=8 - base size=8 base align=8 -QOpenGLBuffer (0x0x7fba0c7b5cc0) 0 - -Class QOpenGLVersionStatus - size=12 align=4 - base size=12 base align=4 -QOpenGLVersionStatus (0x0x7fba0c7b5ea0) 0 - -Class QOpenGLVersionFunctionsBackend - size=16 align=8 - base size=12 base align=8 -QOpenGLVersionFunctionsBackend (0x0x7fba0bea89c0) 0 - -Class QOpenGLVersionFunctionsStorage - size=8 align=8 - base size=8 base align=8 -QOpenGLVersionFunctionsStorage (0x0x7fba0bea8a20) 0 - -Class QAbstractOpenGLFunctionsPrivate - size=16 align=8 - base size=9 base align=8 -QAbstractOpenGLFunctionsPrivate (0x0x7fba0bea8a80) 0 - -Vtable for QAbstractOpenGLFunctions -QAbstractOpenGLFunctions::_ZTV24QAbstractOpenGLFunctions: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QAbstractOpenGLFunctions) -16 (int (*)(...))QAbstractOpenGLFunctions::~QAbstractOpenGLFunctions -24 (int (*)(...))QAbstractOpenGLFunctions::~QAbstractOpenGLFunctions -32 (int (*)(...))QAbstractOpenGLFunctions::initializeOpenGLFunctions - -Class QAbstractOpenGLFunctions - size=16 align=8 - base size=16 base align=8 -QAbstractOpenGLFunctions (0x0x7fba0bea8ae0) 0 - vptr=((& QAbstractOpenGLFunctions::_ZTV24QAbstractOpenGLFunctions) + 16u) - -Class QOpenGLFunctions_1_0_CoreBackend::Functions - size=384 align=8 - base size=384 base align=8 -QOpenGLFunctions_1_0_CoreBackend::Functions (0x0x7fba0bea8ba0) 0 - -Class QOpenGLFunctions_1_0_CoreBackend - size=400 align=8 - base size=400 base align=8 -QOpenGLFunctions_1_0_CoreBackend (0x0x7fba0bec21a0) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bea8b40) 0 - -Class QOpenGLFunctions_1_1_CoreBackend::Functions - size=128 align=8 - base size=128 base align=8 -QOpenGLFunctions_1_1_CoreBackend::Functions (0x0x7fba0bea8cc0) 0 - -Class QOpenGLFunctions_1_1_CoreBackend - size=144 align=8 - base size=144 base align=8 -QOpenGLFunctions_1_1_CoreBackend (0x0x7fba0bec2208) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bea8c60) 0 - -Class QOpenGLFunctions_1_2_CoreBackend::Functions - size=48 align=8 - base size=48 base align=8 -QOpenGLFunctions_1_2_CoreBackend::Functions (0x0x7fba0bea8de0) 0 - -Class QOpenGLFunctions_1_2_CoreBackend - size=64 align=8 - base size=64 base align=8 -QOpenGLFunctions_1_2_CoreBackend (0x0x7fba0bec2270) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bea8d80) 0 - -Class QOpenGLFunctions_1_3_CoreBackend::Functions - size=72 align=8 - base size=72 base align=8 -QOpenGLFunctions_1_3_CoreBackend::Functions (0x0x7fba0bea8f00) 0 - -Class QOpenGLFunctions_1_3_CoreBackend - size=88 align=8 - base size=88 base align=8 -QOpenGLFunctions_1_3_CoreBackend (0x0x7fba0bec22d8) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bea8ea0) 0 - -Class QOpenGLFunctions_1_4_CoreBackend::Functions - size=56 align=8 - base size=56 base align=8 -QOpenGLFunctions_1_4_CoreBackend::Functions (0x0x7fba0bf090c0) 0 - -Class QOpenGLFunctions_1_4_CoreBackend - size=72 align=8 - base size=72 base align=8 -QOpenGLFunctions_1_4_CoreBackend (0x0x7fba0bec2340) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf09060) 0 - -Class QOpenGLFunctions_1_5_CoreBackend::Functions - size=152 align=8 - base size=152 base align=8 -QOpenGLFunctions_1_5_CoreBackend::Functions (0x0x7fba0bf091e0) 0 - -Class QOpenGLFunctions_1_5_CoreBackend - size=168 align=8 - base size=168 base align=8 -QOpenGLFunctions_1_5_CoreBackend (0x0x7fba0bec23a8) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf09180) 0 - -Class QOpenGLFunctions_2_0_CoreBackend::Functions - size=744 align=8 - base size=744 base align=8 -QOpenGLFunctions_2_0_CoreBackend::Functions (0x0x7fba0bf09300) 0 - -Class QOpenGLFunctions_2_0_CoreBackend - size=760 align=8 - base size=760 base align=8 -QOpenGLFunctions_2_0_CoreBackend (0x0x7fba0bec2410) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf092a0) 0 - -Class QOpenGLFunctions_2_1_CoreBackend::Functions - size=48 align=8 - base size=48 base align=8 -QOpenGLFunctions_2_1_CoreBackend::Functions (0x0x7fba0bf09420) 0 - -Class QOpenGLFunctions_2_1_CoreBackend - size=64 align=8 - base size=64 base align=8 -QOpenGLFunctions_2_1_CoreBackend (0x0x7fba0bec2478) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf093c0) 0 - -Class QOpenGLFunctions_3_0_CoreBackend::Functions - size=672 align=8 - base size=672 base align=8 -QOpenGLFunctions_3_0_CoreBackend::Functions (0x0x7fba0bf09540) 0 - -Class QOpenGLFunctions_3_0_CoreBackend - size=688 align=8 - base size=688 base align=8 -QOpenGLFunctions_3_0_CoreBackend (0x0x7fba0bec24e0) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf094e0) 0 - -Class QOpenGLFunctions_3_1_CoreBackend::Functions - size=96 align=8 - base size=96 base align=8 -QOpenGLFunctions_3_1_CoreBackend::Functions (0x0x7fba0bf09660) 0 - -Class QOpenGLFunctions_3_1_CoreBackend - size=112 align=8 - base size=112 base align=8 -QOpenGLFunctions_3_1_CoreBackend (0x0x7fba0bec2548) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf09600) 0 - -Class QOpenGLFunctions_3_2_CoreBackend::Functions - size=152 align=8 - base size=152 base align=8 -QOpenGLFunctions_3_2_CoreBackend::Functions (0x0x7fba0bf09780) 0 - -Class QOpenGLFunctions_3_2_CoreBackend - size=168 align=8 - base size=168 base align=8 -QOpenGLFunctions_3_2_CoreBackend (0x0x7fba0bec25b0) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf09720) 0 - -Class QOpenGLFunctions_3_3_CoreBackend::Functions - size=464 align=8 - base size=464 base align=8 -QOpenGLFunctions_3_3_CoreBackend::Functions (0x0x7fba0bf098a0) 0 - -Class QOpenGLFunctions_3_3_CoreBackend - size=480 align=8 - base size=480 base align=8 -QOpenGLFunctions_3_3_CoreBackend (0x0x7fba0bec2618) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf09840) 0 - -Class QOpenGLFunctions_4_0_CoreBackend::Functions - size=368 align=8 - base size=368 base align=8 -QOpenGLFunctions_4_0_CoreBackend::Functions (0x0x7fba0bf099c0) 0 - -Class QOpenGLFunctions_4_0_CoreBackend - size=384 align=8 - base size=384 base align=8 -QOpenGLFunctions_4_0_CoreBackend (0x0x7fba0bec2680) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf09960) 0 - -Class QOpenGLFunctions_4_1_CoreBackend::Functions - size=704 align=8 - base size=704 base align=8 -QOpenGLFunctions_4_1_CoreBackend::Functions (0x0x7fba0bf09ae0) 0 - -Class QOpenGLFunctions_4_1_CoreBackend - size=720 align=8 - base size=720 base align=8 -QOpenGLFunctions_4_1_CoreBackend (0x0x7fba0bec26e8) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf09a80) 0 - -Class QOpenGLFunctions_4_2_CoreBackend::Functions - size=96 align=8 - base size=96 base align=8 -QOpenGLFunctions_4_2_CoreBackend::Functions (0x0x7fba0bf09c00) 0 - -Class QOpenGLFunctions_4_2_CoreBackend - size=112 align=8 - base size=112 base align=8 -QOpenGLFunctions_4_2_CoreBackend (0x0x7fba0bec2750) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf09ba0) 0 - -Class QOpenGLFunctions_4_3_CoreBackend::Functions - size=344 align=8 - base size=344 base align=8 -QOpenGLFunctions_4_3_CoreBackend::Functions (0x0x7fba0bf09d20) 0 - -Class QOpenGLFunctions_4_3_CoreBackend - size=360 align=8 - base size=360 base align=8 -QOpenGLFunctions_4_3_CoreBackend (0x0x7fba0bec27b8) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf09cc0) 0 - -Class QOpenGLFunctions_4_4_CoreBackend::Functions - size=72 align=8 - base size=72 base align=8 -QOpenGLFunctions_4_4_CoreBackend::Functions (0x0x7fba0bf09e40) 0 - -Class QOpenGLFunctions_4_4_CoreBackend - size=88 align=8 - base size=88 base align=8 -QOpenGLFunctions_4_4_CoreBackend (0x0x7fba0bec2820) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf09de0) 0 - -Class QOpenGLFunctions_4_5_CoreBackend::Functions - size=848 align=8 - base size=848 base align=8 -QOpenGLFunctions_4_5_CoreBackend::Functions (0x0x7fba0bc01000) 0 - -Class QOpenGLFunctions_4_5_CoreBackend - size=864 align=8 - base size=864 base align=8 -QOpenGLFunctions_4_5_CoreBackend (0x0x7fba0bec2888) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bf09f60) 0 - -Class QOpenGLFunctions_1_0_DeprecatedBackend::Functions - size=2064 align=8 - base size=2064 base align=8 -QOpenGLFunctions_1_0_DeprecatedBackend::Functions (0x0x7fba0bc01120) 0 - -Class QOpenGLFunctions_1_0_DeprecatedBackend - size=2080 align=8 - base size=2080 base align=8 -QOpenGLFunctions_1_0_DeprecatedBackend (0x0x7fba0bec28f0) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bc010c0) 0 - -Class QOpenGLFunctions_1_1_DeprecatedBackend::Functions - size=136 align=8 - base size=136 base align=8 -QOpenGLFunctions_1_1_DeprecatedBackend::Functions (0x0x7fba0bc01240) 0 - -Class QOpenGLFunctions_1_1_DeprecatedBackend - size=152 align=8 - base size=152 base align=8 -QOpenGLFunctions_1_1_DeprecatedBackend (0x0x7fba0bec2958) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bc011e0) 0 - -Class QOpenGLFunctions_1_2_DeprecatedBackend::Functions - size=256 align=8 - base size=256 base align=8 -QOpenGLFunctions_1_2_DeprecatedBackend::Functions (0x0x7fba0bc01360) 0 - -Class QOpenGLFunctions_1_2_DeprecatedBackend - size=272 align=8 - base size=272 base align=8 -QOpenGLFunctions_1_2_DeprecatedBackend (0x0x7fba0bec29c0) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bc01300) 0 - -Class QOpenGLFunctions_1_3_DeprecatedBackend::Functions - size=296 align=8 - base size=296 base align=8 -QOpenGLFunctions_1_3_DeprecatedBackend::Functions (0x0x7fba0bc01480) 0 - -Class QOpenGLFunctions_1_3_DeprecatedBackend - size=312 align=8 - base size=312 base align=8 -QOpenGLFunctions_1_3_DeprecatedBackend (0x0x7fba0bec2a28) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bc01420) 0 - -Class QOpenGLFunctions_1_4_DeprecatedBackend::Functions - size=304 align=8 - base size=304 base align=8 -QOpenGLFunctions_1_4_DeprecatedBackend::Functions (0x0x7fba0bc015a0) 0 - -Class QOpenGLFunctions_1_4_DeprecatedBackend - size=320 align=8 - base size=320 base align=8 -QOpenGLFunctions_1_4_DeprecatedBackend (0x0x7fba0bec2a90) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bc01540) 0 - -Class QOpenGLFunctions_2_0_DeprecatedBackend::Functions - size=288 align=8 - base size=288 base align=8 -QOpenGLFunctions_2_0_DeprecatedBackend::Functions (0x0x7fba0bc016c0) 0 - -Class QOpenGLFunctions_2_0_DeprecatedBackend - size=304 align=8 - base size=304 base align=8 -QOpenGLFunctions_2_0_DeprecatedBackend (0x0x7fba0bec2af8) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bc01660) 0 - -Class QOpenGLFunctions_3_0_DeprecatedBackend::Functions - size=160 align=8 - base size=160 base align=8 -QOpenGLFunctions_3_0_DeprecatedBackend::Functions (0x0x7fba0bc017e0) 0 - -Class QOpenGLFunctions_3_0_DeprecatedBackend - size=176 align=8 - base size=176 base align=8 -QOpenGLFunctions_3_0_DeprecatedBackend (0x0x7fba0bec2b60) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bc01780) 0 - -Class QOpenGLFunctions_3_3_DeprecatedBackend::Functions - size=240 align=8 - base size=240 base align=8 -QOpenGLFunctions_3_3_DeprecatedBackend::Functions (0x0x7fba0bc01900) 0 - -Class QOpenGLFunctions_3_3_DeprecatedBackend - size=256 align=8 - base size=256 base align=8 -QOpenGLFunctions_3_3_DeprecatedBackend (0x0x7fba0bec2bc8) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bc018a0) 0 - -Class QOpenGLFunctions_4_5_DeprecatedBackend::Functions - size=96 align=8 - base size=96 base align=8 -QOpenGLFunctions_4_5_DeprecatedBackend::Functions (0x0x7fba0bc01a20) 0 - -Class QOpenGLFunctions_4_5_DeprecatedBackend - size=112 align=8 - base size=112 base align=8 -QOpenGLFunctions_4_5_DeprecatedBackend (0x0x7fba0bec2c30) 0 - QOpenGLVersionFunctionsBackend (0x0x7fba0bc019c0) 0 - -Class QOpenGLVersionProfile - size=8 align=8 - base size=8 base align=8 -QOpenGLVersionProfile (0x0x7fba0bc01ae0) 0 - -Class QOpenGLContextGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLContextGroup::QPrivateSignal (0x0x7fba0bd0d4e0) 0 empty - -Vtable for QOpenGLContextGroup -QOpenGLContextGroup::_ZTV19QOpenGLContextGroup: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QOpenGLContextGroup) -16 (int (*)(...))QOpenGLContextGroup::metaObject -24 (int (*)(...))QOpenGLContextGroup::qt_metacast -32 (int (*)(...))QOpenGLContextGroup::qt_metacall -40 (int (*)(...))QOpenGLContextGroup::~QOpenGLContextGroup -48 (int (*)(...))QOpenGLContextGroup::~QOpenGLContextGroup -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLContextGroup - size=16 align=8 - base size=16 base align=8 -QOpenGLContextGroup (0x0x7fba0bd03680) 0 - vptr=((& QOpenGLContextGroup::_ZTV19QOpenGLContextGroup) + 16u) - QObject (0x0x7fba0bd0d480) 0 - primary-for QOpenGLContextGroup (0x0x7fba0bd03680) - -Class QOpenGLContext::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLContext::QPrivateSignal (0x0x7fba0bd0d5a0) 0 empty - -Vtable for QOpenGLContext -QOpenGLContext::_ZTV14QOpenGLContext: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QOpenGLContext) -16 (int (*)(...))QOpenGLContext::metaObject -24 (int (*)(...))QOpenGLContext::qt_metacast -32 (int (*)(...))QOpenGLContext::qt_metacall -40 (int (*)(...))QOpenGLContext::~QOpenGLContext -48 (int (*)(...))QOpenGLContext::~QOpenGLContext -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLContext - size=16 align=8 - base size=16 base align=8 -QOpenGLContext (0x0x7fba0bd036e8) 0 - vptr=((& QOpenGLContext::_ZTV14QOpenGLContext) + 16u) - QObject (0x0x7fba0bd0d540) 0 - primary-for QOpenGLContext (0x0x7fba0bd036e8) - -Class QOpenGLDebugMessage - size=8 align=8 - base size=8 base align=8 -QOpenGLDebugMessage (0x0x7fba0bd0d600) 0 - -Class QOpenGLDebugLogger::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLDebugLogger::QPrivateSignal (0x0x7fba0bd0dde0) 0 empty - -Vtable for QOpenGLDebugLogger -QOpenGLDebugLogger::_ZTV18QOpenGLDebugLogger: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QOpenGLDebugLogger) -16 (int (*)(...))QOpenGLDebugLogger::metaObject -24 (int (*)(...))QOpenGLDebugLogger::qt_metacast -32 (int (*)(...))QOpenGLDebugLogger::qt_metacall -40 (int (*)(...))QOpenGLDebugLogger::~QOpenGLDebugLogger -48 (int (*)(...))QOpenGLDebugLogger::~QOpenGLDebugLogger -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLDebugLogger - size=16 align=8 - base size=16 base align=8 -QOpenGLDebugLogger (0x0x7fba0bd03b60) 0 - vptr=((& QOpenGLDebugLogger::_ZTV18QOpenGLDebugLogger) + 16u) - QObject (0x0x7fba0bd0dd80) 0 - primary-for QOpenGLDebugLogger (0x0x7fba0bd03b60) - -Class QOpenGLFunctions - size=8 align=8 - base size=8 base align=8 -QOpenGLFunctions (0x0x7fba0bd0df60) 0 - -Class QOpenGLFunctionsPrivate::Functions - size=1152 align=8 - base size=1152 base align=8 -QOpenGLFunctionsPrivate::Functions (0x0x7fba0ba5b1e0) 0 - -Class QOpenGLFunctionsPrivate - size=1152 align=8 - base size=1152 base align=8 -QOpenGLFunctionsPrivate (0x0x7fba0ba5b180) 0 - -Class QOpenGLExtraFunctions - size=8 align=8 - base size=8 base align=8 -QOpenGLExtraFunctions (0x0x7fba0bd03dd0) 0 - QOpenGLFunctions (0x0x7fba0bb7f900) 0 - -Class QOpenGLExtraFunctionsPrivate::Functions - size=1728 align=8 - base size=1728 base align=8 -QOpenGLExtraFunctionsPrivate::Functions (0x0x7fba0bb7f9c0) 0 - -Class QOpenGLExtraFunctionsPrivate - size=2880 align=8 - base size=2880 base align=8 -QOpenGLExtraFunctionsPrivate (0x0x7fba0bd03e38) 0 - QOpenGLFunctionsPrivate (0x0x7fba0bb7f960) 0 - -Vtable for QOpenGLFramebufferObject -QOpenGLFramebufferObject::_ZTV24QOpenGLFramebufferObject: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QOpenGLFramebufferObject) -16 (int (*)(...))QOpenGLFramebufferObject::~QOpenGLFramebufferObject -24 (int (*)(...))QOpenGLFramebufferObject::~QOpenGLFramebufferObject - -Class QOpenGLFramebufferObject - size=16 align=8 - base size=16 base align=8 -QOpenGLFramebufferObject (0x0x7fba0b5e20c0) 0 - vptr=((& QOpenGLFramebufferObject::_ZTV24QOpenGLFramebufferObject) + 16u) - -Class QOpenGLFramebufferObjectFormat - size=8 align=8 - base size=8 base align=8 -QOpenGLFramebufferObjectFormat (0x0x7fba0b5e21e0) 0 - -Vtable for QOpenGLPaintDevice -QOpenGLPaintDevice::_ZTV18QOpenGLPaintDevice: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QOpenGLPaintDevice) -16 (int (*)(...))QOpenGLPaintDevice::~QOpenGLPaintDevice -24 (int (*)(...))QOpenGLPaintDevice::~QOpenGLPaintDevice -32 (int (*)(...))QOpenGLPaintDevice::devType -40 (int (*)(...))QOpenGLPaintDevice::paintEngine -48 (int (*)(...))QOpenGLPaintDevice::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter -80 (int (*)(...))QOpenGLPaintDevice::ensureActiveTarget - -Class QOpenGLPaintDevice - size=32 align=8 - base size=32 base align=8 -QOpenGLPaintDevice (0x0x7fba0b9b1138) 0 - vptr=((& QOpenGLPaintDevice::_ZTV18QOpenGLPaintDevice) + 16u) - QPaintDevice (0x0x7fba0b5e2240) 0 - primary-for QOpenGLPaintDevice (0x0x7fba0b9b1138) - -Class QOpenGLPixelTransferOptions - size=8 align=8 - base size=8 base align=8 -QOpenGLPixelTransferOptions (0x0x7fba0b5e2360) 0 - -Class QOpenGLShader::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLShader::QPrivateSignal (0x0x7fba0b5e26c0) 0 empty - -Vtable for QOpenGLShader -QOpenGLShader::_ZTV13QOpenGLShader: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QOpenGLShader) -16 (int (*)(...))QOpenGLShader::metaObject -24 (int (*)(...))QOpenGLShader::qt_metacast -32 (int (*)(...))QOpenGLShader::qt_metacall -40 (int (*)(...))QOpenGLShader::~QOpenGLShader -48 (int (*)(...))QOpenGLShader::~QOpenGLShader -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLShader - size=16 align=8 - base size=16 base align=8 -QOpenGLShader (0x0x7fba0b9b1340) 0 - vptr=((& QOpenGLShader::_ZTV13QOpenGLShader) + 16u) - QObject (0x0x7fba0b5e2660) 0 - primary-for QOpenGLShader (0x0x7fba0b9b1340) - -Class QOpenGLShaderProgram::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLShaderProgram::QPrivateSignal (0x0x7fba0b5e2900) 0 empty - -Vtable for QOpenGLShaderProgram -QOpenGLShaderProgram::_ZTV20QOpenGLShaderProgram: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QOpenGLShaderProgram) -16 (int (*)(...))QOpenGLShaderProgram::metaObject -24 (int (*)(...))QOpenGLShaderProgram::qt_metacast -32 (int (*)(...))QOpenGLShaderProgram::qt_metacall -40 (int (*)(...))QOpenGLShaderProgram::~QOpenGLShaderProgram -48 (int (*)(...))QOpenGLShaderProgram::~QOpenGLShaderProgram -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QOpenGLShaderProgram::link - -Class QOpenGLShaderProgram - size=16 align=8 - base size=16 base align=8 -QOpenGLShaderProgram (0x0x7fba0b9b1478) 0 - vptr=((& QOpenGLShaderProgram::_ZTV20QOpenGLShaderProgram) + 16u) - QObject (0x0x7fba0b5e28a0) 0 - primary-for QOpenGLShaderProgram (0x0x7fba0b9b1478) - -Class QOpenGLTexture - size=8 align=8 - base size=8 base align=8 -QOpenGLTexture (0x0x7fba0b5e2960) 0 - -Class QOpenGLTextureBlitter - size=8 align=8 - base size=8 base align=8 -QOpenGLTextureBlitter (0x0x7fba0b5e2c00) 0 - -Class QOpenGLTimerQuery::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLTimerQuery::QPrivateSignal (0x0x7fba0b5e2d80) 0 empty - -Vtable for QOpenGLTimerQuery -QOpenGLTimerQuery::_ZTV17QOpenGLTimerQuery: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QOpenGLTimerQuery) -16 (int (*)(...))QOpenGLTimerQuery::metaObject -24 (int (*)(...))QOpenGLTimerQuery::qt_metacast -32 (int (*)(...))QOpenGLTimerQuery::qt_metacall -40 (int (*)(...))QOpenGLTimerQuery::~QOpenGLTimerQuery -48 (int (*)(...))QOpenGLTimerQuery::~QOpenGLTimerQuery -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLTimerQuery - size=16 align=8 - base size=16 base align=8 -QOpenGLTimerQuery (0x0x7fba0b9b15b0) 0 - vptr=((& QOpenGLTimerQuery::_ZTV17QOpenGLTimerQuery) + 16u) - QObject (0x0x7fba0b5e2d20) 0 - primary-for QOpenGLTimerQuery (0x0x7fba0b9b15b0) - -Class QOpenGLTimeMonitor::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLTimeMonitor::QPrivateSignal (0x0x7fba0b5e2e40) 0 empty - -Vtable for QOpenGLTimeMonitor -QOpenGLTimeMonitor::_ZTV18QOpenGLTimeMonitor: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QOpenGLTimeMonitor) -16 (int (*)(...))QOpenGLTimeMonitor::metaObject -24 (int (*)(...))QOpenGLTimeMonitor::qt_metacast -32 (int (*)(...))QOpenGLTimeMonitor::qt_metacall -40 (int (*)(...))QOpenGLTimeMonitor::~QOpenGLTimeMonitor -48 (int (*)(...))QOpenGLTimeMonitor::~QOpenGLTimeMonitor -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLTimeMonitor - size=16 align=8 - base size=16 base align=8 -QOpenGLTimeMonitor (0x0x7fba0b9b1618) 0 - vptr=((& QOpenGLTimeMonitor::_ZTV18QOpenGLTimeMonitor) + 16u) - QObject (0x0x7fba0b5e2de0) 0 - primary-for QOpenGLTimeMonitor (0x0x7fba0b9b1618) - -Class QOpenGLVertexArrayObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLVertexArrayObject::QPrivateSignal (0x0x7fba0b5e2f00) 0 empty - -Class QOpenGLVertexArrayObject::Binder - size=8 align=8 - base size=8 base align=8 -QOpenGLVertexArrayObject::Binder (0x0x7fba0b5e2f60) 0 - -Vtable for QOpenGLVertexArrayObject -QOpenGLVertexArrayObject::_ZTV24QOpenGLVertexArrayObject: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QOpenGLVertexArrayObject) -16 (int (*)(...))QOpenGLVertexArrayObject::metaObject -24 (int (*)(...))QOpenGLVertexArrayObject::qt_metacast -32 (int (*)(...))QOpenGLVertexArrayObject::qt_metacall -40 (int (*)(...))QOpenGLVertexArrayObject::~QOpenGLVertexArrayObject -48 (int (*)(...))QOpenGLVertexArrayObject::~QOpenGLVertexArrayObject -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLVertexArrayObject - size=16 align=8 - base size=16 base align=8 -QOpenGLVertexArrayObject (0x0x7fba0b9b1680) 0 - vptr=((& QOpenGLVertexArrayObject::_ZTV24QOpenGLVertexArrayObject) + 16u) - QObject (0x0x7fba0b5e2ea0) 0 - primary-for QOpenGLVertexArrayObject (0x0x7fba0b9b1680) - -Class QPaintDeviceWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPaintDeviceWindow::QPrivateSignal (0x0x7fba0b7b7120) 0 empty - -Vtable for QPaintDeviceWindow -QPaintDeviceWindow::_ZTV18QPaintDeviceWindow: 58u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QPaintDeviceWindow) -16 (int (*)(...))QPaintDeviceWindow::metaObject -24 (int (*)(...))QPaintDeviceWindow::qt_metacast -32 (int (*)(...))QPaintDeviceWindow::qt_metacall -40 (int (*)(...))QPaintDeviceWindow::~QPaintDeviceWindow -48 (int (*)(...))QPaintDeviceWindow::~QPaintDeviceWindow -56 (int (*)(...))QPaintDeviceWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QPaintDeviceWindow::exposeEvent -160 (int (*)(...))QWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))QPaintDeviceWindow::paintEvent -304 (int (*)(...))QPaintDeviceWindow::metric -312 (int (*)(...))QPaintDeviceWindow::paintEngine -320 (int (*)(...))-16 -328 (int (*)(...))(& _ZTI18QPaintDeviceWindow) -336 (int (*)(...))QPaintDeviceWindow::_ZThn16_N18QPaintDeviceWindowD1Ev -344 (int (*)(...))QPaintDeviceWindow::_ZThn16_N18QPaintDeviceWindowD0Ev -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -360 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -368 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -376 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv -384 (int (*)(...))-40 -392 (int (*)(...))(& _ZTI18QPaintDeviceWindow) -400 (int (*)(...))QPaintDeviceWindow::_ZThn40_N18QPaintDeviceWindowD1Ev -408 (int (*)(...))QPaintDeviceWindow::_ZThn40_N18QPaintDeviceWindowD0Ev -416 (int (*)(...))QPaintDevice::devType -424 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow11paintEngineEv -432 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow6metricEN12QPaintDevice17PaintDeviceMetricE -440 (int (*)(...))QPaintDevice::initPainter -448 (int (*)(...))QPaintDevice::redirected -456 (int (*)(...))QPaintDevice::sharedPainter - -Class QPaintDeviceWindow - size=64 align=8 - base size=64 base align=8 -QPaintDeviceWindow (0x0x7fba0b7b0850) 0 - vptr=((& QPaintDeviceWindow::_ZTV18QPaintDeviceWindow) + 16u) - QWindow (0x0x7fba0b7b08c0) 0 - primary-for QPaintDeviceWindow (0x0x7fba0b7b0850) - QObject (0x0x7fba0b7b7000) 0 - primary-for QWindow (0x0x7fba0b7b08c0) - QSurface (0x0x7fba0b7b7060) 16 - vptr=((& QPaintDeviceWindow::_ZTV18QPaintDeviceWindow) + 336u) - QPaintDevice (0x0x7fba0b7b70c0) 40 - vptr=((& QPaintDeviceWindow::_ZTV18QPaintDeviceWindow) + 400u) - -Class QOpenGLWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLWindow::QPrivateSignal (0x0x7fba0b7b72a0) 0 empty - -Vtable for QOpenGLWindow -QOpenGLWindow::_ZTV13QOpenGLWindow: 64u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QOpenGLWindow) -16 (int (*)(...))QOpenGLWindow::metaObject -24 (int (*)(...))QOpenGLWindow::qt_metacast -32 (int (*)(...))QOpenGLWindow::qt_metacall -40 (int (*)(...))QOpenGLWindow::~QOpenGLWindow -48 (int (*)(...))QOpenGLWindow::~QOpenGLWindow -56 (int (*)(...))QPaintDeviceWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QPaintDeviceWindow::exposeEvent -160 (int (*)(...))QOpenGLWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))QOpenGLWindow::paintEvent -304 (int (*)(...))QOpenGLWindow::metric -312 (int (*)(...))QPaintDeviceWindow::paintEngine -320 (int (*)(...))QOpenGLWindow::initializeGL -328 (int (*)(...))QOpenGLWindow::resizeGL -336 (int (*)(...))QOpenGLWindow::paintGL -344 (int (*)(...))QOpenGLWindow::paintUnderGL -352 (int (*)(...))QOpenGLWindow::paintOverGL -360 (int (*)(...))QOpenGLWindow::redirected -368 (int (*)(...))-16 -376 (int (*)(...))(& _ZTI13QOpenGLWindow) -384 (int (*)(...))QOpenGLWindow::_ZThn16_N13QOpenGLWindowD1Ev -392 (int (*)(...))QOpenGLWindow::_ZThn16_N13QOpenGLWindowD0Ev -400 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -408 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -416 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -424 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv -432 (int (*)(...))-40 -440 (int (*)(...))(& _ZTI13QOpenGLWindow) -448 (int (*)(...))QOpenGLWindow::_ZThn40_N13QOpenGLWindowD1Ev -456 (int (*)(...))QOpenGLWindow::_ZThn40_N13QOpenGLWindowD0Ev -464 (int (*)(...))QPaintDevice::devType -472 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow11paintEngineEv -480 (int (*)(...))QOpenGLWindow::_ZThn40_NK13QOpenGLWindow6metricEN12QPaintDevice17PaintDeviceMetricE -488 (int (*)(...))QPaintDevice::initPainter -496 (int (*)(...))QOpenGLWindow::_ZThn40_NK13QOpenGLWindow10redirectedEP6QPoint -504 (int (*)(...))QPaintDevice::sharedPainter - -Class QOpenGLWindow - size=64 align=8 - base size=64 base align=8 -QOpenGLWindow (0x0x7fba0b9b1750) 0 - vptr=((& QOpenGLWindow::_ZTV13QOpenGLWindow) + 16u) - QPaintDeviceWindow (0x0x7fba0b7b0e00) 0 - primary-for QOpenGLWindow (0x0x7fba0b9b1750) - QWindow (0x0x7fba0b7b0e70) 0 - primary-for QPaintDeviceWindow (0x0x7fba0b7b0e00) - QObject (0x0x7fba0b7b7180) 0 - primary-for QWindow (0x0x7fba0b7b0e70) - QSurface (0x0x7fba0b7b71e0) 16 - vptr=((& QOpenGLWindow::_ZTV13QOpenGLWindow) + 384u) - QPaintDevice (0x0x7fba0b7b7240) 40 - vptr=((& QOpenGLWindow::_ZTV13QOpenGLWindow) + 448u) - -Class QPageSize - size=8 align=8 - base size=8 base align=8 -QPageSize (0x0x7fba0b7b7300) 0 - -Class QPageLayout - size=8 align=8 - base size=8 base align=8 -QPageLayout (0x0x7fba0b7b7cc0) 0 - -Class QPagedPaintDevice::Margins - size=32 align=8 - base size=32 base align=8 -QPagedPaintDevice::Margins (0x0x7fba0b45d720) 0 - -Vtable for QPagedPaintDevice -QPagedPaintDevice::_ZTV17QPagedPaintDevice: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QPagedPaintDevice) -16 0u -24 0u -32 (int (*)(...))QPaintDevice::devType -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QPaintDevice::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))QPagedPaintDevice::setPageSize -96 (int (*)(...))QPagedPaintDevice::setPageSizeMM -104 (int (*)(...))QPagedPaintDevice::setMargins - -Class QPagedPaintDevice - size=32 align=8 - base size=32 base align=8 -QPagedPaintDevice (0x0x7fba0b460478) 0 - vptr=((& QPagedPaintDevice::_ZTV17QPagedPaintDevice) + 16u) - QPaintDevice (0x0x7fba0b45d6c0) 0 - primary-for QPagedPaintDevice (0x0x7fba0b460478) - -Class QPainter::PixmapFragment - size=80 align=8 - base size=80 base align=8 -QPainter::PixmapFragment (0x0x7fba0b45d7e0) 0 - -Class QPainter - size=8 align=8 - base size=8 base align=8 -QPainter (0x0x7fba0b45d780) 0 - -Class QTextItem - size=1 align=1 - base size=0 base align=1 -QTextItem (0x0x7fba0b5bd600) 0 empty - -Vtable for QPaintEngine -QPaintEngine::_ZTV12QPaintEngine: 24u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QPaintEngine) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))QPaintEngine::drawRects -64 (int (*)(...))QPaintEngine::drawRects -72 (int (*)(...))QPaintEngine::drawLines -80 (int (*)(...))QPaintEngine::drawLines -88 (int (*)(...))QPaintEngine::drawEllipse -96 (int (*)(...))QPaintEngine::drawEllipse -104 (int (*)(...))QPaintEngine::drawPath -112 (int (*)(...))QPaintEngine::drawPoints -120 (int (*)(...))QPaintEngine::drawPoints -128 (int (*)(...))QPaintEngine::drawPolygon -136 (int (*)(...))QPaintEngine::drawPolygon -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QPaintEngine::drawTextItem -160 (int (*)(...))QPaintEngine::drawTiledPixmap -168 (int (*)(...))QPaintEngine::drawImage -176 (int (*)(...))QPaintEngine::coordinateOffset -184 (int (*)(...))__cxa_pure_virtual - -Class QPaintEngine - size=32 align=8 - base size=32 base align=8 -QPaintEngine (0x0x7fba0b5bd8a0) 0 - vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 16u) - -Class QPaintEngineState - size=4 align=4 - base size=4 base align=4 -QPaintEngineState (0x0x7fba0b5bdb40) 0 - -Class QPdfWriter::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPdfWriter::QPrivateSignal (0x0x7fba0b5bdf60) 0 empty - -Vtable for QPdfWriter -QPdfWriter::_ZTV10QPdfWriter: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QPdfWriter) -16 (int (*)(...))QPdfWriter::metaObject -24 (int (*)(...))QPdfWriter::qt_metacast -32 (int (*)(...))QPdfWriter::qt_metacall -40 (int (*)(...))QPdfWriter::~QPdfWriter -48 (int (*)(...))QPdfWriter::~QPdfWriter -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QPdfWriter::newPage -120 (int (*)(...))QPdfWriter::setPageSize -128 (int (*)(...))QPdfWriter::setPageSizeMM -136 (int (*)(...))QPdfWriter::setMargins -144 (int (*)(...))QPdfWriter::paintEngine -152 (int (*)(...))QPdfWriter::metric -160 (int (*)(...))-16 -168 (int (*)(...))(& _ZTI10QPdfWriter) -176 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriterD1Ev -184 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriterD0Ev -192 (int (*)(...))QPaintDevice::devType -200 (int (*)(...))QPdfWriter::_ZThn16_NK10QPdfWriter11paintEngineEv -208 (int (*)(...))QPdfWriter::_ZThn16_NK10QPdfWriter6metricEN12QPaintDevice17PaintDeviceMetricE -216 (int (*)(...))QPaintDevice::initPainter -224 (int (*)(...))QPaintDevice::redirected -232 (int (*)(...))QPaintDevice::sharedPainter -240 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter7newPageEv -248 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter11setPageSizeEN17QPagedPaintDevice8PageSizeE -256 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter13setPageSizeMMERK6QSizeF -264 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter10setMarginsERKN17QPagedPaintDevice7MarginsE - -Class QPdfWriter - size=48 align=8 - base size=48 base align=8 -QPdfWriter (0x0x7fba0b34d230) 0 - vptr=((& QPdfWriter::_ZTV10QPdfWriter) + 16u) - QObject (0x0x7fba0b5bdea0) 0 - primary-for QPdfWriter (0x0x7fba0b34d230) - QPagedPaintDevice (0x0x7fba0b26c4e0) 16 - vptr=((& QPdfWriter::_ZTV10QPdfWriter) + 176u) - QPaintDevice (0x0x7fba0b5bdf00) 16 - primary-for QPagedPaintDevice (0x0x7fba0b26c4e0) - -Vtable for QPicture -QPicture::_ZTV8QPicture: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QPicture) -16 (int (*)(...))QPicture::~QPicture -24 (int (*)(...))QPicture::~QPicture -32 (int (*)(...))QPicture::devType -40 (int (*)(...))QPicture::paintEngine -48 (int (*)(...))QPicture::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter -80 (int (*)(...))QPicture::setData - -Class QPicture - size=32 align=8 - base size=32 base align=8 -QPicture (0x0x7fba0b26c548) 0 - vptr=((& QPicture::_ZTV8QPicture) + 16u) - QPaintDevice (0x0x7fba0b36c120) 0 - primary-for QPicture (0x0x7fba0b26c548) - -Class QPictureIO - size=8 align=8 - base size=8 base align=8 -QPictureIO (0x0x7fba0b36c420) 0 - -Class QPictureFormatPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPictureFormatPlugin::QPrivateSignal (0x0x7fba0b36c4e0) 0 empty - -Vtable for QPictureFormatPlugin -QPictureFormatPlugin::_ZTV20QPictureFormatPlugin: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QPictureFormatPlugin) -16 (int (*)(...))QPictureFormatPlugin::metaObject -24 (int (*)(...))QPictureFormatPlugin::qt_metacast -32 (int (*)(...))QPictureFormatPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QPictureFormatPlugin::loadPicture -120 (int (*)(...))QPictureFormatPlugin::savePicture -128 (int (*)(...))__cxa_pure_virtual - -Class QPictureFormatPlugin - size=16 align=8 - base size=16 base align=8 -QPictureFormatPlugin (0x0x7fba0b26c750) 0 - vptr=((& QPictureFormatPlugin::_ZTV20QPictureFormatPlugin) + 16u) - QObject (0x0x7fba0b36c480) 0 - primary-for QPictureFormatPlugin (0x0x7fba0b26c750) - -Class QPixmapCache::Key - size=8 align=8 - base size=8 base align=8 -QPixmapCache::Key (0x0x7fba0b36c5a0) 0 - -Class QPixmapCache - size=1 align=1 - base size=0 base align=1 -QPixmapCache (0x0x7fba0b36c540) 0 empty - -Class QRasterWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QRasterWindow::QPrivateSignal (0x0x7fba0b028720) 0 empty - -Vtable for QRasterWindow -QRasterWindow::_ZTV13QRasterWindow: 59u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QRasterWindow) -16 (int (*)(...))QRasterWindow::metaObject -24 (int (*)(...))QRasterWindow::qt_metacast -32 (int (*)(...))QRasterWindow::qt_metacall -40 (int (*)(...))QRasterWindow::~QRasterWindow -48 (int (*)(...))QRasterWindow::~QRasterWindow -56 (int (*)(...))QPaintDeviceWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QPaintDeviceWindow::exposeEvent -160 (int (*)(...))QWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))QPaintDeviceWindow::paintEvent -304 (int (*)(...))QRasterWindow::metric -312 (int (*)(...))QPaintDeviceWindow::paintEngine -320 (int (*)(...))QRasterWindow::redirected -328 (int (*)(...))-16 -336 (int (*)(...))(& _ZTI13QRasterWindow) -344 (int (*)(...))QRasterWindow::_ZThn16_N13QRasterWindowD1Ev -352 (int (*)(...))QRasterWindow::_ZThn16_N13QRasterWindowD0Ev -360 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -368 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -376 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -384 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv -392 (int (*)(...))-40 -400 (int (*)(...))(& _ZTI13QRasterWindow) -408 (int (*)(...))QRasterWindow::_ZThn40_N13QRasterWindowD1Ev -416 (int (*)(...))QRasterWindow::_ZThn40_N13QRasterWindowD0Ev -424 (int (*)(...))QPaintDevice::devType -432 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow11paintEngineEv -440 (int (*)(...))QRasterWindow::_ZThn40_NK13QRasterWindow6metricEN12QPaintDevice17PaintDeviceMetricE -448 (int (*)(...))QPaintDevice::initPainter -456 (int (*)(...))QRasterWindow::_ZThn40_NK13QRasterWindow10redirectedEP6QPoint -464 (int (*)(...))QPaintDevice::sharedPainter - -Class QRasterWindow - size=64 align=8 - base size=64 base align=8 -QRasterWindow (0x0x7fba0b020e38) 0 - vptr=((& QRasterWindow::_ZTV13QRasterWindow) + 16u) - QPaintDeviceWindow (0x0x7fba0b02d930) 0 - primary-for QRasterWindow (0x0x7fba0b020e38) - QWindow (0x0x7fba0b02d9a0) 0 - primary-for QPaintDeviceWindow (0x0x7fba0b02d930) - QObject (0x0x7fba0b028600) 0 - primary-for QWindow (0x0x7fba0b02d9a0) - QSurface (0x0x7fba0b028660) 16 - vptr=((& QRasterWindow::_ZTV13QRasterWindow) + 344u) - QPaintDevice (0x0x7fba0b0286c0) 40 - vptr=((& QRasterWindow::_ZTV13QRasterWindow) + 408u) - -Class QScreen::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QScreen::QPrivateSignal (0x0x7fba0b0287e0) 0 empty - -Vtable for QScreen -QScreen::_ZTV7QScreen: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QScreen) -16 (int (*)(...))QScreen::metaObject -24 (int (*)(...))QScreen::qt_metacast -32 (int (*)(...))QScreen::qt_metacall -40 (int (*)(...))QScreen::~QScreen -48 (int (*)(...))QScreen::~QScreen -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QScreen - size=16 align=8 - base size=16 base align=8 -QScreen (0x0x7fba0b020f08) 0 - vptr=((& QScreen::_ZTV7QScreen) + 16u) - QObject (0x0x7fba0b028780) 0 - primary-for QScreen (0x0x7fba0b020f08) - -Class QSessionManager::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSessionManager::QPrivateSignal (0x0x7fba0b0288a0) 0 empty - -Vtable for QSessionManager -QSessionManager::_ZTV15QSessionManager: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QSessionManager) -16 (int (*)(...))QSessionManager::metaObject -24 (int (*)(...))QSessionManager::qt_metacast -32 (int (*)(...))QSessionManager::qt_metacall -40 (int (*)(...))QSessionManager::~QSessionManager -48 (int (*)(...))QSessionManager::~QSessionManager -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSessionManager - size=16 align=8 - base size=16 base align=8 -QSessionManager (0x0x7fba0b020f70) 0 - vptr=((& QSessionManager::_ZTV15QSessionManager) + 16u) - QObject (0x0x7fba0b028840) 0 - primary-for QSessionManager (0x0x7fba0b020f70) - -Vtable for QStandardItem -QStandardItem::_ZTV13QStandardItem: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QStandardItem) -16 (int (*)(...))QStandardItem::~QStandardItem -24 (int (*)(...))QStandardItem::~QStandardItem -32 (int (*)(...))QStandardItem::data -40 (int (*)(...))QStandardItem::setData -48 (int (*)(...))QStandardItem::clone -56 (int (*)(...))QStandardItem::type -64 (int (*)(...))QStandardItem::read -72 (int (*)(...))QStandardItem::write -80 (int (*)(...))QStandardItem::operator< - -Class QStandardItem - size=16 align=8 - base size=16 base align=8 -QStandardItem (0x0x7fba0b028900) 0 - vptr=((& QStandardItem::_ZTV13QStandardItem) + 16u) - -Class QStandardItemModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStandardItemModel::QPrivateSignal (0x0x7fba0b13c060) 0 empty - -Vtable for QStandardItemModel -QStandardItemModel::_ZTV18QStandardItemModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QStandardItemModel) -16 (int (*)(...))QStandardItemModel::metaObject -24 (int (*)(...))QStandardItemModel::qt_metacast -32 (int (*)(...))QStandardItemModel::qt_metacall -40 (int (*)(...))QStandardItemModel::~QStandardItemModel -48 (int (*)(...))QStandardItemModel::~QStandardItemModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QStandardItemModel::index -120 (int (*)(...))QStandardItemModel::parent -128 (int (*)(...))QStandardItemModel::sibling -136 (int (*)(...))QStandardItemModel::rowCount -144 (int (*)(...))QStandardItemModel::columnCount -152 (int (*)(...))QStandardItemModel::hasChildren -160 (int (*)(...))QStandardItemModel::data -168 (int (*)(...))QStandardItemModel::setData -176 (int (*)(...))QStandardItemModel::headerData -184 (int (*)(...))QStandardItemModel::setHeaderData -192 (int (*)(...))QStandardItemModel::itemData -200 (int (*)(...))QStandardItemModel::setItemData -208 (int (*)(...))QStandardItemModel::mimeTypes -216 (int (*)(...))QStandardItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QStandardItemModel::dropMimeData -240 (int (*)(...))QStandardItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QStandardItemModel::insertRows -264 (int (*)(...))QStandardItemModel::insertColumns -272 (int (*)(...))QStandardItemModel::removeRows -280 (int (*)(...))QStandardItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QStandardItemModel::flags -328 (int (*)(...))QStandardItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QStandardItemModel - size=16 align=8 - base size=16 base align=8 -QStandardItemModel (0x0x7fba0b0b8618) 0 - vptr=((& QStandardItemModel::_ZTV18QStandardItemModel) + 16u) - QAbstractItemModel (0x0x7fba0b0b8680) 0 - primary-for QStandardItemModel (0x0x7fba0b0b8618) - QObject (0x0x7fba0b13c000) 0 - primary-for QAbstractItemModel (0x0x7fba0b0b8680) - -Class QStaticText - size=8 align=8 - base size=8 base align=8 -QStaticText (0x0x7fba0b13c0c0) 0 - -Class QStyleHints::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStyleHints::QPrivateSignal (0x0x7fba0b13c540) 0 empty - -Vtable for QStyleHints -QStyleHints::_ZTV11QStyleHints: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QStyleHints) -16 (int (*)(...))QStyleHints::metaObject -24 (int (*)(...))QStyleHints::qt_metacast -32 (int (*)(...))QStyleHints::qt_metacall -40 (int (*)(...))QStyleHints::~QStyleHints -48 (int (*)(...))QStyleHints::~QStyleHints -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QStyleHints - size=16 align=8 - base size=16 base align=8 -QStyleHints (0x0x7fba0b0b8888) 0 - vptr=((& QStyleHints::_ZTV11QStyleHints) + 16u) - QObject (0x0x7fba0b13c4e0) 0 - primary-for QStyleHints (0x0x7fba0b0b8888) - -Class QTextObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextObject::QPrivateSignal (0x0x7fba0b13c600) 0 empty - -Vtable for QTextObject -QTextObject::_ZTV11QTextObject: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTextObject) -16 (int (*)(...))QTextObject::metaObject -24 (int (*)(...))QTextObject::qt_metacast -32 (int (*)(...))QTextObject::qt_metacall -40 (int (*)(...))QTextObject::~QTextObject -48 (int (*)(...))QTextObject::~QTextObject -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTextObject - size=16 align=8 - base size=16 base align=8 -QTextObject (0x0x7fba0b0b88f0) 0 - vptr=((& QTextObject::_ZTV11QTextObject) + 16u) - QObject (0x0x7fba0b13c5a0) 0 - primary-for QTextObject (0x0x7fba0b0b88f0) - -Class QTextBlockGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextBlockGroup::QPrivateSignal (0x0x7fba0b13c6c0) 0 empty - -Vtable for QTextBlockGroup -QTextBlockGroup::_ZTV15QTextBlockGroup: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QTextBlockGroup) -16 (int (*)(...))QTextBlockGroup::metaObject -24 (int (*)(...))QTextBlockGroup::qt_metacast -32 (int (*)(...))QTextBlockGroup::qt_metacall -40 (int (*)(...))QTextBlockGroup::~QTextBlockGroup -48 (int (*)(...))QTextBlockGroup::~QTextBlockGroup -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTextBlockGroup::blockInserted -120 (int (*)(...))QTextBlockGroup::blockRemoved -128 (int (*)(...))QTextBlockGroup::blockFormatChanged - -Class QTextBlockGroup - size=16 align=8 - base size=16 base align=8 -QTextBlockGroup (0x0x7fba0b0b8958) 0 - vptr=((& QTextBlockGroup::_ZTV15QTextBlockGroup) + 16u) - QTextObject (0x0x7fba0b0b89c0) 0 - primary-for QTextBlockGroup (0x0x7fba0b0b8958) - QObject (0x0x7fba0b13c660) 0 - primary-for QTextObject (0x0x7fba0b0b89c0) - -Vtable for QTextFrameLayoutData -QTextFrameLayoutData::_ZTV20QTextFrameLayoutData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QTextFrameLayoutData) -16 (int (*)(...))QTextFrameLayoutData::~QTextFrameLayoutData -24 (int (*)(...))QTextFrameLayoutData::~QTextFrameLayoutData - -Class QTextFrameLayoutData - size=8 align=8 - base size=8 base align=8 -QTextFrameLayoutData (0x0x7fba0b13c720) 0 nearly-empty - vptr=((& QTextFrameLayoutData::_ZTV20QTextFrameLayoutData) + 16u) - -Class QTextFrame::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextFrame::QPrivateSignal (0x0x7fba0b13c7e0) 0 empty - -Class QTextFrame::iterator - size=32 align=8 - base size=28 base align=8 -QTextFrame::iterator (0x0x7fba0b13c840) 0 - -Vtable for QTextFrame -QTextFrame::_ZTV10QTextFrame: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTextFrame) -16 (int (*)(...))QTextFrame::metaObject -24 (int (*)(...))QTextFrame::qt_metacast -32 (int (*)(...))QTextFrame::qt_metacall -40 (int (*)(...))QTextFrame::~QTextFrame -48 (int (*)(...))QTextFrame::~QTextFrame -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTextFrame - size=16 align=8 - base size=16 base align=8 -QTextFrame (0x0x7fba0b0b8a28) 0 - vptr=((& QTextFrame::_ZTV10QTextFrame) + 16u) - QTextObject (0x0x7fba0b0b8a90) 0 - primary-for QTextFrame (0x0x7fba0b0b8a28) - QObject (0x0x7fba0b13c780) 0 - primary-for QTextObject (0x0x7fba0b0b8a90) - -Vtable for QTextBlockUserData -QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QTextBlockUserData) -16 (int (*)(...))QTextBlockUserData::~QTextBlockUserData -24 (int (*)(...))QTextBlockUserData::~QTextBlockUserData - -Class QTextBlockUserData - size=8 align=8 - base size=8 base align=8 -QTextBlockUserData (0x0x7fba0b13cae0) 0 nearly-empty - vptr=((& QTextBlockUserData::_ZTV18QTextBlockUserData) + 16u) - -Class QTextBlock::iterator - size=24 align=8 - base size=20 base align=8 -QTextBlock::iterator (0x0x7fba0b13cba0) 0 - -Class QTextBlock - size=16 align=8 - base size=12 base align=8 -QTextBlock (0x0x7fba0b13cb40) 0 - -Class QTextFragment - size=16 align=8 - base size=16 base align=8 -QTextFragment (0x0x7fba0ae2f0c0) 0 - -Class QSyntaxHighlighter::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSyntaxHighlighter::QPrivateSignal (0x0x7fba0ae2f3c0) 0 empty - -Vtable for QSyntaxHighlighter -QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QSyntaxHighlighter) -16 (int (*)(...))QSyntaxHighlighter::metaObject -24 (int (*)(...))QSyntaxHighlighter::qt_metacast -32 (int (*)(...))QSyntaxHighlighter::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QSyntaxHighlighter - size=16 align=8 - base size=16 base align=8 -QSyntaxHighlighter (0x0x7fba0ae451a0) 0 - vptr=((& QSyntaxHighlighter::_ZTV18QSyntaxHighlighter) + 16u) - QObject (0x0x7fba0ae2f360) 0 - primary-for QSyntaxHighlighter (0x0x7fba0ae451a0) - -Class QTextDocumentFragment - size=8 align=8 - base size=8 base align=8 -QTextDocumentFragment (0x0x7fba0ae2f420) 0 - -Class QTextDocumentWriter - size=8 align=8 - base size=8 base align=8 -QTextDocumentWriter (0x0x7fba0ae2f480) 0 - -Class QTextList::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextList::QPrivateSignal (0x0x7fba0ae2f540) 0 empty - -Vtable for QTextList -QTextList::_ZTV9QTextList: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QTextList) -16 (int (*)(...))QTextList::metaObject -24 (int (*)(...))QTextList::qt_metacast -32 (int (*)(...))QTextList::qt_metacall -40 (int (*)(...))QTextList::~QTextList -48 (int (*)(...))QTextList::~QTextList -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTextBlockGroup::blockInserted -120 (int (*)(...))QTextBlockGroup::blockRemoved -128 (int (*)(...))QTextBlockGroup::blockFormatChanged - -Class QTextList - size=16 align=8 - base size=16 base align=8 -QTextList (0x0x7fba0ae45208) 0 - vptr=((& QTextList::_ZTV9QTextList) + 16u) - QTextBlockGroup (0x0x7fba0ae45270) 0 - primary-for QTextList (0x0x7fba0ae45208) - QTextObject (0x0x7fba0ae452d8) 0 - primary-for QTextBlockGroup (0x0x7fba0ae45270) - QObject (0x0x7fba0ae2f4e0) 0 - primary-for QTextObject (0x0x7fba0ae452d8) - -Class QTextTableCell - size=16 align=8 - base size=12 base align=8 -QTextTableCell (0x0x7fba0ae2f5a0) 0 - -Class QTextTable::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextTable::QPrivateSignal (0x0x7fba0ae2f660) 0 empty - -Vtable for QTextTable -QTextTable::_ZTV10QTextTable: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTextTable) -16 (int (*)(...))QTextTable::metaObject -24 (int (*)(...))QTextTable::qt_metacast -32 (int (*)(...))QTextTable::qt_metacall -40 (int (*)(...))QTextTable::~QTextTable -48 (int (*)(...))QTextTable::~QTextTable -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTextTable - size=16 align=8 - base size=16 base align=8 -QTextTable (0x0x7fba0ae45340) 0 - vptr=((& QTextTable::_ZTV10QTextTable) + 16u) - QTextFrame (0x0x7fba0ae453a8) 0 - primary-for QTextTable (0x0x7fba0ae45340) - QTextObject (0x0x7fba0ae45410) 0 - primary-for QTextFrame (0x0x7fba0ae453a8) - QObject (0x0x7fba0ae2f600) 0 - primary-for QTextObject (0x0x7fba0ae45410) - -Class QValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QValidator::QPrivateSignal (0x0x7fba0ae2f720) 0 empty - -Vtable for QValidator -QValidator::_ZTV10QValidator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QValidator) -16 (int (*)(...))QValidator::metaObject -24 (int (*)(...))QValidator::qt_metacast -32 (int (*)(...))QValidator::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QValidator::fixup - -Class QValidator - size=16 align=8 - base size=16 base align=8 -QValidator (0x0x7fba0ae45478) 0 - vptr=((& QValidator::_ZTV10QValidator) + 16u) - QObject (0x0x7fba0ae2f6c0) 0 - primary-for QValidator (0x0x7fba0ae45478) - -Class QIntValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIntValidator::QPrivateSignal (0x0x7fba0ae2f7e0) 0 empty - -Vtable for QIntValidator -QIntValidator::_ZTV13QIntValidator: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QIntValidator) -16 (int (*)(...))QIntValidator::metaObject -24 (int (*)(...))QIntValidator::qt_metacast -32 (int (*)(...))QIntValidator::qt_metacall -40 (int (*)(...))QIntValidator::~QIntValidator -48 (int (*)(...))QIntValidator::~QIntValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QIntValidator::validate -120 (int (*)(...))QIntValidator::fixup -128 (int (*)(...))QIntValidator::setRange - -Class QIntValidator - size=24 align=8 - base size=24 base align=8 -QIntValidator (0x0x7fba0ae454e0) 0 - vptr=((& QIntValidator::_ZTV13QIntValidator) + 16u) - QValidator (0x0x7fba0ae45548) 0 - primary-for QIntValidator (0x0x7fba0ae454e0) - QObject (0x0x7fba0ae2f780) 0 - primary-for QValidator (0x0x7fba0ae45548) - -Class QDoubleValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QDoubleValidator::QPrivateSignal (0x0x7fba0ae2f8a0) 0 empty - -Vtable for QDoubleValidator -QDoubleValidator::_ZTV16QDoubleValidator: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QDoubleValidator) -16 (int (*)(...))QDoubleValidator::metaObject -24 (int (*)(...))QDoubleValidator::qt_metacast -32 (int (*)(...))QDoubleValidator::qt_metacall -40 (int (*)(...))QDoubleValidator::~QDoubleValidator -48 (int (*)(...))QDoubleValidator::~QDoubleValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QDoubleValidator::validate -120 (int (*)(...))QValidator::fixup -128 (int (*)(...))QDoubleValidator::setRange - -Class QDoubleValidator - size=40 align=8 - base size=36 base align=8 -QDoubleValidator (0x0x7fba0ae455b0) 0 - vptr=((& QDoubleValidator::_ZTV16QDoubleValidator) + 16u) - QValidator (0x0x7fba0ae45618) 0 - primary-for QDoubleValidator (0x0x7fba0ae455b0) - QObject (0x0x7fba0ae2f840) 0 - primary-for QValidator (0x0x7fba0ae45618) - -Class QRegExpValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QRegExpValidator::QPrivateSignal (0x0x7fba0ae2f9c0) 0 empty - -Vtable for QRegExpValidator -QRegExpValidator::_ZTV16QRegExpValidator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QRegExpValidator) -16 (int (*)(...))QRegExpValidator::metaObject -24 (int (*)(...))QRegExpValidator::qt_metacast -32 (int (*)(...))QRegExpValidator::qt_metacall -40 (int (*)(...))QRegExpValidator::~QRegExpValidator -48 (int (*)(...))QRegExpValidator::~QRegExpValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QRegExpValidator::validate -120 (int (*)(...))QValidator::fixup - -Class QRegExpValidator - size=24 align=8 - base size=24 base align=8 -QRegExpValidator (0x0x7fba0ae45680) 0 - vptr=((& QRegExpValidator::_ZTV16QRegExpValidator) + 16u) - QValidator (0x0x7fba0ae456e8) 0 - primary-for QRegExpValidator (0x0x7fba0ae45680) - QObject (0x0x7fba0ae2f960) 0 - primary-for QValidator (0x0x7fba0ae456e8) - -Class QRegularExpressionValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QRegularExpressionValidator::QPrivateSignal (0x0x7fba0ae2fa80) 0 empty - -Vtable for QRegularExpressionValidator -QRegularExpressionValidator::_ZTV27QRegularExpressionValidator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QRegularExpressionValidator) -16 (int (*)(...))QRegularExpressionValidator::metaObject -24 (int (*)(...))QRegularExpressionValidator::qt_metacast -32 (int (*)(...))QRegularExpressionValidator::qt_metacall -40 (int (*)(...))QRegularExpressionValidator::~QRegularExpressionValidator -48 (int (*)(...))QRegularExpressionValidator::~QRegularExpressionValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QRegularExpressionValidator::validate -120 (int (*)(...))QValidator::fixup - -Class QRegularExpressionValidator - size=16 align=8 - base size=16 base align=8 -QRegularExpressionValidator (0x0x7fba0ae45750) 0 - vptr=((& QRegularExpressionValidator::_ZTV27QRegularExpressionValidator) + 16u) - QValidator (0x0x7fba0ae457b8) 0 - primary-for QRegularExpressionValidator (0x0x7fba0ae45750) - QObject (0x0x7fba0ae2fa20) 0 - primary-for QValidator (0x0x7fba0ae457b8) - -Class QNetworkRequest - size=8 align=8 - base size=8 base align=8 -QNetworkRequest (0x0x7fba0ae2fae0) 0 - -Class QNetworkCacheMetaData - size=8 align=8 - base size=8 base align=8 -QNetworkCacheMetaData (0x0x7fba0af2b060) 0 - -Class QAbstractNetworkCache::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractNetworkCache::QPrivateSignal (0x0x7fba0af2b720) 0 empty - -Vtable for QAbstractNetworkCache -QAbstractNetworkCache::_ZTV21QAbstractNetworkCache: 22u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QAbstractNetworkCache) -16 (int (*)(...))QAbstractNetworkCache::metaObject -24 (int (*)(...))QAbstractNetworkCache::qt_metacast -32 (int (*)(...))QAbstractNetworkCache::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))__cxa_pure_virtual - -Class QAbstractNetworkCache - size=16 align=8 - base size=16 base align=8 -QAbstractNetworkCache (0x0x7fba0af57000) 0 - vptr=((& QAbstractNetworkCache::_ZTV21QAbstractNetworkCache) + 16u) - QObject (0x0x7fba0af2b6c0) 0 - primary-for QAbstractNetworkCache (0x0x7fba0af57000) - -Class QAbstractSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractSocket::QPrivateSignal (0x0x7fba0af2b7e0) 0 empty - -Vtable for QAbstractSocket -QAbstractSocket::_ZTV15QAbstractSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QAbstractSocket) -16 (int (*)(...))QAbstractSocket::metaObject -24 (int (*)(...))QAbstractSocket::qt_metacast -32 (int (*)(...))QAbstractSocket::qt_metacall -40 (int (*)(...))QAbstractSocket::~QAbstractSocket -48 (int (*)(...))QAbstractSocket::~QAbstractSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QAbstractSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QAbstractSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QAbstractSocket::bytesAvailable -184 (int (*)(...))QAbstractSocket::bytesToWrite -192 (int (*)(...))QAbstractSocket::canReadLine -200 (int (*)(...))QAbstractSocket::waitForReadyRead -208 (int (*)(...))QAbstractSocket::waitForBytesWritten -216 (int (*)(...))QAbstractSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QAbstractSocket::writeData -240 (int (*)(...))QAbstractSocket::resume -248 (int (*)(...))QAbstractSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QAbstractSocket::disconnectFromHost -272 (int (*)(...))QAbstractSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QAbstractSocket::setSocketDescriptor -296 (int (*)(...))QAbstractSocket::setSocketOption -304 (int (*)(...))QAbstractSocket::socketOption -312 (int (*)(...))QAbstractSocket::waitForConnected -320 (int (*)(...))QAbstractSocket::waitForDisconnected - -Class QAbstractSocket - size=16 align=8 - base size=16 base align=8 -QAbstractSocket (0x0x7fba0af57068) 0 - vptr=((& QAbstractSocket::_ZTV15QAbstractSocket) + 16u) - QIODevice (0x0x7fba0af570d0) 0 - primary-for QAbstractSocket (0x0x7fba0af57068) - QObject (0x0x7fba0af2b780) 0 - primary-for QIODevice (0x0x7fba0af570d0) - -Class QAuthenticator - size=8 align=8 - base size=8 base align=8 -QAuthenticator (0x0x7fba0af2bd80) 0 - -Class QDnsDomainNameRecord - size=8 align=8 - base size=8 base align=8 -QDnsDomainNameRecord (0x0x7fba0af2bde0) 0 - -Class QDnsHostAddressRecord - size=8 align=8 - base size=8 base align=8 -QDnsHostAddressRecord (0x0x7fba0ac2f120) 0 - -Class QDnsMailExchangeRecord - size=8 align=8 - base size=8 base align=8 -QDnsMailExchangeRecord (0x0x7fba0ac2f420) 0 - -Class QDnsServiceRecord - size=8 align=8 - base size=8 base align=8 -QDnsServiceRecord (0x0x7fba0ac2f720) 0 - -Class QDnsTextRecord - size=8 align=8 - base size=8 base align=8 -QDnsTextRecord (0x0x7fba0ac2fa20) 0 - -Class QDnsLookup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QDnsLookup::QPrivateSignal (0x0x7fba0ac2fd80) 0 empty - -Vtable for QDnsLookup -QDnsLookup::_ZTV10QDnsLookup: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QDnsLookup) -16 (int (*)(...))QDnsLookup::metaObject -24 (int (*)(...))QDnsLookup::qt_metacast -32 (int (*)(...))QDnsLookup::qt_metacall -40 (int (*)(...))QDnsLookup::~QDnsLookup -48 (int (*)(...))QDnsLookup::~QDnsLookup -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QDnsLookup - size=16 align=8 - base size=16 base align=8 -QDnsLookup (0x0x7fba0af57af8) 0 - vptr=((& QDnsLookup::_ZTV10QDnsLookup) + 16u) - QObject (0x0x7fba0ac2fd20) 0 - primary-for QDnsLookup (0x0x7fba0af57af8) - -Class QIPv6Address - size=16 align=1 - base size=16 base align=1 -QIPv6Address (0x0x7fba0ac2fde0) 0 - -Class QHostAddress - size=8 align=8 - base size=8 base align=8 -QHostAddress (0x0x7fba0ac2fe40) 0 - -Class QHostInfo - size=8 align=8 - base size=8 base align=8 -QHostInfo (0x0x7fba0acdb660) 0 - -Class QHstsPolicy - size=8 align=8 - base size=8 base align=8 -QHstsPolicy (0x0x7fba0acdbb40) 0 - -Class QHttpPart - size=8 align=8 - base size=8 base align=8 -QHttpPart (0x0x7fba0ada8360) 0 - -Class QHttpMultiPart::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QHttpMultiPart::QPrivateSignal (0x0x7fba0ada86c0) 0 empty - -Vtable for QHttpMultiPart -QHttpMultiPart::_ZTV14QHttpMultiPart: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QHttpMultiPart) -16 (int (*)(...))QHttpMultiPart::metaObject -24 (int (*)(...))QHttpMultiPart::qt_metacast -32 (int (*)(...))QHttpMultiPart::qt_metacall -40 (int (*)(...))QHttpMultiPart::~QHttpMultiPart -48 (int (*)(...))QHttpMultiPart::~QHttpMultiPart -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QHttpMultiPart - size=16 align=8 - base size=16 base align=8 -QHttpMultiPart (0x0x7fba0ad15d68) 0 - vptr=((& QHttpMultiPart::_ZTV14QHttpMultiPart) + 16u) - QObject (0x0x7fba0ada8660) 0 - primary-for QHttpMultiPart (0x0x7fba0ad15d68) - -Class QLocalServer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QLocalServer::QPrivateSignal (0x0x7fba0ada8780) 0 empty - -Vtable for QLocalServer -QLocalServer::_ZTV12QLocalServer: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QLocalServer) -16 (int (*)(...))QLocalServer::metaObject -24 (int (*)(...))QLocalServer::qt_metacast -32 (int (*)(...))QLocalServer::qt_metacall -40 (int (*)(...))QLocalServer::~QLocalServer -48 (int (*)(...))QLocalServer::~QLocalServer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QLocalServer::hasPendingConnections -120 (int (*)(...))QLocalServer::nextPendingConnection -128 (int (*)(...))QLocalServer::incomingConnection - -Class QLocalServer - size=16 align=8 - base size=16 base align=8 -QLocalServer (0x0x7fba0ad15dd0) 0 - vptr=((& QLocalServer::_ZTV12QLocalServer) + 16u) - QObject (0x0x7fba0ada8720) 0 - primary-for QLocalServer (0x0x7fba0ad15dd0) - -Class QLocalSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QLocalSocket::QPrivateSignal (0x0x7fba0ada89c0) 0 empty - -Vtable for QLocalSocket -QLocalSocket::_ZTV12QLocalSocket: 30u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QLocalSocket) -16 (int (*)(...))QLocalSocket::metaObject -24 (int (*)(...))QLocalSocket::qt_metacast -32 (int (*)(...))QLocalSocket::qt_metacall -40 (int (*)(...))QLocalSocket::~QLocalSocket -48 (int (*)(...))QLocalSocket::~QLocalSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QLocalSocket::isSequential -120 (int (*)(...))QLocalSocket::open -128 (int (*)(...))QLocalSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QIODevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QLocalSocket::bytesAvailable -184 (int (*)(...))QLocalSocket::bytesToWrite -192 (int (*)(...))QLocalSocket::canReadLine -200 (int (*)(...))QLocalSocket::waitForReadyRead -208 (int (*)(...))QLocalSocket::waitForBytesWritten -216 (int (*)(...))QLocalSocket::readData -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QLocalSocket::writeData - -Class QLocalSocket - size=16 align=8 - base size=16 base align=8 -QLocalSocket (0x0x7fba0ad15f70) 0 - vptr=((& QLocalSocket::_ZTV12QLocalSocket) + 16u) - QIODevice (0x0x7fba0aa23000) 0 - primary-for QLocalSocket (0x0x7fba0ad15f70) - QObject (0x0x7fba0ada8960) 0 - primary-for QIODevice (0x0x7fba0aa23000) - -Class QTcpSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTcpSocket::QPrivateSignal (0x0x7fba0ada8a80) 0 empty - -Vtable for QTcpSocket -QTcpSocket::_ZTV10QTcpSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTcpSocket) -16 (int (*)(...))QTcpSocket::metaObject -24 (int (*)(...))QTcpSocket::qt_metacast -32 (int (*)(...))QTcpSocket::qt_metacall -40 (int (*)(...))QTcpSocket::~QTcpSocket -48 (int (*)(...))QTcpSocket::~QTcpSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QAbstractSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QAbstractSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QAbstractSocket::bytesAvailable -184 (int (*)(...))QAbstractSocket::bytesToWrite -192 (int (*)(...))QAbstractSocket::canReadLine -200 (int (*)(...))QAbstractSocket::waitForReadyRead -208 (int (*)(...))QAbstractSocket::waitForBytesWritten -216 (int (*)(...))QAbstractSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QAbstractSocket::writeData -240 (int (*)(...))QAbstractSocket::resume -248 (int (*)(...))QAbstractSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QAbstractSocket::disconnectFromHost -272 (int (*)(...))QAbstractSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QAbstractSocket::setSocketDescriptor -296 (int (*)(...))QAbstractSocket::setSocketOption -304 (int (*)(...))QAbstractSocket::socketOption -312 (int (*)(...))QAbstractSocket::waitForConnected -320 (int (*)(...))QAbstractSocket::waitForDisconnected - -Class QTcpSocket - size=16 align=8 - base size=16 base align=8 -QTcpSocket (0x0x7fba0aa23068) 0 - vptr=((& QTcpSocket::_ZTV10QTcpSocket) + 16u) - QAbstractSocket (0x0x7fba0aa230d0) 0 - primary-for QTcpSocket (0x0x7fba0aa23068) - QIODevice (0x0x7fba0aa23138) 0 - primary-for QAbstractSocket (0x0x7fba0aa230d0) - QObject (0x0x7fba0ada8a20) 0 - primary-for QIODevice (0x0x7fba0aa23138) - -Class QSslCertificate - size=8 align=8 - base size=8 base align=8 -QSslCertificate (0x0x7fba0ada8c60) 0 - -Class QSslError - size=8 align=8 - base size=8 base align=8 -QSslError (0x0x7fba0aab20c0) 0 - -Class QSslSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSslSocket::QPrivateSignal (0x0x7fba0aab2a20) 0 empty - -Vtable for QSslSocket -QSslSocket::_ZTV10QSslSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QSslSocket) -16 (int (*)(...))QSslSocket::metaObject -24 (int (*)(...))QSslSocket::qt_metacast -32 (int (*)(...))QSslSocket::qt_metacall -40 (int (*)(...))QSslSocket::~QSslSocket -48 (int (*)(...))QSslSocket::~QSslSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QSslSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QSslSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QSslSocket::bytesAvailable -184 (int (*)(...))QSslSocket::bytesToWrite -192 (int (*)(...))QSslSocket::canReadLine -200 (int (*)(...))QSslSocket::waitForReadyRead -208 (int (*)(...))QSslSocket::waitForBytesWritten -216 (int (*)(...))QSslSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QSslSocket::writeData -240 (int (*)(...))QSslSocket::resume -248 (int (*)(...))QSslSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QSslSocket::disconnectFromHost -272 (int (*)(...))QSslSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QSslSocket::setSocketDescriptor -296 (int (*)(...))QSslSocket::setSocketOption -304 (int (*)(...))QSslSocket::socketOption -312 (int (*)(...))QSslSocket::waitForConnected -320 (int (*)(...))QSslSocket::waitForDisconnected - -Class QSslSocket - size=16 align=8 - base size=16 base align=8 -QSslSocket (0x0x7fba0aa23af8) 0 - vptr=((& QSslSocket::_ZTV10QSslSocket) + 16u) - QTcpSocket (0x0x7fba0aa23b60) 0 - primary-for QSslSocket (0x0x7fba0aa23af8) - QAbstractSocket (0x0x7fba0aa23bc8) 0 - primary-for QTcpSocket (0x0x7fba0aa23b60) - QIODevice (0x0x7fba0aa23c30) 0 - primary-for QAbstractSocket (0x0x7fba0aa23bc8) - QObject (0x0x7fba0aab29c0) 0 - primary-for QIODevice (0x0x7fba0aa23c30) - -Class QSslConfiguration - size=8 align=8 - base size=8 base align=8 -QSslConfiguration (0x0x7fba0aab2a80) 0 - -Class QSslPreSharedKeyAuthenticator - size=8 align=8 - base size=8 base align=8 -QSslPreSharedKeyAuthenticator (0x0x7fba0ab6d240) 0 - -Class QNetworkAccessManager::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkAccessManager::QPrivateSignal (0x0x7fba0ab6db40) 0 empty - -Vtable for QNetworkAccessManager -QNetworkAccessManager::_ZTV21QNetworkAccessManager: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QNetworkAccessManager) -16 (int (*)(...))QNetworkAccessManager::metaObject -24 (int (*)(...))QNetworkAccessManager::qt_metacast -32 (int (*)(...))QNetworkAccessManager::qt_metacall -40 (int (*)(...))QNetworkAccessManager::~QNetworkAccessManager -48 (int (*)(...))QNetworkAccessManager::~QNetworkAccessManager -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkAccessManager::createRequest - -Class QNetworkAccessManager - size=16 align=8 - base size=16 base align=8 -QNetworkAccessManager (0x0x7fba0ab698f0) 0 - vptr=((& QNetworkAccessManager::_ZTV21QNetworkAccessManager) + 16u) - QObject (0x0x7fba0ab6dae0) 0 - primary-for QNetworkAccessManager (0x0x7fba0ab698f0) - -Class QNetworkConfiguration - size=8 align=8 - base size=8 base align=8 -QNetworkConfiguration (0x0x7fba0ab6dba0) 0 - -Class QNetworkConfigurationManager::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkConfigurationManager::QPrivateSignal (0x0x7fba0a7fa060) 0 empty - -Vtable for QNetworkConfigurationManager -QNetworkConfigurationManager::_ZTV28QNetworkConfigurationManager: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI28QNetworkConfigurationManager) -16 (int (*)(...))QNetworkConfigurationManager::metaObject -24 (int (*)(...))QNetworkConfigurationManager::qt_metacast -32 (int (*)(...))QNetworkConfigurationManager::qt_metacall -40 (int (*)(...))QNetworkConfigurationManager::~QNetworkConfigurationManager -48 (int (*)(...))QNetworkConfigurationManager::~QNetworkConfigurationManager -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QNetworkConfigurationManager - size=16 align=8 - base size=16 base align=8 -QNetworkConfigurationManager (0x0x7fba0ab69af8) 0 - vptr=((& QNetworkConfigurationManager::_ZTV28QNetworkConfigurationManager) + 16u) - QObject (0x0x7fba0a7fa000) 0 - primary-for QNetworkConfigurationManager (0x0x7fba0ab69af8) - -Class QNetworkCookie - size=8 align=8 - base size=8 base align=8 -QNetworkCookie (0x0x7fba0a7fa3c0) 0 - -Class QNetworkCookieJar::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkCookieJar::QPrivateSignal (0x0x7fba0a7faba0) 0 empty - -Vtable for QNetworkCookieJar -QNetworkCookieJar::_ZTV17QNetworkCookieJar: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QNetworkCookieJar) -16 (int (*)(...))QNetworkCookieJar::metaObject -24 (int (*)(...))QNetworkCookieJar::qt_metacast -32 (int (*)(...))QNetworkCookieJar::qt_metacall -40 (int (*)(...))QNetworkCookieJar::~QNetworkCookieJar -48 (int (*)(...))QNetworkCookieJar::~QNetworkCookieJar -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkCookieJar::cookiesForUrl -120 (int (*)(...))QNetworkCookieJar::setCookiesFromUrl -128 (int (*)(...))QNetworkCookieJar::insertCookie -136 (int (*)(...))QNetworkCookieJar::updateCookie -144 (int (*)(...))QNetworkCookieJar::deleteCookie -152 (int (*)(...))QNetworkCookieJar::validateCookie - -Class QNetworkCookieJar - size=16 align=8 - base size=16 base align=8 -QNetworkCookieJar (0x0x7fba0a877340) 0 - vptr=((& QNetworkCookieJar::_ZTV17QNetworkCookieJar) + 16u) - QObject (0x0x7fba0a7fab40) 0 - primary-for QNetworkCookieJar (0x0x7fba0a877340) - -Class QNetworkDatagram - size=8 align=8 - base size=8 base align=8 -QNetworkDatagram (0x0x7fba0a7fac00) 0 - -Class QNetworkDiskCache::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkDiskCache::QPrivateSignal (0x0x7fba0a910c00) 0 empty - -Vtable for QNetworkDiskCache -QNetworkDiskCache::_ZTV17QNetworkDiskCache: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QNetworkDiskCache) -16 (int (*)(...))QNetworkDiskCache::metaObject -24 (int (*)(...))QNetworkDiskCache::qt_metacast -32 (int (*)(...))QNetworkDiskCache::qt_metacall -40 (int (*)(...))QNetworkDiskCache::~QNetworkDiskCache -48 (int (*)(...))QNetworkDiskCache::~QNetworkDiskCache -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkDiskCache::metaData -120 (int (*)(...))QNetworkDiskCache::updateMetaData -128 (int (*)(...))QNetworkDiskCache::data -136 (int (*)(...))QNetworkDiskCache::remove -144 (int (*)(...))QNetworkDiskCache::cacheSize -152 (int (*)(...))QNetworkDiskCache::prepare -160 (int (*)(...))QNetworkDiskCache::insert -168 (int (*)(...))QNetworkDiskCache::clear -176 (int (*)(...))QNetworkDiskCache::expire - -Class QNetworkDiskCache - size=16 align=8 - base size=16 base align=8 -QNetworkDiskCache (0x0x7fba0a915d68) 0 - vptr=((& QNetworkDiskCache::_ZTV17QNetworkDiskCache) + 16u) - QAbstractNetworkCache (0x0x7fba0a915dd0) 0 - primary-for QNetworkDiskCache (0x0x7fba0a915d68) - QObject (0x0x7fba0a910ba0) 0 - primary-for QAbstractNetworkCache (0x0x7fba0a915dd0) - -Class QNetworkAddressEntry - size=8 align=8 - base size=8 base align=8 -QNetworkAddressEntry (0x0x7fba0a910c60) 0 - -Class QNetworkInterface - size=8 align=8 - base size=8 base align=8 -QNetworkInterface (0x0x7fba0a966360) 0 - -Class QNetworkProxyQuery - size=8 align=8 - base size=8 base align=8 -QNetworkProxyQuery (0x0x7fba0a966a80) 0 - -Class QNetworkProxy - size=8 align=8 - base size=8 base align=8 -QNetworkProxy (0x0x7fba0a5fc120) 0 - -Vtable for QNetworkProxyFactory -QNetworkProxyFactory::_ZTV20QNetworkProxyFactory: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QNetworkProxyFactory) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QNetworkProxyFactory - size=8 align=8 - base size=8 base align=8 -QNetworkProxyFactory (0x0x7fba0a5fc900) 0 nearly-empty - vptr=((& QNetworkProxyFactory::_ZTV20QNetworkProxyFactory) + 16u) - -Class QNetworkReply::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkReply::QPrivateSignal (0x0x7fba0a5fcae0) 0 empty - -Vtable for QNetworkReply -QNetworkReply::_ZTV13QNetworkReply: 36u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QNetworkReply) -16 (int (*)(...))QNetworkReply::metaObject -24 (int (*)(...))QNetworkReply::qt_metacast -32 (int (*)(...))QNetworkReply::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkReply::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QNetworkReply::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QIODevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))__cxa_pure_virtual -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QNetworkReply::writeData -240 (int (*)(...))QNetworkReply::setReadBufferSize -248 (int (*)(...))__cxa_pure_virtual -256 (int (*)(...))QNetworkReply::ignoreSslErrors -264 (int (*)(...))QNetworkReply::sslConfigurationImplementation -272 (int (*)(...))QNetworkReply::setSslConfigurationImplementation -280 (int (*)(...))QNetworkReply::ignoreSslErrorsImplementation - -Class QNetworkReply - size=16 align=8 - base size=16 base align=8 -QNetworkReply (0x0x7fba0a623478) 0 - vptr=((& QNetworkReply::_ZTV13QNetworkReply) + 16u) - QIODevice (0x0x7fba0a6234e0) 0 - primary-for QNetworkReply (0x0x7fba0a623478) - QObject (0x0x7fba0a5fca80) 0 - primary-for QIODevice (0x0x7fba0a6234e0) - -Class QNetworkSession::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkSession::QPrivateSignal (0x0x7fba0a5fccc0) 0 empty - -Vtable for QNetworkSession -QNetworkSession::_ZTV15QNetworkSession: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QNetworkSession) -16 (int (*)(...))QNetworkSession::metaObject -24 (int (*)(...))QNetworkSession::qt_metacast -32 (int (*)(...))QNetworkSession::qt_metacall -40 (int (*)(...))QNetworkSession::~QNetworkSession -48 (int (*)(...))QNetworkSession::~QNetworkSession -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QNetworkSession::connectNotify -104 (int (*)(...))QNetworkSession::disconnectNotify - -Class QNetworkSession - size=24 align=8 - base size=24 base align=8 -QNetworkSession (0x0x7fba0a623548) 0 - vptr=((& QNetworkSession::_ZTV15QNetworkSession) + 16u) - QObject (0x0x7fba0a5fcc60) 0 - primary-for QNetworkSession (0x0x7fba0a623548) - -Class QTcpServer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTcpServer::QPrivateSignal (0x0x7fba0a6c22a0) 0 empty - -Vtable for QTcpServer -QTcpServer::_ZTV10QTcpServer: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTcpServer) -16 (int (*)(...))QTcpServer::metaObject -24 (int (*)(...))QTcpServer::qt_metacast -32 (int (*)(...))QTcpServer::qt_metacall -40 (int (*)(...))QTcpServer::~QTcpServer -48 (int (*)(...))QTcpServer::~QTcpServer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTcpServer::hasPendingConnections -120 (int (*)(...))QTcpServer::nextPendingConnection -128 (int (*)(...))QTcpServer::incomingConnection - -Class QTcpServer - size=16 align=8 - base size=16 base align=8 -QTcpServer (0x0x7fba0a623680) 0 - vptr=((& QTcpServer::_ZTV10QTcpServer) + 16u) - QObject (0x0x7fba0a6c2240) 0 - primary-for QTcpServer (0x0x7fba0a623680) - -Class QSslCertificateExtension - size=8 align=8 - base size=8 base align=8 -QSslCertificateExtension (0x0x7fba0a6c2300) 0 - -Class QSslCipher - size=8 align=8 - base size=8 base align=8 -QSslCipher (0x0x7fba0a6c2600) 0 - -Class QSslDiffieHellmanParameters - size=8 align=8 - base size=8 base align=8 -QSslDiffieHellmanParameters (0x0x7fba0a6c2de0) 0 - -Class QSslEllipticCurve - size=4 align=4 - base size=4 base align=4 -QSslEllipticCurve (0x0x7fba0a7b3900) 0 - -Class QSslKey - size=8 align=8 - base size=8 base align=8 -QSslKey (0x0x7fba0a3e6060) 0 - -Class QUdpSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QUdpSocket::QPrivateSignal (0x0x7fba0a3e63c0) 0 empty - -Vtable for QUdpSocket -QUdpSocket::_ZTV10QUdpSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QUdpSocket) -16 (int (*)(...))QUdpSocket::metaObject -24 (int (*)(...))QUdpSocket::qt_metacast -32 (int (*)(...))QUdpSocket::qt_metacall -40 (int (*)(...))QUdpSocket::~QUdpSocket -48 (int (*)(...))QUdpSocket::~QUdpSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QAbstractSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QAbstractSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QAbstractSocket::bytesAvailable -184 (int (*)(...))QAbstractSocket::bytesToWrite -192 (int (*)(...))QAbstractSocket::canReadLine -200 (int (*)(...))QAbstractSocket::waitForReadyRead -208 (int (*)(...))QAbstractSocket::waitForBytesWritten -216 (int (*)(...))QAbstractSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QAbstractSocket::writeData -240 (int (*)(...))QAbstractSocket::resume -248 (int (*)(...))QAbstractSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QAbstractSocket::disconnectFromHost -272 (int (*)(...))QAbstractSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QAbstractSocket::setSocketDescriptor -296 (int (*)(...))QAbstractSocket::setSocketOption -304 (int (*)(...))QAbstractSocket::socketOption -312 (int (*)(...))QAbstractSocket::waitForConnected -320 (int (*)(...))QAbstractSocket::waitForDisconnected - -Class QUdpSocket - size=16 align=8 - base size=16 base align=8 -QUdpSocket (0x0x7fba0a7bec30) 0 - vptr=((& QUdpSocket::_ZTV10QUdpSocket) + 16u) - QAbstractSocket (0x0x7fba0a7bec98) 0 - primary-for QUdpSocket (0x0x7fba0a7bec30) - QIODevice (0x0x7fba0a7bed00) 0 - primary-for QAbstractSocket (0x0x7fba0a7bec98) - QObject (0x0x7fba0a3e6360) 0 - primary-for QIODevice (0x0x7fba0a7bed00) - -Class QJSValue - size=8 align=8 - base size=8 base align=8 -QJSValue (0x0x7fba0a3e6420) 0 - -Class QJSEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QJSEngine::QPrivateSignal (0x0x7fba0a3e6720) 0 empty - -Vtable for QJSEngine -QJSEngine::_ZTV9QJSEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QJSEngine) -16 (int (*)(...))QJSEngine::metaObject -24 (int (*)(...))QJSEngine::qt_metacast -32 (int (*)(...))QJSEngine::qt_metacall -40 (int (*)(...))QJSEngine::~QJSEngine -48 (int (*)(...))QJSEngine::~QJSEngine -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QJSEngine - size=24 align=8 - base size=24 base align=8 -QJSEngine (0x0x7fba0a7bee38) 0 - vptr=((& QJSEngine::_ZTV9QJSEngine) + 16u) - QObject (0x0x7fba0a3e66c0) 0 - primary-for QJSEngine (0x0x7fba0a7bee38) - -Class QJSValueIterator - size=8 align=8 - base size=8 base align=8 -QJSValueIterator (0x0x7fba0a3e6900) 0 - -Class QQmlPrivate::RegisterType - size=128 align=8 - base size=124 base align=8 -QQmlPrivate::RegisterType (0x0x7fba0a3e6de0) 0 - -Class QQmlPrivate::RegisterInterface - size=24 align=8 - base size=24 base align=8 -QQmlPrivate::RegisterInterface (0x0x7fba0a3e6e40) 0 - -Class QQmlPrivate::RegisterAutoParent - size=16 align=8 - base size=16 base align=8 -QQmlPrivate::RegisterAutoParent (0x0x7fba0a3e6ea0) 0 - -Class QQmlPrivate::RegisterSingletonType - size=64 align=8 - base size=64 base align=8 -QQmlPrivate::RegisterSingletonType (0x0x7fba0a3e6f00) 0 - -Class QQmlPrivate::RegisterCompositeType - size=32 align=8 - base size=32 base align=8 -QQmlPrivate::RegisterCompositeType (0x0x7fba0a3e6f60) 0 - -Class QQmlPrivate::RegisterCompositeSingletonType - size=32 align=8 - base size=32 base align=8 -QQmlPrivate::RegisterCompositeSingletonType (0x0x7fba0a4e5000) 0 - -Class QQmlPrivate::CachedQmlUnit - size=24 align=8 - base size=24 base align=8 -QQmlPrivate::CachedQmlUnit (0x0x7fba0a4e5060) 0 - -Class QQmlPrivate::RegisterQmlUnitCacheHook - size=16 align=8 - base size=16 base align=8 -QQmlPrivate::RegisterQmlUnitCacheHook (0x0x7fba0a4e50c0) 0 - -Vtable for QQmlParserStatus -QQmlParserStatus::_ZTV16QQmlParserStatus: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QQmlParserStatus) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QQmlParserStatus - size=16 align=8 - base size=16 base align=8 -QQmlParserStatus (0x0x7fba0a4e5120) 0 - vptr=((& QQmlParserStatus::_ZTV16QQmlParserStatus) + 16u) - -Vtable for QQmlPropertyValueSource -QQmlPropertyValueSource::_ZTV23QQmlPropertyValueSource: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QQmlPropertyValueSource) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlPropertyValueSource - size=8 align=8 - base size=8 base align=8 -QQmlPropertyValueSource (0x0x7fba0a4e51e0) 0 nearly-empty - vptr=((& QQmlPropertyValueSource::_ZTV23QQmlPropertyValueSource) + 16u) - -Class QQmlListReference - size=8 align=8 - base size=8 base align=8 -QQmlListReference (0x0x7fba0a4e5300) 0 - -Vtable for QQmlAbstractUrlInterceptor -QQmlAbstractUrlInterceptor::_ZTV26QQmlAbstractUrlInterceptor: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QQmlAbstractUrlInterceptor) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlAbstractUrlInterceptor - size=8 align=8 - base size=8 base align=8 -QQmlAbstractUrlInterceptor (0x0x7fba0a4e5960) 0 nearly-empty - vptr=((& QQmlAbstractUrlInterceptor::_ZTV26QQmlAbstractUrlInterceptor) + 16u) - -Class QQmlError - size=8 align=8 - base size=8 base align=8 -QQmlError (0x0x7fba0a4e59c0) 0 - -Class QQmlDebuggingEnabler - size=1 align=1 - base size=0 base align=1 -QQmlDebuggingEnabler (0x0x7fba0a4e5c60) 0 empty - -Vtable for QQmlImageProviderBase -QQmlImageProviderBase::_ZTV21QQmlImageProviderBase: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QQmlImageProviderBase) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QQmlImageProviderBase - size=8 align=8 - base size=8 base align=8 -QQmlImageProviderBase (0x0x7fba0a4e5cc0) 0 nearly-empty - vptr=((& QQmlImageProviderBase::_ZTV21QQmlImageProviderBase) + 16u) - -Class QQmlEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlEngine::QPrivateSignal (0x0x7fba0a4e5f00) 0 empty - -Vtable for QQmlEngine -QQmlEngine::_ZTV10QQmlEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QQmlEngine) -16 (int (*)(...))QQmlEngine::metaObject -24 (int (*)(...))QQmlEngine::qt_metacast -32 (int (*)(...))QQmlEngine::qt_metacall -40 (int (*)(...))QQmlEngine::~QQmlEngine -48 (int (*)(...))QQmlEngine::~QQmlEngine -56 (int (*)(...))QQmlEngine::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlEngine - size=24 align=8 - base size=24 base align=8 -QQmlEngine (0x0x7fba0a4cb478) 0 - vptr=((& QQmlEngine::_ZTV10QQmlEngine) + 16u) - QJSEngine (0x0x7fba0a4cb4e0) 0 - primary-for QQmlEngine (0x0x7fba0a4cb478) - QObject (0x0x7fba0a4e5ea0) 0 - primary-for QJSEngine (0x0x7fba0a4cb4e0) - -Class QQmlApplicationEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlApplicationEngine::QPrivateSignal (0x0x7fba0a241000) 0 empty - -Vtable for QQmlApplicationEngine -QQmlApplicationEngine::_ZTV21QQmlApplicationEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QQmlApplicationEngine) -16 (int (*)(...))QQmlApplicationEngine::metaObject -24 (int (*)(...))QQmlApplicationEngine::qt_metacast -32 (int (*)(...))QQmlApplicationEngine::qt_metacall -40 (int (*)(...))QQmlApplicationEngine::~QQmlApplicationEngine -48 (int (*)(...))QQmlApplicationEngine::~QQmlApplicationEngine -56 (int (*)(...))QQmlEngine::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlApplicationEngine - size=24 align=8 - base size=24 base align=8 -QQmlApplicationEngine (0x0x7fba0a4cb548) 0 - vptr=((& QQmlApplicationEngine::_ZTV21QQmlApplicationEngine) + 16u) - QQmlEngine (0x0x7fba0a4cb5b0) 0 - primary-for QQmlApplicationEngine (0x0x7fba0a4cb548) - QJSEngine (0x0x7fba0a4cb618) 0 - primary-for QQmlEngine (0x0x7fba0a4cb5b0) - QObject (0x0x7fba0a4e5f60) 0 - primary-for QJSEngine (0x0x7fba0a4cb618) - -Class QQmlComponent::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlComponent::QPrivateSignal (0x0x7fba0a2410c0) 0 empty - -Vtable for QQmlComponent -QQmlComponent::_ZTV13QQmlComponent: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QQmlComponent) -16 (int (*)(...))QQmlComponent::metaObject -24 (int (*)(...))QQmlComponent::qt_metacast -32 (int (*)(...))QQmlComponent::qt_metacall -40 (int (*)(...))QQmlComponent::~QQmlComponent -48 (int (*)(...))QQmlComponent::~QQmlComponent -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQmlComponent::create -120 (int (*)(...))QQmlComponent::beginCreate -128 (int (*)(...))QQmlComponent::completeCreate - -Class QQmlComponent - size=16 align=8 - base size=16 base align=8 -QQmlComponent (0x0x7fba0a4cb680) 0 - vptr=((& QQmlComponent::_ZTV13QQmlComponent) + 16u) - QObject (0x0x7fba0a241060) 0 - primary-for QQmlComponent (0x0x7fba0a4cb680) - -Class QQmlContext::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlContext::QPrivateSignal (0x0x7fba0a241900) 0 empty - -Vtable for QQmlContext -QQmlContext::_ZTV11QQmlContext: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QQmlContext) -16 (int (*)(...))QQmlContext::metaObject -24 (int (*)(...))QQmlContext::qt_metacast -32 (int (*)(...))QQmlContext::qt_metacall -40 (int (*)(...))QQmlContext::~QQmlContext -48 (int (*)(...))QQmlContext::~QQmlContext -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlContext - size=16 align=8 - base size=16 base align=8 -QQmlContext (0x0x7fba0a4cbbc8) 0 - vptr=((& QQmlContext::_ZTV11QQmlContext) + 16u) - QObject (0x0x7fba0a2418a0) 0 - primary-for QQmlContext (0x0x7fba0a4cbbc8) - -Class QQmlScriptString - size=8 align=8 - base size=8 base align=8 -QQmlScriptString (0x0x7fba0a241a80) 0 - -Class QQmlExpression::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlExpression::QPrivateSignal (0x0x7fba0a241cc0) 0 empty - -Vtable for QQmlExpression -QQmlExpression::_ZTV14QQmlExpression: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QQmlExpression) -16 (int (*)(...))QQmlExpression::metaObject -24 (int (*)(...))QQmlExpression::qt_metacast -32 (int (*)(...))QQmlExpression::qt_metacall -40 (int (*)(...))QQmlExpression::~QQmlExpression -48 (int (*)(...))QQmlExpression::~QQmlExpression -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlExpression - size=16 align=8 - base size=16 base align=8 -QQmlExpression (0x0x7fba0a4cbc30) 0 - vptr=((& QQmlExpression::_ZTV14QQmlExpression) + 16u) - QObject (0x0x7fba0a241c60) 0 - primary-for QQmlExpression (0x0x7fba0a4cbc30) - -Vtable for QQmlTypesExtensionInterface -QQmlTypesExtensionInterface::_ZTV27QQmlTypesExtensionInterface: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QQmlTypesExtensionInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlTypesExtensionInterface - size=8 align=8 - base size=8 base align=8 -QQmlTypesExtensionInterface (0x0x7fba0a241d20) 0 nearly-empty - vptr=((& QQmlTypesExtensionInterface::_ZTV27QQmlTypesExtensionInterface) + 16u) - -Vtable for QQmlExtensionInterface -QQmlExtensionInterface::_ZTV22QQmlExtensionInterface: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QQmlExtensionInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QQmlExtensionInterface - size=8 align=8 - base size=8 base align=8 -QQmlExtensionInterface (0x0x7fba0a4cbc98) 0 nearly-empty - vptr=((& QQmlExtensionInterface::_ZTV22QQmlExtensionInterface) + 16u) - QQmlTypesExtensionInterface (0x0x7fba0a241d80) 0 nearly-empty - primary-for QQmlExtensionInterface (0x0x7fba0a4cbc98) - -Class QQmlExtensionPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlExtensionPlugin::QPrivateSignal (0x0x7fba0a241f60) 0 empty - -Vtable for QQmlExtensionPlugin -QQmlExtensionPlugin::_ZTV19QQmlExtensionPlugin: 22u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQmlExtensionPlugin) -16 (int (*)(...))QQmlExtensionPlugin::metaObject -24 (int (*)(...))QQmlExtensionPlugin::qt_metacast -32 (int (*)(...))QQmlExtensionPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QQmlExtensionPlugin::initializeEngine -128 (int (*)(...))-16 -136 (int (*)(...))(& _ZTI19QQmlExtensionPlugin) -144 0u -152 0u -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QQmlExtensionPlugin::_ZThn16_N19QQmlExtensionPlugin16initializeEngineEP10QQmlEnginePKc - -Class QQmlExtensionPlugin - size=24 align=8 - base size=24 base align=8 -QQmlExtensionPlugin (0x0x7fba0a2ea7e0) 0 - vptr=((& QQmlExtensionPlugin::_ZTV19QQmlExtensionPlugin) + 16u) - QObject (0x0x7fba0a241ea0) 0 - primary-for QQmlExtensionPlugin (0x0x7fba0a2ea7e0) - QQmlExtensionInterface (0x0x7fba0a4cbd00) 16 nearly-empty - vptr=((& QQmlExtensionPlugin::_ZTV19QQmlExtensionPlugin) + 144u) - QQmlTypesExtensionInterface (0x0x7fba0a241f00) 16 nearly-empty - primary-for QQmlExtensionInterface (0x0x7fba0a4cbd00) - -Class QQmlFile - size=8 align=8 - base size=8 base align=8 -QQmlFile (0x0x7fba0a302000) 0 - -Class QQmlFileSelector::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlFileSelector::QPrivateSignal (0x0x7fba0a3020c0) 0 empty - -Vtable for QQmlFileSelector -QQmlFileSelector::_ZTV16QQmlFileSelector: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QQmlFileSelector) -16 (int (*)(...))QQmlFileSelector::metaObject -24 (int (*)(...))QQmlFileSelector::qt_metacast -32 (int (*)(...))QQmlFileSelector::qt_metacall -40 (int (*)(...))QQmlFileSelector::~QQmlFileSelector -48 (int (*)(...))QQmlFileSelector::~QQmlFileSelector -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlFileSelector - size=16 align=8 - base size=16 base align=8 -QQmlFileSelector (0x0x7fba0a4cbdd0) 0 - vptr=((& QQmlFileSelector::_ZTV16QQmlFileSelector) + 16u) - QObject (0x0x7fba0a302060) 0 - primary-for QQmlFileSelector (0x0x7fba0a4cbdd0) - -Vtable for QQmlIncubator -QQmlIncubator::_ZTV13QQmlIncubator: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QQmlIncubator) -16 (int (*)(...))QQmlIncubator::~QQmlIncubator -24 (int (*)(...))QQmlIncubator::~QQmlIncubator -32 (int (*)(...))QQmlIncubator::statusChanged -40 (int (*)(...))QQmlIncubator::setInitialState - -Class QQmlIncubator - size=16 align=8 - base size=16 base align=8 -QQmlIncubator (0x0x7fba0a302120) 0 - vptr=((& QQmlIncubator::_ZTV13QQmlIncubator) + 16u) - -Vtable for QQmlIncubationController -QQmlIncubationController::_ZTV24QQmlIncubationController: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QQmlIncubationController) -16 (int (*)(...))QQmlIncubationController::~QQmlIncubationController -24 (int (*)(...))QQmlIncubationController::~QQmlIncubationController -32 (int (*)(...))QQmlIncubationController::incubatingObjectCountChanged - -Class QQmlIncubationController - size=16 align=8 - base size=16 base align=8 -QQmlIncubationController (0x0x7fba0a302180) 0 - vptr=((& QQmlIncubationController::_ZTV24QQmlIncubationController) + 16u) - -Class QQmlInfo - size=16 align=8 - base size=16 base align=8 -QQmlInfo (0x0x7fba0a4cbe38) 0 - QDebug (0x0x7fba0a3021e0) 0 - -Vtable for QQmlNetworkAccessManagerFactory -QQmlNetworkAccessManagerFactory::_ZTV31QQmlNetworkAccessManagerFactory: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI31QQmlNetworkAccessManagerFactory) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlNetworkAccessManagerFactory - size=8 align=8 - base size=8 base align=8 -QQmlNetworkAccessManagerFactory (0x0x7fba0a3b60c0) 0 nearly-empty - vptr=((& QQmlNetworkAccessManagerFactory::_ZTV31QQmlNetworkAccessManagerFactory) + 16u) - -Class QQmlProperty - size=8 align=8 - base size=8 base align=8 -QQmlProperty (0x0x7fba0a3b6120) 0 - -Class QQmlPropertyMap::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlPropertyMap::QPrivateSignal (0x0x7fba0a3b6c60) 0 empty - -Vtable for QQmlPropertyMap -QQmlPropertyMap::_ZTV15QQmlPropertyMap: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QQmlPropertyMap) -16 (int (*)(...))QQmlPropertyMap::metaObject -24 (int (*)(...))QQmlPropertyMap::qt_metacast -32 (int (*)(...))QQmlPropertyMap::qt_metacall -40 (int (*)(...))QQmlPropertyMap::~QQmlPropertyMap -48 (int (*)(...))QQmlPropertyMap::~QQmlPropertyMap -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQmlPropertyMap::updateValue - -Class QQmlPropertyMap - size=16 align=8 - base size=16 base align=8 -QQmlPropertyMap (0x0x7fba0a3d9680) 0 - vptr=((& QQmlPropertyMap::_ZTV15QQmlPropertyMap) + 16u) - QObject (0x0x7fba0a3b6c00) 0 - primary-for QQmlPropertyMap (0x0x7fba0a3d9680) - -Class QQuickTransform::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickTransform::QPrivateSignal (0x0x7fba0a3b6d20) 0 empty - -Vtable for QQuickTransform -QQuickTransform::_ZTV15QQuickTransform: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QQuickTransform) -16 (int (*)(...))QQuickTransform::metaObject -24 (int (*)(...))QQuickTransform::qt_metacast -32 (int (*)(...))QQuickTransform::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QQuickTransform - size=16 align=8 - base size=16 base align=8 -QQuickTransform (0x0x7fba0a3d96e8) 0 - vptr=((& QQuickTransform::_ZTV15QQuickTransform) + 16u) - QObject (0x0x7fba0a3b6cc0) 0 - primary-for QQuickTransform (0x0x7fba0a3d96e8) - -Class QQuickItem::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickItem::QPrivateSignal (0x0x7fba0a3b6e40) 0 empty - -Class QQuickItem::ItemChangeData - size=8 align=8 - base size=8 base align=8 -QQuickItem::ItemChangeData (0x0x7fba0a3b6ea0) 0 - -Class QQuickItem::UpdatePaintNodeData - size=8 align=8 - base size=8 base align=8 -QQuickItem::UpdatePaintNodeData (0x0x7fba0a3b6f00) 0 - -Vtable for QQuickItem -QQuickItem::_ZTV10QQuickItem: 55u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QQuickItem) -16 (int (*)(...))QQuickItem::metaObject -24 (int (*)(...))QQuickItem::qt_metacast -32 (int (*)(...))QQuickItem::qt_metacall -40 (int (*)(...))QQuickItem::~QQuickItem -48 (int (*)(...))QQuickItem::~QQuickItem -56 (int (*)(...))QQuickItem::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickItem::boundingRect -120 (int (*)(...))QQuickItem::clipRect -128 (int (*)(...))QQuickItem::contains -136 (int (*)(...))QQuickItem::inputMethodQuery -144 (int (*)(...))QQuickItem::isTextureProvider -152 (int (*)(...))QQuickItem::textureProvider -160 (int (*)(...))QQuickItem::itemChange -168 (int (*)(...))QQuickItem::classBegin -176 (int (*)(...))QQuickItem::componentComplete -184 (int (*)(...))QQuickItem::keyPressEvent -192 (int (*)(...))QQuickItem::keyReleaseEvent -200 (int (*)(...))QQuickItem::inputMethodEvent -208 (int (*)(...))QQuickItem::focusInEvent -216 (int (*)(...))QQuickItem::focusOutEvent -224 (int (*)(...))QQuickItem::mousePressEvent -232 (int (*)(...))QQuickItem::mouseMoveEvent -240 (int (*)(...))QQuickItem::mouseReleaseEvent -248 (int (*)(...))QQuickItem::mouseDoubleClickEvent -256 (int (*)(...))QQuickItem::mouseUngrabEvent -264 (int (*)(...))QQuickItem::touchUngrabEvent -272 (int (*)(...))QQuickItem::wheelEvent -280 (int (*)(...))QQuickItem::touchEvent -288 (int (*)(...))QQuickItem::hoverEnterEvent -296 (int (*)(...))QQuickItem::hoverMoveEvent -304 (int (*)(...))QQuickItem::hoverLeaveEvent -312 (int (*)(...))QQuickItem::dragEnterEvent -320 (int (*)(...))QQuickItem::dragMoveEvent -328 (int (*)(...))QQuickItem::dragLeaveEvent -336 (int (*)(...))QQuickItem::dropEvent -344 (int (*)(...))QQuickItem::childMouseEventFilter -352 (int (*)(...))QQuickItem::windowDeactivateEvent -360 (int (*)(...))QQuickItem::geometryChanged -368 (int (*)(...))QQuickItem::updatePaintNode -376 (int (*)(...))QQuickItem::releaseResources -384 (int (*)(...))QQuickItem::updatePolish -392 (int (*)(...))-16 -400 (int (*)(...))(& _ZTI10QQuickItem) -408 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItemD1Ev -416 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItemD0Ev -424 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem10classBeginEv -432 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem17componentCompleteEv - -Class QQuickItem - size=32 align=8 - base size=32 base align=8 -QQuickItem (0x0x7fba09ff45b0) 0 - vptr=((& QQuickItem::_ZTV10QQuickItem) + 16u) - QObject (0x0x7fba0a3b6d80) 0 - primary-for QQuickItem (0x0x7fba09ff45b0) - QQmlParserStatus (0x0x7fba0a3b6de0) 16 - vptr=((& QQuickItem::_ZTV10QQuickItem) + 408u) - -Class QQuickFramebufferObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickFramebufferObject::QPrivateSignal (0x0x7fba0a05a720) 0 empty - -Vtable for QQuickFramebufferObject::Renderer -QQuickFramebufferObject::Renderer::_ZTVN23QQuickFramebufferObject8RendererE: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN23QQuickFramebufferObject8RendererE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QQuickFramebufferObject::Renderer::createFramebufferObject -48 (int (*)(...))QQuickFramebufferObject::Renderer::synchronize - -Class QQuickFramebufferObject::Renderer - size=16 align=8 - base size=16 base align=8 -QQuickFramebufferObject::Renderer (0x0x7fba0a05a780) 0 - vptr=((& QQuickFramebufferObject::Renderer::_ZTVN23QQuickFramebufferObject8RendererE) + 16u) - -Vtable for QQuickFramebufferObject -QQuickFramebufferObject::_ZTV23QQuickFramebufferObject: 56u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QQuickFramebufferObject) -16 (int (*)(...))QQuickFramebufferObject::metaObject -24 (int (*)(...))QQuickFramebufferObject::qt_metacast -32 (int (*)(...))QQuickFramebufferObject::qt_metacall -40 0u -48 0u -56 (int (*)(...))QQuickItem::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickItem::boundingRect -120 (int (*)(...))QQuickItem::clipRect -128 (int (*)(...))QQuickItem::contains -136 (int (*)(...))QQuickItem::inputMethodQuery -144 (int (*)(...))QQuickFramebufferObject::isTextureProvider -152 (int (*)(...))QQuickFramebufferObject::textureProvider -160 (int (*)(...))QQuickItem::itemChange -168 (int (*)(...))QQuickItem::classBegin -176 (int (*)(...))QQuickItem::componentComplete -184 (int (*)(...))QQuickItem::keyPressEvent -192 (int (*)(...))QQuickItem::keyReleaseEvent -200 (int (*)(...))QQuickItem::inputMethodEvent -208 (int (*)(...))QQuickItem::focusInEvent -216 (int (*)(...))QQuickItem::focusOutEvent -224 (int (*)(...))QQuickItem::mousePressEvent -232 (int (*)(...))QQuickItem::mouseMoveEvent -240 (int (*)(...))QQuickItem::mouseReleaseEvent -248 (int (*)(...))QQuickItem::mouseDoubleClickEvent -256 (int (*)(...))QQuickItem::mouseUngrabEvent -264 (int (*)(...))QQuickItem::touchUngrabEvent -272 (int (*)(...))QQuickItem::wheelEvent -280 (int (*)(...))QQuickItem::touchEvent -288 (int (*)(...))QQuickItem::hoverEnterEvent -296 (int (*)(...))QQuickItem::hoverMoveEvent -304 (int (*)(...))QQuickItem::hoverLeaveEvent -312 (int (*)(...))QQuickItem::dragEnterEvent -320 (int (*)(...))QQuickItem::dragMoveEvent -328 (int (*)(...))QQuickItem::dragLeaveEvent -336 (int (*)(...))QQuickItem::dropEvent -344 (int (*)(...))QQuickItem::childMouseEventFilter -352 (int (*)(...))QQuickItem::windowDeactivateEvent -360 (int (*)(...))QQuickFramebufferObject::geometryChanged -368 (int (*)(...))QQuickFramebufferObject::updatePaintNode -376 (int (*)(...))QQuickFramebufferObject::releaseResources -384 (int (*)(...))QQuickItem::updatePolish -392 (int (*)(...))__cxa_pure_virtual -400 (int (*)(...))-16 -408 (int (*)(...))(& _ZTI23QQuickFramebufferObject) -416 0u -424 0u -432 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem10classBeginEv -440 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem17componentCompleteEv - -Class QQuickFramebufferObject - size=32 align=8 - base size=32 base align=8 -QQuickFramebufferObject (0x0x7fba0a3d9820) 0 - vptr=((& QQuickFramebufferObject::_ZTV23QQuickFramebufferObject) + 16u) - QQuickItem (0x0x7fba0a0a3bd0) 0 - primary-for QQuickFramebufferObject (0x0x7fba0a3d9820) - QObject (0x0x7fba0a05a660) 0 - primary-for QQuickItem (0x0x7fba0a0a3bd0) - QQmlParserStatus (0x0x7fba0a05a6c0) 16 - vptr=((& QQuickFramebufferObject::_ZTV23QQuickFramebufferObject) + 416u) - -Vtable for QQuickTextureFactory -QQuickTextureFactory::_ZTV20QQuickTextureFactory: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QQuickTextureFactory) -16 (int (*)(...))QObject::metaObject -24 (int (*)(...))QObject::qt_metacast -32 (int (*)(...))QObject::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))QQuickTextureFactory::image - -Class QQuickTextureFactory - size=16 align=8 - base size=16 base align=8 -QQuickTextureFactory (0x0x7fba0a3d9888) 0 - vptr=((& QQuickTextureFactory::_ZTV20QQuickTextureFactory) + 16u) - QObject (0x0x7fba0a05a7e0) 0 - primary-for QQuickTextureFactory (0x0x7fba0a3d9888) - -Class QQuickImageResponse::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickImageResponse::QPrivateSignal (0x0x7fba0a05a8a0) 0 empty - -Vtable for QQuickImageResponse -QQuickImageResponse::_ZTV19QQuickImageResponse: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQuickImageResponse) -16 (int (*)(...))QQuickImageResponse::metaObject -24 (int (*)(...))QQuickImageResponse::qt_metacast -32 (int (*)(...))QQuickImageResponse::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QQuickImageResponse::errorString -128 (int (*)(...))QQuickImageResponse::cancel - -Class QQuickImageResponse - size=16 align=8 - base size=16 base align=8 -QQuickImageResponse (0x0x7fba0a3d98f0) 0 - vptr=((& QQuickImageResponse::_ZTV19QQuickImageResponse) + 16u) - QObject (0x0x7fba0a05a840) 0 - primary-for QQuickImageResponse (0x0x7fba0a3d98f0) - -Vtable for QQuickImageProvider -QQuickImageProvider::_ZTV19QQuickImageProvider: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQuickImageProvider) -16 (int (*)(...))QQuickImageProvider::~QQuickImageProvider -24 (int (*)(...))QQuickImageProvider::~QQuickImageProvider -32 (int (*)(...))QQuickImageProvider::imageType -40 (int (*)(...))QQuickImageProvider::flags -48 (int (*)(...))QQuickImageProvider::requestImage -56 (int (*)(...))QQuickImageProvider::requestPixmap -64 (int (*)(...))QQuickImageProvider::requestTexture - -Class QQuickImageProvider - size=16 align=8 - base size=16 base align=8 -QQuickImageProvider (0x0x7fba0a3d9958) 0 - vptr=((& QQuickImageProvider::_ZTV19QQuickImageProvider) + 16u) - QQmlImageProviderBase (0x0x7fba0a05a900) 0 nearly-empty - primary-for QQuickImageProvider (0x0x7fba0a3d9958) - -Vtable for QQuickAsyncImageProvider -QQuickAsyncImageProvider::_ZTV24QQuickAsyncImageProvider: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QQuickAsyncImageProvider) -16 0u -24 0u -32 (int (*)(...))QQuickImageProvider::imageType -40 (int (*)(...))QQuickImageProvider::flags -48 (int (*)(...))QQuickImageProvider::requestImage -56 (int (*)(...))QQuickImageProvider::requestPixmap -64 (int (*)(...))QQuickImageProvider::requestTexture -72 (int (*)(...))__cxa_pure_virtual - -Class QQuickAsyncImageProvider - size=24 align=8 - base size=24 base align=8 -QQuickAsyncImageProvider (0x0x7fba0a3d99c0) 0 - vptr=((& QQuickAsyncImageProvider::_ZTV24QQuickAsyncImageProvider) + 16u) - QQuickImageProvider (0x0x7fba0a3d9a28) 0 - primary-for QQuickAsyncImageProvider (0x0x7fba0a3d99c0) - QQmlImageProviderBase (0x0x7fba0a05a960) 0 nearly-empty - primary-for QQuickImageProvider (0x0x7fba0a3d9a28) - -Class QQuickItemGrabResult::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickItemGrabResult::QPrivateSignal (0x0x7fba0a05aa20) 0 empty - -Vtable for QQuickItemGrabResult -QQuickItemGrabResult::_ZTV20QQuickItemGrabResult: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QQuickItemGrabResult) -16 (int (*)(...))QQuickItemGrabResult::metaObject -24 (int (*)(...))QQuickItemGrabResult::qt_metacast -32 (int (*)(...))QQuickItemGrabResult::qt_metacall -40 (int (*)(...))QQuickItemGrabResult::~QQuickItemGrabResult -48 (int (*)(...))QQuickItemGrabResult::~QQuickItemGrabResult -56 (int (*)(...))QQuickItemGrabResult::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQuickItemGrabResult - size=16 align=8 - base size=16 base align=8 -QQuickItemGrabResult (0x0x7fba0a3d9a90) 0 - vptr=((& QQuickItemGrabResult::_ZTV20QQuickItemGrabResult) + 16u) - QObject (0x0x7fba0a05a9c0) 0 - primary-for QQuickItemGrabResult (0x0x7fba0a3d9a90) - -Class QQuickPaintedItem::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickPaintedItem::QPrivateSignal (0x0x7fba0a05ab40) 0 empty - -Vtable for QQuickPaintedItem -QQuickPaintedItem::_ZTV17QQuickPaintedItem: 56u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QQuickPaintedItem) -16 (int (*)(...))QQuickPaintedItem::metaObject -24 (int (*)(...))QQuickPaintedItem::qt_metacast -32 (int (*)(...))QQuickPaintedItem::qt_metacall -40 0u -48 0u -56 (int (*)(...))QQuickItem::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickItem::boundingRect -120 (int (*)(...))QQuickItem::clipRect -128 (int (*)(...))QQuickItem::contains -136 (int (*)(...))QQuickItem::inputMethodQuery -144 (int (*)(...))QQuickPaintedItem::isTextureProvider -152 (int (*)(...))QQuickPaintedItem::textureProvider -160 (int (*)(...))QQuickPaintedItem::itemChange -168 (int (*)(...))QQuickItem::classBegin -176 (int (*)(...))QQuickItem::componentComplete -184 (int (*)(...))QQuickItem::keyPressEvent -192 (int (*)(...))QQuickItem::keyReleaseEvent -200 (int (*)(...))QQuickItem::inputMethodEvent -208 (int (*)(...))QQuickItem::focusInEvent -216 (int (*)(...))QQuickItem::focusOutEvent -224 (int (*)(...))QQuickItem::mousePressEvent -232 (int (*)(...))QQuickItem::mouseMoveEvent -240 (int (*)(...))QQuickItem::mouseReleaseEvent -248 (int (*)(...))QQuickItem::mouseDoubleClickEvent -256 (int (*)(...))QQuickItem::mouseUngrabEvent -264 (int (*)(...))QQuickItem::touchUngrabEvent -272 (int (*)(...))QQuickItem::wheelEvent -280 (int (*)(...))QQuickItem::touchEvent -288 (int (*)(...))QQuickItem::hoverEnterEvent -296 (int (*)(...))QQuickItem::hoverMoveEvent -304 (int (*)(...))QQuickItem::hoverLeaveEvent -312 (int (*)(...))QQuickItem::dragEnterEvent -320 (int (*)(...))QQuickItem::dragMoveEvent -328 (int (*)(...))QQuickItem::dragLeaveEvent -336 (int (*)(...))QQuickItem::dropEvent -344 (int (*)(...))QQuickItem::childMouseEventFilter -352 (int (*)(...))QQuickItem::windowDeactivateEvent -360 (int (*)(...))QQuickItem::geometryChanged -368 (int (*)(...))QQuickPaintedItem::updatePaintNode -376 (int (*)(...))QQuickPaintedItem::releaseResources -384 (int (*)(...))QQuickItem::updatePolish -392 (int (*)(...))__cxa_pure_virtual -400 (int (*)(...))-16 -408 (int (*)(...))(& _ZTI17QQuickPaintedItem) -416 0u -424 0u -432 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem10classBeginEv -440 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem17componentCompleteEv - -Class QQuickPaintedItem - size=32 align=8 - base size=32 base align=8 -QQuickPaintedItem (0x0x7fba0a3d9af8) 0 - vptr=((& QQuickPaintedItem::_ZTV17QQuickPaintedItem) + 16u) - QQuickItem (0x0x7fba0a0d5e00) 0 - primary-for QQuickPaintedItem (0x0x7fba0a3d9af8) - QObject (0x0x7fba0a05aa80) 0 - primary-for QQuickItem (0x0x7fba0a0d5e00) - QQmlParserStatus (0x0x7fba0a05aae0) 16 - vptr=((& QQuickPaintedItem::_ZTV17QQuickPaintedItem) + 416u) - -Class QQuickRenderControl::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickRenderControl::QPrivateSignal (0x0x7fba0a05ad80) 0 empty - -Vtable for QQuickRenderControl -QQuickRenderControl::_ZTV19QQuickRenderControl: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQuickRenderControl) -16 (int (*)(...))QQuickRenderControl::metaObject -24 (int (*)(...))QQuickRenderControl::qt_metacast -32 (int (*)(...))QQuickRenderControl::qt_metacall -40 (int (*)(...))QQuickRenderControl::~QQuickRenderControl -48 (int (*)(...))QQuickRenderControl::~QQuickRenderControl -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickRenderControl::renderWindow - -Class QQuickRenderControl - size=16 align=8 - base size=16 base align=8 -QQuickRenderControl (0x0x7fba0a3d9c98) 0 - vptr=((& QQuickRenderControl::_ZTV19QQuickRenderControl) + 16u) - QObject (0x0x7fba0a05ad20) 0 - primary-for QQuickRenderControl (0x0x7fba0a3d9c98) - -Class QQuickTextDocument::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickTextDocument::QPrivateSignal (0x0x7fba0a05ae40) 0 empty - -Vtable for QQuickTextDocument -QQuickTextDocument::_ZTV18QQuickTextDocument: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QQuickTextDocument) -16 (int (*)(...))QQuickTextDocument::metaObject -24 (int (*)(...))QQuickTextDocument::qt_metacast -32 (int (*)(...))QQuickTextDocument::qt_metacall -40 (int (*)(...))QQuickTextDocument::~QQuickTextDocument -48 (int (*)(...))QQuickTextDocument::~QQuickTextDocument -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQuickTextDocument - size=16 align=8 - base size=16 base align=8 -QQuickTextDocument (0x0x7fba0a3d9d00) 0 - vptr=((& QQuickTextDocument::_ZTV18QQuickTextDocument) + 16u) - QObject (0x0x7fba0a05ade0) 0 - primary-for QQuickTextDocument (0x0x7fba0a3d9d00) - -Class QSGGeometry::Attribute - size=16 align=4 - base size=16 base align=4 -QSGGeometry::Attribute (0x0x7fba0a1741e0) 0 - -Class QSGGeometry::AttributeSet - size=16 align=8 - base size=16 base align=8 -QSGGeometry::AttributeSet (0x0x7fba0a174240) 0 - -Class QSGGeometry::Point2D - size=8 align=4 - base size=8 base align=4 -QSGGeometry::Point2D (0x0x7fba0a1742a0) 0 - -Class QSGGeometry::TexturedPoint2D - size=16 align=4 - base size=16 base align=4 -QSGGeometry::TexturedPoint2D (0x0x7fba0a174300) 0 - -Class QSGGeometry::ColoredPoint2D - size=12 align=4 - base size=12 base align=4 -QSGGeometry::ColoredPoint2D (0x0x7fba0a174360) 0 - -Vtable for QSGGeometry -QSGGeometry::_ZTV11QSGGeometry: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGGeometry) -16 (int (*)(...))QSGGeometry::~QSGGeometry -24 (int (*)(...))QSGGeometry::~QSGGeometry - -Class QSGGeometry - size=128 align=8 - base size=128 base align=8 -QSGGeometry (0x0x7fba0a174180) 0 - vptr=((& QSGGeometry::_ZTV11QSGGeometry) + 16u) - -Vtable for QSGNode -QSGNode::_ZTV7QSGNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QSGNode) -16 (int (*)(...))QSGNode::~QSGNode -24 (int (*)(...))QSGNode::~QSGNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGNode - size=80 align=8 - base size=80 base align=8 -QSGNode (0x0x7fba0a174840) 0 - vptr=((& QSGNode::_ZTV7QSGNode) + 16u) - -Vtable for QSGBasicGeometryNode -QSGBasicGeometryNode::_ZTV20QSGBasicGeometryNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGBasicGeometryNode) -16 (int (*)(...))QSGBasicGeometryNode::~QSGBasicGeometryNode -24 (int (*)(...))QSGBasicGeometryNode::~QSGBasicGeometryNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGBasicGeometryNode - size=112 align=8 - base size=112 base align=8 -QSGBasicGeometryNode (0x0x7fba0a1aa410) 0 - vptr=((& QSGBasicGeometryNode::_ZTV20QSGBasicGeometryNode) + 16u) - QSGNode (0x0x7fba0a174c00) 0 - primary-for QSGBasicGeometryNode (0x0x7fba0a1aa410) - -Vtable for QSGGeometryNode -QSGGeometryNode::_ZTV15QSGGeometryNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QSGGeometryNode) -16 (int (*)(...))QSGGeometryNode::~QSGGeometryNode -24 (int (*)(...))QSGGeometryNode::~QSGGeometryNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGGeometryNode - size=144 align=8 - base size=144 base align=8 -QSGGeometryNode (0x0x7fba0a1aa478) 0 - vptr=((& QSGGeometryNode::_ZTV15QSGGeometryNode) + 16u) - QSGBasicGeometryNode (0x0x7fba0a1aa4e0) 0 - primary-for QSGGeometryNode (0x0x7fba0a1aa478) - QSGNode (0x0x7fba0a174c60) 0 - primary-for QSGBasicGeometryNode (0x0x7fba0a1aa4e0) - -Vtable for QSGClipNode -QSGClipNode::_ZTV11QSGClipNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGClipNode) -16 (int (*)(...))QSGClipNode::~QSGClipNode -24 (int (*)(...))QSGClipNode::~QSGClipNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGClipNode - size=152 align=8 - base size=152 base align=8 -QSGClipNode (0x0x7fba0a1aa548) 0 - vptr=((& QSGClipNode::_ZTV11QSGClipNode) + 16u) - QSGBasicGeometryNode (0x0x7fba0a1aa5b0) 0 - primary-for QSGClipNode (0x0x7fba0a1aa548) - QSGNode (0x0x7fba0a174cc0) 0 - primary-for QSGBasicGeometryNode (0x0x7fba0a1aa5b0) - -Vtable for QSGTransformNode -QSGTransformNode::_ZTV16QSGTransformNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QSGTransformNode) -16 (int (*)(...))QSGTransformNode::~QSGTransformNode -24 (int (*)(...))QSGTransformNode::~QSGTransformNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGTransformNode - size=216 align=8 - base size=216 base align=8 -QSGTransformNode (0x0x7fba0a1aa618) 0 - vptr=((& QSGTransformNode::_ZTV16QSGTransformNode) + 16u) - QSGNode (0x0x7fba0a174d20) 0 - primary-for QSGTransformNode (0x0x7fba0a1aa618) - -Vtable for QSGRootNode -QSGRootNode::_ZTV11QSGRootNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGRootNode) -16 (int (*)(...))QSGRootNode::~QSGRootNode -24 (int (*)(...))QSGRootNode::~QSGRootNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGRootNode - size=88 align=8 - base size=88 base align=8 -QSGRootNode (0x0x7fba0a1aa680) 0 - vptr=((& QSGRootNode::_ZTV11QSGRootNode) + 16u) - QSGNode (0x0x7fba0a174d80) 0 - primary-for QSGRootNode (0x0x7fba0a1aa680) - -Vtable for QSGOpacityNode -QSGOpacityNode::_ZTV14QSGOpacityNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QSGOpacityNode) -16 (int (*)(...))QSGOpacityNode::~QSGOpacityNode -24 (int (*)(...))QSGOpacityNode::~QSGOpacityNode -32 (int (*)(...))QSGOpacityNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGOpacityNode - size=96 align=8 - base size=96 base align=8 -QSGOpacityNode (0x0x7fba0a1aa820) 0 - vptr=((& QSGOpacityNode::_ZTV14QSGOpacityNode) + 16u) - QSGNode (0x0x7fba0a174f00) 0 - primary-for QSGOpacityNode (0x0x7fba0a1aa820) - -Vtable for QSGNodeVisitor -QSGNodeVisitor::_ZTV14QSGNodeVisitor: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QSGNodeVisitor) -16 (int (*)(...))QSGNodeVisitor::~QSGNodeVisitor -24 (int (*)(...))QSGNodeVisitor::~QSGNodeVisitor -32 (int (*)(...))QSGNodeVisitor::enterTransformNode -40 (int (*)(...))QSGNodeVisitor::leaveTransformNode -48 (int (*)(...))QSGNodeVisitor::enterClipNode -56 (int (*)(...))QSGNodeVisitor::leaveClipNode -64 (int (*)(...))QSGNodeVisitor::enterGeometryNode -72 (int (*)(...))QSGNodeVisitor::leaveGeometryNode -80 (int (*)(...))QSGNodeVisitor::enterOpacityNode -88 (int (*)(...))QSGNodeVisitor::leaveOpacityNode -96 (int (*)(...))QSGNodeVisitor::visitNode -104 (int (*)(...))QSGNodeVisitor::visitChildren - -Class QSGNodeVisitor - size=8 align=8 - base size=8 base align=8 -QSGNodeVisitor (0x0x7fba0a174f60) 0 nearly-empty - vptr=((& QSGNodeVisitor::_ZTV14QSGNodeVisitor) + 16u) - -Vtable for QSGRendererInterface -QSGRendererInterface::_ZTV20QSGRendererInterface: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGRendererInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QSGRendererInterface::getResource -48 (int (*)(...))QSGRendererInterface::getResource -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual - -Class QSGRendererInterface - size=8 align=8 - base size=8 base align=8 -QSGRendererInterface (0x0x7fba09efb000) 0 nearly-empty - vptr=((& QSGRendererInterface::_ZTV20QSGRendererInterface) + 16u) - -Class QQuickWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickWindow::QPrivateSignal (0x0x7fba09efb420) 0 empty - -Vtable for QQuickWindow -QQuickWindow::_ZTV12QQuickWindow: 45u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QQuickWindow) -16 (int (*)(...))QQuickWindow::metaObject -24 (int (*)(...))QQuickWindow::qt_metacast -32 (int (*)(...))QQuickWindow::qt_metacall -40 (int (*)(...))QQuickWindow::~QQuickWindow -48 (int (*)(...))QQuickWindow::~QQuickWindow -56 (int (*)(...))QQuickWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QQuickWindow::accessibleRoot -144 (int (*)(...))QQuickWindow::focusObject -152 (int (*)(...))QQuickWindow::exposeEvent -160 (int (*)(...))QQuickWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QQuickWindow::focusInEvent -184 (int (*)(...))QQuickWindow::focusOutEvent -192 (int (*)(...))QQuickWindow::showEvent -200 (int (*)(...))QQuickWindow::hideEvent -208 (int (*)(...))QQuickWindow::keyPressEvent -216 (int (*)(...))QQuickWindow::keyReleaseEvent -224 (int (*)(...))QQuickWindow::mousePressEvent -232 (int (*)(...))QQuickWindow::mouseReleaseEvent -240 (int (*)(...))QQuickWindow::mouseDoubleClickEvent -248 (int (*)(...))QQuickWindow::mouseMoveEvent -256 (int (*)(...))QQuickWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))-16 -304 (int (*)(...))(& _ZTI12QQuickWindow) -312 (int (*)(...))QQuickWindow::_ZThn16_N12QQuickWindowD1Ev -320 (int (*)(...))QQuickWindow::_ZThn16_N12QQuickWindowD0Ev -328 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -336 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -344 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv - -Class QQuickWindow - size=40 align=8 - base size=40 base align=8 -QQuickWindow (0x0x7fba0a1aaa28) 0 - vptr=((& QQuickWindow::_ZTV12QQuickWindow) + 16u) - QWindow (0x0x7fba09f37e00) 0 - primary-for QQuickWindow (0x0x7fba0a1aaa28) - QObject (0x0x7fba09efb360) 0 - primary-for QWindow (0x0x7fba09f37e00) - QSurface (0x0x7fba09efb3c0) 16 - vptr=((& QQuickWindow::_ZTV12QQuickWindow) + 312u) - -Class QQuickView::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickView::QPrivateSignal (0x0x7fba09efb7e0) 0 empty - -Vtable for QQuickView -QQuickView::_ZTV10QQuickView: 45u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QQuickView) -16 (int (*)(...))QQuickView::metaObject -24 (int (*)(...))QQuickView::qt_metacast -32 (int (*)(...))QQuickView::qt_metacall -40 (int (*)(...))QQuickView::~QQuickView -48 (int (*)(...))QQuickView::~QQuickView -56 (int (*)(...))QQuickWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QQuickView::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QQuickWindow::accessibleRoot -144 (int (*)(...))QQuickWindow::focusObject -152 (int (*)(...))QQuickWindow::exposeEvent -160 (int (*)(...))QQuickView::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QQuickWindow::focusInEvent -184 (int (*)(...))QQuickWindow::focusOutEvent -192 (int (*)(...))QQuickWindow::showEvent -200 (int (*)(...))QQuickWindow::hideEvent -208 (int (*)(...))QQuickView::keyPressEvent -216 (int (*)(...))QQuickView::keyReleaseEvent -224 (int (*)(...))QQuickView::mousePressEvent -232 (int (*)(...))QQuickView::mouseReleaseEvent -240 (int (*)(...))QQuickWindow::mouseDoubleClickEvent -248 (int (*)(...))QQuickView::mouseMoveEvent -256 (int (*)(...))QQuickWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))-16 -304 (int (*)(...))(& _ZTI10QQuickView) -312 (int (*)(...))QQuickView::_ZThn16_N10QQuickViewD1Ev -320 (int (*)(...))QQuickView::_ZThn16_N10QQuickViewD0Ev -328 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -336 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -344 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv - -Class QQuickView - size=40 align=8 - base size=40 base align=8 -QQuickView (0x0x7fba0a1aab60) 0 - vptr=((& QQuickView::_ZTV10QQuickView) + 16u) - QQuickWindow (0x0x7fba0a1aabc8) 0 - primary-for QQuickView (0x0x7fba0a1aab60) - QWindow (0x0x7fba09fa84d0) 0 - primary-for QQuickWindow (0x0x7fba0a1aabc8) - QObject (0x0x7fba09efb720) 0 - primary-for QWindow (0x0x7fba09fa84d0) - QSurface (0x0x7fba09efb780) 16 - vptr=((& QQuickView::_ZTV10QQuickView) + 312u) - -Class QSGAbstractRenderer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGAbstractRenderer::QPrivateSignal (0x0x7fba09efb8a0) 0 empty - -Vtable for QSGAbstractRenderer -QSGAbstractRenderer::_ZTV19QSGAbstractRenderer: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QSGAbstractRenderer) -16 (int (*)(...))QSGAbstractRenderer::metaObject -24 (int (*)(...))QSGAbstractRenderer::qt_metacast -32 (int (*)(...))QSGAbstractRenderer::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QSGAbstractRenderer - size=16 align=8 - base size=16 base align=8 -QSGAbstractRenderer (0x0x7fba0a1aac30) 0 - vptr=((& QSGAbstractRenderer::_ZTV19QSGAbstractRenderer) + 16u) - QObject (0x0x7fba09efb840) 0 - primary-for QSGAbstractRenderer (0x0x7fba0a1aac30) - -Class QSGEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGEngine::QPrivateSignal (0x0x7fba09efbae0) 0 empty - -Vtable for QSGEngine -QSGEngine::_ZTV9QSGEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QSGEngine) -16 (int (*)(...))QSGEngine::metaObject -24 (int (*)(...))QSGEngine::qt_metacast -32 (int (*)(...))QSGEngine::qt_metacall -40 (int (*)(...))QSGEngine::~QSGEngine -48 (int (*)(...))QSGEngine::~QSGEngine -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSGEngine - size=16 align=8 - base size=16 base align=8 -QSGEngine (0x0x7fba0a1aad68) 0 - vptr=((& QSGEngine::_ZTV9QSGEngine) + 16u) - QObject (0x0x7fba09efba80) 0 - primary-for QSGEngine (0x0x7fba0a1aad68) - -Class QSGMaterialShader::RenderState - size=16 align=8 - base size=16 base align=8 -QSGMaterialShader::RenderState (0x0x7fba09efbd80) 0 - -Vtable for QSGMaterialShader -QSGMaterialShader::_ZTV17QSGMaterialShader: 12u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSGMaterialShader) -16 0u -24 0u -32 (int (*)(...))QSGMaterialShader::activate -40 (int (*)(...))QSGMaterialShader::deactivate -48 (int (*)(...))QSGMaterialShader::updateState -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))QSGMaterialShader::compile -72 (int (*)(...))QSGMaterialShader::initialize -80 (int (*)(...))QSGMaterialShader::vertexShader -88 (int (*)(...))QSGMaterialShader::fragmentShader - -Class QSGMaterialShader - size=32 align=8 - base size=32 base align=8 -QSGMaterialShader (0x0x7fba09efbd20) 0 - vptr=((& QSGMaterialShader::_ZTV17QSGMaterialShader) + 16u) - -Class QSGMaterialType - size=1 align=1 - base size=0 base align=1 -QSGMaterialType (0x0x7fba09c6e060) 0 empty - -Vtable for QSGMaterial -QSGMaterial::_ZTV11QSGMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGMaterial) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QSGMaterial::compare - -Class QSGMaterial - size=24 align=8 - base size=24 base align=8 -QSGMaterial (0x0x7fba09c6e0c0) 0 - vptr=((& QSGMaterial::_ZTV11QSGMaterial) + 16u) - -Vtable for QSGFlatColorMaterial -QSGFlatColorMaterial::_ZTV20QSGFlatColorMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGFlatColorMaterial) -16 (int (*)(...))QSGFlatColorMaterial::~QSGFlatColorMaterial -24 (int (*)(...))QSGFlatColorMaterial::~QSGFlatColorMaterial -32 (int (*)(...))QSGFlatColorMaterial::type -40 (int (*)(...))QSGFlatColorMaterial::createShader -48 (int (*)(...))QSGFlatColorMaterial::compare - -Class QSGFlatColorMaterial - size=40 align=8 - base size=40 base align=8 -QSGFlatColorMaterial (0x0x7fba09c7a0d0) 0 - vptr=((& QSGFlatColorMaterial::_ZTV20QSGFlatColorMaterial) + 16u) - QSGMaterial (0x0x7fba09c6e2a0) 0 - primary-for QSGFlatColorMaterial (0x0x7fba09c7a0d0) - -Class QSGTexture::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGTexture::QPrivateSignal (0x0x7fba09c6e360) 0 empty - -Vtable for QSGTexture -QSGTexture::_ZTV10QSGTexture: 22u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QSGTexture) -16 (int (*)(...))QSGTexture::metaObject -24 (int (*)(...))QSGTexture::qt_metacast -32 (int (*)(...))QSGTexture::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))QSGTexture::normalizedTextureSubRect -152 (int (*)(...))QSGTexture::isAtlasTexture -160 (int (*)(...))QSGTexture::removedFromAtlas -168 (int (*)(...))__cxa_pure_virtual - -Class QSGTexture - size=16 align=8 - base size=16 base align=8 -QSGTexture (0x0x7fba09c7a138) 0 - vptr=((& QSGTexture::_ZTV10QSGTexture) + 16u) - QObject (0x0x7fba09c6e300) 0 - primary-for QSGTexture (0x0x7fba09c7a138) - -Class QSGDynamicTexture::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGDynamicTexture::QPrivateSignal (0x0x7fba09c6e420) 0 empty - -Vtable for QSGDynamicTexture -QSGDynamicTexture::_ZTV17QSGDynamicTexture: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSGDynamicTexture) -16 (int (*)(...))QSGDynamicTexture::metaObject -24 (int (*)(...))QSGDynamicTexture::qt_metacast -32 (int (*)(...))QSGDynamicTexture::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))QSGTexture::normalizedTextureSubRect -152 (int (*)(...))QSGTexture::isAtlasTexture -160 (int (*)(...))QSGTexture::removedFromAtlas -168 (int (*)(...))__cxa_pure_virtual -176 (int (*)(...))__cxa_pure_virtual - -Class QSGDynamicTexture - size=16 align=8 - base size=16 base align=8 -QSGDynamicTexture (0x0x7fba09c7a1a0) 0 - vptr=((& QSGDynamicTexture::_ZTV17QSGDynamicTexture) + 16u) - QSGTexture (0x0x7fba09c7a208) 0 - primary-for QSGDynamicTexture (0x0x7fba09c7a1a0) - QObject (0x0x7fba09c6e3c0) 0 - primary-for QSGTexture (0x0x7fba09c7a208) - -Vtable for QSGImageNode -QSGImageNode::_ZTV12QSGImageNode: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QSGImageNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual - -Class QSGImageNode - size=144 align=8 - base size=144 base align=8 -QSGImageNode (0x0x7fba09c7a270) 0 - vptr=((& QSGImageNode::_ZTV12QSGImageNode) + 16u) - QSGGeometryNode (0x0x7fba09c7a2d8) 0 - primary-for QSGImageNode (0x0x7fba09c7a270) - QSGBasicGeometryNode (0x0x7fba09c7a340) 0 - primary-for QSGGeometryNode (0x0x7fba09c7a2d8) - QSGNode (0x0x7fba09c6e480) 0 - primary-for QSGBasicGeometryNode (0x0x7fba09c7a340) - -Vtable for QSGNinePatchNode -QSGNinePatchNode::_ZTV16QSGNinePatchNode: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QSGNinePatchNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual - -Class QSGNinePatchNode - size=144 align=8 - base size=144 base align=8 -QSGNinePatchNode (0x0x7fba09c7a478) 0 - vptr=((& QSGNinePatchNode::_ZTV16QSGNinePatchNode) + 16u) - QSGGeometryNode (0x0x7fba09c7a4e0) 0 - primary-for QSGNinePatchNode (0x0x7fba09c7a478) - QSGBasicGeometryNode (0x0x7fba09c7a548) 0 - primary-for QSGGeometryNode (0x0x7fba09c7a4e0) - QSGNode (0x0x7fba09c6e660) 0 - primary-for QSGBasicGeometryNode (0x0x7fba09c7a548) - -Vtable for QSGRectangleNode -QSGRectangleNode::_ZTV16QSGRectangleNode: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QSGRectangleNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual - -Class QSGRectangleNode - size=144 align=8 - base size=144 base align=8 -QSGRectangleNode (0x0x7fba09c7a5b0) 0 - vptr=((& QSGRectangleNode::_ZTV16QSGRectangleNode) + 16u) - QSGGeometryNode (0x0x7fba09c7a618) 0 - primary-for QSGRectangleNode (0x0x7fba09c7a5b0) - QSGBasicGeometryNode (0x0x7fba09c7a680) 0 - primary-for QSGGeometryNode (0x0x7fba09c7a618) - QSGNode (0x0x7fba09c6e6c0) 0 - primary-for QSGBasicGeometryNode (0x0x7fba09c7a680) - -Vtable for QSGRenderNode::RenderState -QSGRenderNode::RenderState::_ZTVN13QSGRenderNode11RenderStateE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN13QSGRenderNode11RenderStateE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))QSGRenderNode::RenderState::get - -Class QSGRenderNode::RenderState - size=8 align=8 - base size=8 base align=8 -QSGRenderNode::RenderState (0x0x7fba09c6e780) 0 nearly-empty - vptr=((& QSGRenderNode::RenderState::_ZTVN13QSGRenderNode11RenderStateE) + 16u) - -Vtable for QSGRenderNode -QSGRenderNode::_ZTV13QSGRenderNode: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QSGRenderNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))QSGRenderNode::changedStates -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))QSGRenderNode::releaseResources -72 (int (*)(...))QSGRenderNode::flags -80 (int (*)(...))QSGRenderNode::rect - -Class QSGRenderNode - size=88 align=8 - base size=88 base align=8 -QSGRenderNode (0x0x7fba09c7a6e8) 0 - vptr=((& QSGRenderNode::_ZTV13QSGRenderNode) + 16u) - QSGNode (0x0x7fba09c6e720) 0 - primary-for QSGRenderNode (0x0x7fba09c7a6e8) - -Vtable for QSGSimpleRectNode -QSGSimpleRectNode::_ZTV17QSGSimpleRectNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSGSimpleRectNode) -16 (int (*)(...))QSGSimpleRectNode::~QSGSimpleRectNode -24 (int (*)(...))QSGSimpleRectNode::~QSGSimpleRectNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGSimpleRectNode - size=320 align=8 - base size=320 base align=8 -QSGSimpleRectNode (0x0x7fba09c7ab60) 0 - vptr=((& QSGSimpleRectNode::_ZTV17QSGSimpleRectNode) + 16u) - QSGGeometryNode (0x0x7fba09c7abc8) 0 - primary-for QSGSimpleRectNode (0x0x7fba09c7ab60) - QSGBasicGeometryNode (0x0x7fba09c7ac30) 0 - primary-for QSGGeometryNode (0x0x7fba09c7abc8) - QSGNode (0x0x7fba09c6ed80) 0 - primary-for QSGBasicGeometryNode (0x0x7fba09c7ac30) - -Vtable for QSGOpaqueTextureMaterial -QSGOpaqueTextureMaterial::_ZTV24QSGOpaqueTextureMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QSGOpaqueTextureMaterial) -16 (int (*)(...))QSGOpaqueTextureMaterial::~QSGOpaqueTextureMaterial -24 (int (*)(...))QSGOpaqueTextureMaterial::~QSGOpaqueTextureMaterial -32 (int (*)(...))QSGOpaqueTextureMaterial::type -40 (int (*)(...))QSGOpaqueTextureMaterial::createShader -48 (int (*)(...))QSGOpaqueTextureMaterial::compare - -Class QSGOpaqueTextureMaterial - size=40 align=8 - base size=36 base align=8 -QSGOpaqueTextureMaterial (0x0x7fba09c7ac98) 0 - vptr=((& QSGOpaqueTextureMaterial::_ZTV24QSGOpaqueTextureMaterial) + 16u) - QSGMaterial (0x0x7fba09c6ede0) 0 - primary-for QSGOpaqueTextureMaterial (0x0x7fba09c7ac98) - -Vtable for QSGTextureMaterial -QSGTextureMaterial::_ZTV18QSGTextureMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QSGTextureMaterial) -16 (int (*)(...))QSGTextureMaterial::~QSGTextureMaterial -24 (int (*)(...))QSGTextureMaterial::~QSGTextureMaterial -32 (int (*)(...))QSGTextureMaterial::type -40 (int (*)(...))QSGTextureMaterial::createShader -48 (int (*)(...))QSGOpaqueTextureMaterial::compare - -Class QSGTextureMaterial - size=40 align=8 - base size=36 base align=8 -QSGTextureMaterial (0x0x7fba09c7ad00) 0 - vptr=((& QSGTextureMaterial::_ZTV18QSGTextureMaterial) + 16u) - QSGOpaqueTextureMaterial (0x0x7fba09c7ad68) 0 - primary-for QSGTextureMaterial (0x0x7fba09c7ad00) - QSGMaterial (0x0x7fba09c6ee40) 0 - primary-for QSGOpaqueTextureMaterial (0x0x7fba09c7ad68) - -Vtable for QSGSimpleTextureNode -QSGSimpleTextureNode::_ZTV20QSGSimpleTextureNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGSimpleTextureNode) -16 (int (*)(...))QSGSimpleTextureNode::~QSGSimpleTextureNode -24 (int (*)(...))QSGSimpleTextureNode::~QSGSimpleTextureNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGSimpleTextureNode - size=384 align=8 - base size=384 base align=8 -QSGSimpleTextureNode (0x0x7fba09c7add0) 0 - vptr=((& QSGSimpleTextureNode::_ZTV20QSGSimpleTextureNode) + 16u) - QSGGeometryNode (0x0x7fba09c7ae38) 0 - primary-for QSGSimpleTextureNode (0x0x7fba09c7add0) - QSGBasicGeometryNode (0x0x7fba09c7aea0) 0 - primary-for QSGGeometryNode (0x0x7fba09c7ae38) - QSGNode (0x0x7fba09c6eea0) 0 - primary-for QSGBasicGeometryNode (0x0x7fba09c7aea0) - -Class QSGTextureProvider::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGTextureProvider::QPrivateSignal (0x0x7fba09a37180) 0 empty - -Vtable for QSGTextureProvider -QSGTextureProvider::_ZTV18QSGTextureProvider: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QSGTextureProvider) -16 (int (*)(...))QSGTextureProvider::metaObject -24 (int (*)(...))QSGTextureProvider::qt_metacast -32 (int (*)(...))QSGTextureProvider::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QSGTextureProvider - size=16 align=8 - base size=16 base align=8 -QSGTextureProvider (0x0x7fba09a3a068) 0 - vptr=((& QSGTextureProvider::_ZTV18QSGTextureProvider) + 16u) - QObject (0x0x7fba09a37120) 0 - primary-for QSGTextureProvider (0x0x7fba09a3a068) - -Vtable for QSGVertexColorMaterial -QSGVertexColorMaterial::_ZTV22QSGVertexColorMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QSGVertexColorMaterial) -16 (int (*)(...))QSGVertexColorMaterial::~QSGVertexColorMaterial -24 (int (*)(...))QSGVertexColorMaterial::~QSGVertexColorMaterial -32 (int (*)(...))QSGVertexColorMaterial::type -40 (int (*)(...))QSGVertexColorMaterial::createShader -48 (int (*)(...))QSGVertexColorMaterial::compare - -Class QSGVertexColorMaterial - size=24 align=8 - base size=24 base align=8 -QSGVertexColorMaterial (0x0x7fba09a3a0d0) 0 - vptr=((& QSGVertexColorMaterial::_ZTV22QSGVertexColorMaterial) + 16u) - QSGMaterial (0x0x7fba09a371e0) 0 - primary-for QSGVertexColorMaterial (0x0x7fba09a3a0d0) - -Class QQuickStyle - size=1 align=1 - base size=0 base align=1 -QQuickStyle (0x0x7fba09a37240) 0 empty - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt qtquickcontrols2-opensource-src-5.9.5/tests/auto/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,10993 +0,0 @@ -Class std::__failure_type - size=1 align=1 - base size=0 base align=1 -std::__failure_type (0x0x7f64f1187e40) 0 empty - -Class std::__do_is_destructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_destructible_impl (0x0x7f64f0d9a600) 0 empty - -Class std::__do_is_nt_destructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_nt_destructible_impl (0x0x7f64f0d9a840) 0 empty - -Class std::__do_is_default_constructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_default_constructible_impl (0x0x7f64f0d9aa80) 0 empty - -Class std::__do_is_static_castable_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_static_castable_impl (0x0x7f64f0d9acc0) 0 empty - -Class std::__do_is_direct_constructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_direct_constructible_impl (0x0x7f64f0d9ae40) 0 empty - -Class std::__do_is_nary_constructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_nary_constructible_impl (0x0x7f64f0dce240) 0 empty - -Class std::__do_common_type_impl - size=1 align=1 - base size=0 base align=1 -std::__do_common_type_impl (0x0x7f64f0e539c0) 0 empty - -Class std::__do_member_type_wrapper - size=1 align=1 - base size=0 base align=1 -std::__do_member_type_wrapper (0x0x7f64f0e53a80) 0 empty - -Class std::__result_of_memfun_ref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memfun_ref_impl (0x0x7f64f0e53de0) 0 empty - -Class std::__result_of_memfun_deref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memfun_deref_impl (0x0x7f64f0e53ea0) 0 empty - -Class std::__result_of_memobj_ref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memobj_ref_impl (0x0x7f64f0e53f60) 0 empty - -Class std::__result_of_memobj_deref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memobj_deref_impl (0x0x7f64f0e8b060) 0 empty - -Class std::__result_of_other_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_other_impl (0x0x7f64f0e8b300) 0 empty - -Class std::piecewise_construct_t - size=1 align=1 - base size=0 base align=1 -std::piecewise_construct_t (0x0x7f64f0e8b4e0) 0 empty - -Class std::__true_type - size=1 align=1 - base size=0 base align=1 -std::__true_type (0x0x7f64f0e8b960) 0 empty - -Class std::__false_type - size=1 align=1 - base size=0 base align=1 -std::__false_type (0x0x7f64f0e8b9c0) 0 empty - -Class std::input_iterator_tag - size=1 align=1 - base size=0 base align=1 -std::input_iterator_tag (0x0x7f64f0f38660) 0 empty - -Class std::output_iterator_tag - size=1 align=1 - base size=0 base align=1 -std::output_iterator_tag (0x0x7f64f0f386c0) 0 empty - -Class std::forward_iterator_tag - size=1 align=1 - base size=1 base align=1 -std::forward_iterator_tag (0x0x7f64f0e993a8) 0 empty - std::input_iterator_tag (0x0x7f64f0f38720) 0 empty - -Class std::bidirectional_iterator_tag - size=1 align=1 - base size=1 base align=1 -std::bidirectional_iterator_tag (0x0x7f64f0e99410) 0 empty - std::forward_iterator_tag (0x0x7f64f0e99478) 0 empty - std::input_iterator_tag (0x0x7f64f0f38780) 0 empty - -Class std::random_access_iterator_tag - size=1 align=1 - base size=1 base align=1 -std::random_access_iterator_tag (0x0x7f64f0e994e0) 0 empty - std::bidirectional_iterator_tag (0x0x7f64f0e99548) 0 empty - std::forward_iterator_tag (0x0x7f64f0e995b0) 0 empty - std::input_iterator_tag (0x0x7f64f0f387e0) 0 empty - -Class __gnu_cxx::__ops::_Iter_less_iter - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_less_iter (0x0x7f64f0f7d480) 0 empty - -Class __gnu_cxx::__ops::_Iter_less_val - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_less_val (0x0x7f64f0f7d4e0) 0 empty - -Class __gnu_cxx::__ops::_Val_less_iter - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Val_less_iter (0x0x7f64f0f7d540) 0 empty - -Class __gnu_cxx::__ops::_Iter_equal_to_iter - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_equal_to_iter (0x0x7f64f0f7d5a0) 0 empty - -Class __gnu_cxx::__ops::_Iter_equal_to_val - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_equal_to_val (0x0x7f64f0f7d600) 0 empty - -Class wait - size=4 align=4 - base size=4 base align=4 -wait (0x0x7f64f0c84120) 0 - -Class __locale_struct - size=232 align=8 - base size=232 base align=8 -__locale_struct (0x0x7f64f0c84360) 0 - -Class timespec - size=16 align=8 - base size=16 base align=8 -timespec (0x0x7f64f0c84420) 0 - -Class timeval - size=16 align=8 - base size=16 base align=8 -timeval (0x0x7f64f0c84480) 0 - -Class pthread_attr_t - size=56 align=8 - base size=56 base align=8 -pthread_attr_t (0x0x7f64f0c84540) 0 - -Class __pthread_internal_list - size=16 align=8 - base size=16 base align=8 -__pthread_internal_list (0x0x7f64f0c845a0) 0 - -Class random_data - size=48 align=8 - base size=48 base align=8 -random_data (0x0x7f64f0c84a20) 0 - -Class drand48_data - size=24 align=8 - base size=24 base align=8 -drand48_data (0x0x7f64f0c84a80) 0 - -Vtable for std::exception -std::exception::_ZTVSt9exception: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt9exception) -16 (int (*)(...))std::exception::~exception -24 (int (*)(...))std::exception::~exception -32 (int (*)(...))std::exception::what - -Class std::exception - size=8 align=8 - base size=8 base align=8 -std::exception (0x0x7f64f0c84ae0) 0 nearly-empty - vptr=((& std::exception::_ZTVSt9exception) + 16u) - -Vtable for std::bad_exception -std::bad_exception::_ZTVSt13bad_exception: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13bad_exception) -16 (int (*)(...))std::bad_exception::~bad_exception -24 (int (*)(...))std::bad_exception::~bad_exception -32 (int (*)(...))std::bad_exception::what - -Class std::bad_exception - size=8 align=8 - base size=8 base align=8 -std::bad_exception (0x0x7f64f0e99af8) 0 nearly-empty - vptr=((& std::bad_exception::_ZTVSt13bad_exception) + 16u) - std::exception (0x0x7f64f0c84b40) 0 nearly-empty - primary-for std::bad_exception (0x0x7f64f0e99af8) - -Class std::__exception_ptr::exception_ptr - size=8 align=8 - base size=8 base align=8 -std::__exception_ptr::exception_ptr (0x0x7f64f0c84ba0) 0 - -Vtable for std::nested_exception -std::nested_exception::_ZTVSt16nested_exception: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt16nested_exception) -16 (int (*)(...))std::nested_exception::~nested_exception -24 (int (*)(...))std::nested_exception::~nested_exception - -Class std::nested_exception - size=16 align=8 - base size=16 base align=8 -std::nested_exception (0x0x7f64f0c84c00) 0 - vptr=((& std::nested_exception::_ZTVSt16nested_exception) + 16u) - -Vtable for std::bad_alloc -std::bad_alloc::_ZTVSt9bad_alloc: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt9bad_alloc) -16 (int (*)(...))std::bad_alloc::~bad_alloc -24 (int (*)(...))std::bad_alloc::~bad_alloc -32 (int (*)(...))std::bad_alloc::what - -Class std::bad_alloc - size=8 align=8 - base size=8 base align=8 -std::bad_alloc (0x0x7f64f0e99d00) 0 nearly-empty - vptr=((& std::bad_alloc::_ZTVSt9bad_alloc) + 16u) - std::exception (0x0x7f64f09b1060) 0 nearly-empty - primary-for std::bad_alloc (0x0x7f64f0e99d00) - -Vtable for std::bad_array_new_length -std::bad_array_new_length::_ZTVSt20bad_array_new_length: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt20bad_array_new_length) -16 (int (*)(...))std::bad_array_new_length::~bad_array_new_length -24 (int (*)(...))std::bad_array_new_length::~bad_array_new_length -32 (int (*)(...))std::bad_array_new_length::what - -Class std::bad_array_new_length - size=8 align=8 - base size=8 base align=8 -std::bad_array_new_length (0x0x7f64f0e99d68) 0 nearly-empty - vptr=((& std::bad_array_new_length::_ZTVSt20bad_array_new_length) + 16u) - std::bad_alloc (0x0x7f64f0e99dd0) 0 nearly-empty - primary-for std::bad_array_new_length (0x0x7f64f0e99d68) - std::exception (0x0x7f64f09b10c0) 0 nearly-empty - primary-for std::bad_alloc (0x0x7f64f0e99dd0) - -Class std::nothrow_t - size=1 align=1 - base size=0 base align=1 -std::nothrow_t (0x0x7f64f09b1120) 0 empty - -Class __exception - size=40 align=8 - base size=40 base align=8 -__exception (0x0x7f64f09b1d20) 0 - -Class lconv - size=96 align=8 - base size=96 base align=8 -lconv (0x0x7f64f07b0a20) 0 - -Vtable for __cxxabiv1::__forced_unwind -__cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN10__cxxabiv115__forced_unwindE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class __cxxabiv1::__forced_unwind - size=8 align=8 - base size=8 base align=8 -__cxxabiv1::__forced_unwind (0x0x7f64f07b0a80) 0 nearly-empty - vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 16u) - -Class sched_param - size=4 align=4 - base size=4 base align=4 -sched_param (0x0x7f64f08b7960) 0 - -Class __sched_param - size=4 align=4 - base size=4 base align=4 -__sched_param (0x0x7f64f08b79c0) 0 - -Class timex - size=208 align=8 - base size=208 base align=8 -timex (0x0x7f64f08b7a80) 0 - -Class tm - size=56 align=8 - base size=56 base align=8 -tm (0x0x7f64f08b7ae0) 0 - -Class itimerspec - size=32 align=8 - base size=32 base align=8 -itimerspec (0x0x7f64f08b7b40) 0 - -Class _pthread_cleanup_buffer - size=32 align=8 - base size=32 base align=8 -_pthread_cleanup_buffer (0x0x7f64f08b7ba0) 0 - -Class __pthread_cleanup_frame - size=24 align=8 - base size=24 base align=8 -__pthread_cleanup_frame (0x0x7f64f08b7cc0) 0 - -Class __pthread_cleanup_class - size=24 align=8 - base size=24 base align=8 -__pthread_cleanup_class (0x0x7f64f08b7d20) 0 - -Class _IO_marker - size=24 align=8 - base size=24 base align=8 -_IO_marker (0x0x7f64f0621180) 0 - -Class _IO_FILE - size=216 align=8 - base size=216 base align=8 -_IO_FILE (0x0x7f64f06211e0) 0 - -Class std::_Hash_impl - size=1 align=1 - base size=0 base align=1 -std::_Hash_impl (0x0x7f64f04079c0) 0 empty - -Class std::_Fnv_hash_impl - size=1 align=1 - base size=0 base align=1 -std::_Fnv_hash_impl (0x0x7f64f0407a20) 0 empty - -Class std::__numeric_limits_base - size=1 align=1 - base size=0 base align=1 -std::__numeric_limits_base (0x0x7f64f043d9c0) 0 empty - -Class std::_Bit_reference - size=16 align=8 - base size=16 base align=8 -std::_Bit_reference (0x0x7f64f02247e0) 0 - -Class std::_Bit_iterator_base - size=16 align=8 - base size=12 base align=8 -std::_Bit_iterator_base (0x0x7f64f0434b60) 0 - std::iterator (0x0x7f64f02248a0) 0 empty - -Class std::_Bit_iterator - size=16 align=8 - base size=12 base align=8 -std::_Bit_iterator (0x0x7f64f0434bc8) 0 - std::_Bit_iterator_base (0x0x7f64f0434c30) 0 - std::iterator (0x0x7f64f0224900) 0 empty - -Class std::_Bit_const_iterator - size=16 align=8 - base size=12 base align=8 -std::_Bit_const_iterator (0x0x7f64f0434c98) 0 - std::_Bit_iterator_base (0x0x7f64f0434d00) 0 - std::iterator (0x0x7f64f0224960) 0 empty - -Class std::random_device - size=5000 align=8 - base size=5000 base align=8 -std::random_device (0x0x7f64f0072780) 0 - -Class std::bernoulli_distribution::param_type - size=8 align=8 - base size=8 base align=8 -std::bernoulli_distribution::param_type (0x0x7f64f0145540) 0 - -Class std::bernoulli_distribution - size=8 align=8 - base size=8 base align=8 -std::bernoulli_distribution (0x0x7f64f01454e0) 0 - -Class std::seed_seq - size=24 align=8 - base size=24 base align=8 -std::seed_seq (0x0x7f64efef84e0) 0 - -Class qIsNull(double)::U - size=8 align=8 - base size=8 base align=8 -qIsNull(double)::U (0x0x7f64eeabf000) 0 - -Class qIsNull(float)::U - size=4 align=4 - base size=4 base align=4 -qIsNull(float)::U (0x0x7f64eeabf060) 0 - -Class QSysInfo - size=1 align=1 - base size=0 base align=1 -QSysInfo (0x0x7f64ee753ae0) 0 empty - -Class QMessageLogContext - size=32 align=8 - base size=32 base align=8 -QMessageLogContext (0x0x7f64ee753b40) 0 - -Class QMessageLogger - size=32 align=8 - base size=32 base align=8 -QMessageLogger (0x0x7f64ee753ba0) 0 - -Class QFlag - size=4 align=4 - base size=4 base align=4 -QFlag (0x0x7f64ee753c00) 0 - -Class QIncompatibleFlag - size=4 align=4 - base size=4 base align=4 -QIncompatibleFlag (0x0x7f64ee753ea0) 0 - -Class std::__atomic_flag_base - size=1 align=1 - base size=1 base align=1 -std::__atomic_flag_base (0x0x7f64ee7c1420) 0 - -Class std::atomic_flag - size=1 align=1 - base size=1 base align=1 -std::atomic_flag (0x0x7f64ee759a28) 0 - std::__atomic_flag_base (0x0x7f64ee7c1480) 0 - -Class QAtomicInt - size=4 align=4 - base size=4 base align=4 -QAtomicInt (0x0x7f64ee6d51a0) 0 - QAtomicInteger (0x0x7f64ee6d5208) 0 - QBasicAtomicInteger (0x0x7f64ee5e2ba0) 0 - -Class QInternal - size=1 align=1 - base size=0 base align=1 -QInternal (0x0x7f64edf6a180) 0 empty - -Class QtPrivate::QSlotObjectBase - size=16 align=8 - base size=16 base align=8 -QtPrivate::QSlotObjectBase (0x0x7f64edfdc1e0) 0 - -Class QGenericArgument - size=16 align=8 - base size=16 base align=8 -QGenericArgument (0x0x7f64edfdc300) 0 - -Class QGenericReturnArgument - size=16 align=8 - base size=16 base align=8 -QGenericReturnArgument (0x0x7f64ee196c30) 0 - QGenericArgument (0x0x7f64edfdc360) 0 - -Class QMetaObject - size=48 align=8 - base size=48 base align=8 -QMetaObject (0x0x7f64edfdc4e0) 0 - -Class QMetaObject::Connection - size=8 align=8 - base size=8 base align=8 -QMetaObject::Connection (0x0x7f64edfdc5a0) 0 - -Class QLatin1Char - size=1 align=1 - base size=1 base align=1 -QLatin1Char (0x0x7f64ee0ba600) 0 - -Class QChar - size=2 align=2 - base size=2 base align=2 -QChar (0x0x7f64ee0ba660) 0 - -Class QtPrivate::RefCount - size=4 align=4 - base size=4 base align=4 -QtPrivate::RefCount (0x0x7f64ee0ba900) 0 - -Class QArrayData - size=24 align=8 - base size=24 base align=8 -QArrayData (0x0x7f64ee0ba960) 0 - -Class QtPrivate::QContainerImplHelper - size=1 align=1 - base size=0 base align=1 -QtPrivate::QContainerImplHelper (0x0x7f64ee0bacc0) 0 empty - -Class std::locale - size=8 align=8 - base size=8 base align=8 -std::locale (0x0x7f64ee0bad20) 0 - -Vtable for std::locale::facet -std::locale::facet::_ZTVNSt6locale5facetE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt6locale5facetE) -16 (int (*)(...))std::locale::facet::~facet -24 (int (*)(...))std::locale::facet::~facet - -Class std::locale::facet - size=16 align=8 - base size=12 base align=8 -std::locale::facet (0x0x7f64ee0bad80) 0 - vptr=((& std::locale::facet::_ZTVNSt6locale5facetE) + 16u) - -Class std::locale::id - size=8 align=8 - base size=8 base align=8 -std::locale::id (0x0x7f64ee0bade0) 0 - -Class std::locale::_Impl - size=40 align=8 - base size=40 base align=8 -std::locale::_Impl (0x0x7f64ee0bae40) 0 - -Class std::__cow_string - size=8 align=8 - base size=8 base align=8 -std::__cow_string (0x0x7f64ede40240) 0 - -Vtable for std::logic_error -std::logic_error::_ZTVSt11logic_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt11logic_error) -16 (int (*)(...))std::logic_error::~logic_error -24 (int (*)(...))std::logic_error::~logic_error -32 (int (*)(...))std::logic_error::what - -Class std::logic_error - size=16 align=8 - base size=16 base align=8 -std::logic_error (0x0x7f64ede5a208) 0 - vptr=((& std::logic_error::_ZTVSt11logic_error) + 16u) - std::exception (0x0x7f64ede40300) 0 nearly-empty - primary-for std::logic_error (0x0x7f64ede5a208) - -Vtable for std::domain_error -std::domain_error::_ZTVSt12domain_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12domain_error) -16 (int (*)(...))std::domain_error::~domain_error -24 (int (*)(...))std::domain_error::~domain_error -32 (int (*)(...))std::logic_error::what - -Class std::domain_error - size=16 align=8 - base size=16 base align=8 -std::domain_error (0x0x7f64ede5a270) 0 - vptr=((& std::domain_error::_ZTVSt12domain_error) + 16u) - std::logic_error (0x0x7f64ede5a2d8) 0 - primary-for std::domain_error (0x0x7f64ede5a270) - std::exception (0x0x7f64ede40360) 0 nearly-empty - primary-for std::logic_error (0x0x7f64ede5a2d8) - -Vtable for std::invalid_argument -std::invalid_argument::_ZTVSt16invalid_argument: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt16invalid_argument) -16 (int (*)(...))std::invalid_argument::~invalid_argument -24 (int (*)(...))std::invalid_argument::~invalid_argument -32 (int (*)(...))std::logic_error::what - -Class std::invalid_argument - size=16 align=8 - base size=16 base align=8 -std::invalid_argument (0x0x7f64ede5a340) 0 - vptr=((& std::invalid_argument::_ZTVSt16invalid_argument) + 16u) - std::logic_error (0x0x7f64ede5a3a8) 0 - primary-for std::invalid_argument (0x0x7f64ede5a340) - std::exception (0x0x7f64ede403c0) 0 nearly-empty - primary-for std::logic_error (0x0x7f64ede5a3a8) - -Vtable for std::length_error -std::length_error::_ZTVSt12length_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12length_error) -16 (int (*)(...))std::length_error::~length_error -24 (int (*)(...))std::length_error::~length_error -32 (int (*)(...))std::logic_error::what - -Class std::length_error - size=16 align=8 - base size=16 base align=8 -std::length_error (0x0x7f64ede5a410) 0 - vptr=((& std::length_error::_ZTVSt12length_error) + 16u) - std::logic_error (0x0x7f64ede5a478) 0 - primary-for std::length_error (0x0x7f64ede5a410) - std::exception (0x0x7f64ede40420) 0 nearly-empty - primary-for std::logic_error (0x0x7f64ede5a478) - -Vtable for std::out_of_range -std::out_of_range::_ZTVSt12out_of_range: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12out_of_range) -16 (int (*)(...))std::out_of_range::~out_of_range -24 (int (*)(...))std::out_of_range::~out_of_range -32 (int (*)(...))std::logic_error::what - -Class std::out_of_range - size=16 align=8 - base size=16 base align=8 -std::out_of_range (0x0x7f64ede5a4e0) 0 - vptr=((& std::out_of_range::_ZTVSt12out_of_range) + 16u) - std::logic_error (0x0x7f64ede5a548) 0 - primary-for std::out_of_range (0x0x7f64ede5a4e0) - std::exception (0x0x7f64ede40480) 0 nearly-empty - primary-for std::logic_error (0x0x7f64ede5a548) - -Vtable for std::runtime_error -std::runtime_error::_ZTVSt13runtime_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13runtime_error) -16 (int (*)(...))std::runtime_error::~runtime_error -24 (int (*)(...))std::runtime_error::~runtime_error -32 (int (*)(...))std::runtime_error::what - -Class std::runtime_error - size=16 align=8 - base size=16 base align=8 -std::runtime_error (0x0x7f64ede5a5b0) 0 - vptr=((& std::runtime_error::_ZTVSt13runtime_error) + 16u) - std::exception (0x0x7f64ede404e0) 0 nearly-empty - primary-for std::runtime_error (0x0x7f64ede5a5b0) - -Vtable for std::range_error -std::range_error::_ZTVSt11range_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt11range_error) -16 (int (*)(...))std::range_error::~range_error -24 (int (*)(...))std::range_error::~range_error -32 (int (*)(...))std::runtime_error::what - -Class std::range_error - size=16 align=8 - base size=16 base align=8 -std::range_error (0x0x7f64ede5a618) 0 - vptr=((& std::range_error::_ZTVSt11range_error) + 16u) - std::runtime_error (0x0x7f64ede5a680) 0 - primary-for std::range_error (0x0x7f64ede5a618) - std::exception (0x0x7f64ede40540) 0 nearly-empty - primary-for std::runtime_error (0x0x7f64ede5a680) - -Vtable for std::overflow_error -std::overflow_error::_ZTVSt14overflow_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14overflow_error) -16 (int (*)(...))std::overflow_error::~overflow_error -24 (int (*)(...))std::overflow_error::~overflow_error -32 (int (*)(...))std::runtime_error::what - -Class std::overflow_error - size=16 align=8 - base size=16 base align=8 -std::overflow_error (0x0x7f64ede5a6e8) 0 - vptr=((& std::overflow_error::_ZTVSt14overflow_error) + 16u) - std::runtime_error (0x0x7f64ede5a750) 0 - primary-for std::overflow_error (0x0x7f64ede5a6e8) - std::exception (0x0x7f64ede405a0) 0 nearly-empty - primary-for std::runtime_error (0x0x7f64ede5a750) - -Vtable for std::underflow_error -std::underflow_error::_ZTVSt15underflow_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt15underflow_error) -16 (int (*)(...))std::underflow_error::~underflow_error -24 (int (*)(...))std::underflow_error::~underflow_error -32 (int (*)(...))std::runtime_error::what - -Class std::underflow_error - size=16 align=8 - base size=16 base align=8 -std::underflow_error (0x0x7f64ede5a7b8) 0 - vptr=((& std::underflow_error::_ZTVSt15underflow_error) + 16u) - std::runtime_error (0x0x7f64ede5a820) 0 - primary-for std::underflow_error (0x0x7f64ede5a7b8) - std::exception (0x0x7f64ede40600) 0 nearly-empty - primary-for std::runtime_error (0x0x7f64ede5a820) - -Vtable for std::_V2::error_category -std::_V2::error_category::_ZTVNSt3_V214error_categoryE: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt3_V214error_categoryE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))std::_V2::error_category::_M_message -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))std::_V2::error_category::default_error_condition -64 (int (*)(...))std::_V2::error_category::equivalent -72 (int (*)(...))std::_V2::error_category::equivalent - -Class std::_V2::error_category - size=8 align=8 - base size=8 base align=8 -std::_V2::error_category (0x0x7f64ede40780) 0 nearly-empty - vptr=((& std::_V2::error_category::_ZTVNSt3_V214error_categoryE) + 16u) - -Class std::error_code - size=16 align=8 - base size=16 base align=8 -std::error_code (0x0x7f64ede409c0) 0 - -Class std::error_condition - size=16 align=8 - base size=16 base align=8 -std::error_condition (0x0x7f64ede40b40) 0 - -Vtable for std::system_error -std::system_error::_ZTVSt12system_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12system_error) -16 (int (*)(...))std::system_error::~system_error -24 (int (*)(...))std::system_error::~system_error -32 (int (*)(...))std::runtime_error::what - -Class std::system_error - size=32 align=8 - base size=32 base align=8 -std::system_error (0x0x7f64ede5ad00) 0 - vptr=((& std::system_error::_ZTVSt12system_error) + 16u) - std::runtime_error (0x0x7f64ede5ad68) 0 - primary-for std::system_error (0x0x7f64ede5ad00) - std::exception (0x0x7f64ede40d80) 0 nearly-empty - primary-for std::runtime_error (0x0x7f64ede5ad68) - -Vtable for std::ios_base::failure -std::ios_base::failure::_ZTVNSt8ios_base7failureB5cxx11E: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt8ios_base7failureB5cxx11E) -16 (int (*)(...))std::ios_base::failure::~failure -24 (int (*)(...))std::ios_base::failure::~failure -32 (int (*)(...))std::ios_base::failure::what - -Class std::ios_base::failure - size=32 align=8 - base size=32 base align=8 -std::ios_base::failure (0x0x7f64edaf28f0) 0 - vptr=((& std::ios_base::failure::_ZTVNSt8ios_base7failureB5cxx11E) + 16u) - std::system_error (0x0x7f64edaf2958) 0 - primary-for std::ios_base::failure (0x0x7f64edaf28f0) - std::runtime_error (0x0x7f64edaf29c0) 0 - primary-for std::system_error (0x0x7f64edaf2958) - std::exception (0x0x7f64edb200c0) 0 nearly-empty - primary-for std::runtime_error (0x0x7f64edaf29c0) - -Class std::ios_base::_Callback_list - size=24 align=8 - base size=24 base align=8 -std::ios_base::_Callback_list (0x0x7f64edb20120) 0 - -Class std::ios_base::_Words - size=16 align=8 - base size=16 base align=8 -std::ios_base::_Words (0x0x7f64edb20180) 0 - -Class std::ios_base::Init - size=1 align=1 - base size=0 base align=1 -std::ios_base::Init (0x0x7f64edb201e0) 0 empty - -Vtable for std::ios_base -std::ios_base::_ZTVSt8ios_base: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt8ios_base) -16 (int (*)(...))std::ios_base::~ios_base -24 (int (*)(...))std::ios_base::~ios_base - -Class std::ios_base - size=216 align=8 - base size=216 base align=8 -std::ios_base (0x0x7f64edb20060) 0 - vptr=((& std::ios_base::_ZTVSt8ios_base) + 16u) - -Class std::ctype_base - size=1 align=1 - base size=0 base align=1 -std::ctype_base (0x0x7f64edb20960) 0 empty - -Class std::__num_base - size=1 align=1 - base size=0 base align=1 -std::__num_base (0x0x7f64edca1060) 0 empty - -VTT for std::basic_ostream -std::basic_ostream::_ZTTSo: 2u entries -0 ((& std::basic_ostream::_ZTVSo) + 24u) -8 ((& std::basic_ostream::_ZTVSo) + 64u) - -VTT for std::basic_ostream -std::basic_ostream::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries -0 ((& std::basic_ostream::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 24u) -8 ((& std::basic_ostream::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 64u) - -VTT for std::basic_istream -std::basic_istream::_ZTTSi: 2u entries -0 ((& std::basic_istream::_ZTVSi) + 24u) -8 ((& std::basic_istream::_ZTVSi) + 64u) - -VTT for std::basic_istream -std::basic_istream::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries -0 ((& std::basic_istream::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 24u) -8 ((& std::basic_istream::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 64u) - -Construction vtable for std::basic_istream (0x0x7f64ed7be270 instance) in std::basic_iostream -std::basic_iostream::_ZTCSd0_Si: 10u entries -0 24u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISi) -24 0u -32 0u -40 18446744073709551592u -48 (int (*)(...))-24 -56 (int (*)(...))(& _ZTISi) -64 0u -72 0u - -Construction vtable for std::basic_ostream (0x0x7f64ed7be340 instance) in std::basic_iostream -std::basic_iostream::_ZTCSd16_So: 10u entries -0 8u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISo) -24 0u -32 0u -40 18446744073709551608u -48 (int (*)(...))-8 -56 (int (*)(...))(& _ZTISo) -64 0u -72 0u - -VTT for std::basic_iostream -std::basic_iostream::_ZTTSd: 7u entries -0 ((& std::basic_iostream::_ZTVSd) + 24u) -8 ((& std::basic_iostream::_ZTCSd0_Si) + 24u) -16 ((& std::basic_iostream::_ZTCSd0_Si) + 64u) -24 ((& std::basic_iostream::_ZTCSd16_So) + 24u) -32 ((& std::basic_iostream::_ZTCSd16_So) + 64u) -40 ((& std::basic_iostream::_ZTVSd) + 104u) -48 ((& std::basic_iostream::_ZTVSd) + 64u) - -Construction vtable for std::basic_istream (0x0x7f64ed7be6e8 instance) in std::basic_iostream -std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries -0 24u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -24 0u -32 0u -40 18446744073709551592u -48 (int (*)(...))-24 -56 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -64 0u -72 0u - -Construction vtable for std::basic_ostream (0x0x7f64ed7be7b8 instance) in std::basic_iostream -std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE16_St13basic_ostreamIwS1_E: 10u entries -0 8u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -24 0u -32 0u -40 18446744073709551608u -48 (int (*)(...))-8 -56 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -64 0u -72 0u - -VTT for std::basic_iostream -std::basic_iostream::_ZTTSt14basic_iostreamIwSt11char_traitsIwEE: 7u entries -0 ((& std::basic_iostream::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 24u) -8 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E) + 24u) -16 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E) + 64u) -24 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE16_St13basic_ostreamIwS1_E) + 24u) -32 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE16_St13basic_ostreamIwS1_E) + 64u) -40 ((& std::basic_iostream::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 104u) -48 ((& std::basic_iostream::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 64u) - -Class QByteArrayDataPtr - size=8 align=8 - base size=8 base align=8 -QByteArrayDataPtr (0x0x7f64eda9e8a0) 0 - -Class QByteArray - size=8 align=8 - base size=8 base align=8 -QByteArray (0x0x7f64eda9e900) 0 - -Class QByteRef - size=16 align=8 - base size=12 base align=8 -QByteRef (0x0x7f64ed506c60) 0 - -Class QStringDataPtr - size=8 align=8 - base size=8 base align=8 -QStringDataPtr (0x0x7f64ed5f1000) 0 - -Class QStringView - size=16 align=8 - base size=16 base align=8 -QStringView (0x0x7f64ed5f1480) 0 - -Class QLatin1String - size=16 align=8 - base size=16 base align=8 -QLatin1String (0x0x7f64ed685300) 0 - -Class QString::Null - size=1 align=1 - base size=0 base align=1 -QString::Null (0x0x7f64ed685960) 0 empty - -Class QString - size=8 align=8 - base size=8 base align=8 -QString (0x0x7f64ed685900) 0 - -Class QCharRef - size=16 align=8 - base size=12 base align=8 -QCharRef (0x0x7f64ed466a20) 0 - -Class QStringRef - size=16 align=8 - base size=16 base align=8 -QStringRef (0x0x7f64ed205660) 0 - -Class QtPrivate::QHashCombine - size=1 align=1 - base size=0 base align=1 -QtPrivate::QHashCombine (0x0x7f64ed012300) 0 empty - -Class QtPrivate::QHashCombineCommutative - size=1 align=1 - base size=0 base align=1 -QtPrivate::QHashCombineCommutative (0x0x7f64ed012360) 0 empty - -Class std::__detail::_List_node_base - size=16 align=8 - base size=16 base align=8 -std::__detail::_List_node_base (0x0x7f64ed0123c0) 0 - -Class QListData::NotArrayCompatibleLayout - size=1 align=1 - base size=0 base align=1 -QListData::NotArrayCompatibleLayout (0x0x7f64ed012780) 0 empty - -Class QListData::NotIndirectLayout - size=1 align=1 - base size=0 base align=1 -QListData::NotIndirectLayout (0x0x7f64ed0127e0) 0 empty - -Class QListData::ArrayCompatibleLayout - size=1 align=1 - base size=1 base align=1 -QListData::ArrayCompatibleLayout (0x0x7f64ed017270) 0 empty - QListData::NotIndirectLayout (0x0x7f64ed012840) 0 empty - -Class QListData::InlineWithPaddingLayout - size=1 align=1 - base size=1 base align=1 -QListData::InlineWithPaddingLayout (0x0x7f64ed0dd540) 0 empty - QListData::NotArrayCompatibleLayout (0x0x7f64ed0128a0) 0 empty - QListData::NotIndirectLayout (0x0x7f64ed012900) 0 empty - -Class QListData::IndirectLayout - size=1 align=1 - base size=1 base align=1 -QListData::IndirectLayout (0x0x7f64ed0172d8) 0 empty - QListData::NotArrayCompatibleLayout (0x0x7f64ed012960) 0 empty - -Class QListData::Data - size=24 align=8 - base size=24 base align=8 -QListData::Data (0x0x7f64ed0129c0) 0 - -Class QListData - size=8 align=8 - base size=8 base align=8 -QListData (0x0x7f64ed012720) 0 - -Class QRegExp - size=8 align=8 - base size=8 base align=8 -QRegExp (0x0x7f64ed012e40) 0 - -Class QStringMatcher::Data - size=272 align=8 - base size=272 base align=8 -QStringMatcher::Data (0x0x7f64ece8d0c0) 0 - -Class QStringMatcher - size=1048 align=8 - base size=1048 base align=8 -QStringMatcher (0x0x7f64ece8d060) 0 - -Class QStringList - size=8 align=8 - base size=8 base align=8 -QStringList (0x0x7f64ece7dd00) 0 - QList (0x0x7f64ece7dd68) 0 - QListSpecialMethods (0x0x7f64ece8d2a0) 0 empty - -Class QScopedPointerPodDeleter - size=1 align=1 - base size=0 base align=1 -QScopedPointerPodDeleter (0x0x7f64ece8d6c0) 0 empty - -Class std::_Rb_tree_node_base - size=32 align=8 - base size=32 base align=8 -std::_Rb_tree_node_base (0x0x7f64ecbaf2a0) 0 - -Class std::allocator_arg_t - size=1 align=1 - base size=0 base align=1 -std::allocator_arg_t (0x0x7f64ecbaf900) 0 empty - -Class std::__uses_alloc_base - size=1 align=1 - base size=0 base align=1 -std::__uses_alloc_base (0x0x7f64ecbafa80) 0 empty - -Class std::__uses_alloc0::_Sink - size=1 align=1 - base size=0 base align=1 -std::__uses_alloc0::_Sink (0x0x7f64ecbafb40) 0 empty - -Class std::__uses_alloc0 - size=1 align=1 - base size=1 base align=1 -std::__uses_alloc0 (0x0x7f64ecafa680) 0 - std::__uses_alloc_base (0x0x7f64ecbafae0) 0 empty - -Class std::_Swallow_assign - size=1 align=1 - base size=0 base align=1 -std::_Swallow_assign (0x0x7f64ec9b4ba0) 0 empty - -Class QtPrivate::AbstractDebugStreamFunction - size=16 align=8 - base size=16 base align=8 -QtPrivate::AbstractDebugStreamFunction (0x0x7f64ec9b4de0) 0 - -Class QtPrivate::AbstractComparatorFunction - size=24 align=8 - base size=24 base align=8 -QtPrivate::AbstractComparatorFunction (0x0x7f64ec9b4ea0) 0 - -Class QtPrivate::AbstractConverterFunction - size=8 align=8 - base size=8 base align=8 -QtPrivate::AbstractConverterFunction (0x0x7f64ec6fb000) 0 - -Class QMetaType - size=80 align=8 - base size=80 base align=8 -QMetaType (0x0x7f64ec6fb180) 0 - -Class QtMetaTypePrivate::VariantData - size=24 align=8 - base size=20 base align=8 -QtMetaTypePrivate::VariantData (0x0x7f64ec6fb5a0) 0 - -Class QtMetaTypePrivate::VectorBoolElements - size=1 align=1 - base size=0 base align=1 -QtMetaTypePrivate::VectorBoolElements (0x0x7f64ec6fb6c0) 0 empty - -Class QtMetaTypePrivate::QSequentialIterableImpl - size=104 align=8 - base size=104 base align=8 -QtMetaTypePrivate::QSequentialIterableImpl (0x0x7f64ec81f060) 0 - -Class QtMetaTypePrivate::QAssociativeIterableImpl - size=112 align=8 - base size=112 base align=8 -QtMetaTypePrivate::QAssociativeIterableImpl (0x0x7f64ec81f480) 0 - -Class QtMetaTypePrivate::QPairVariantInterfaceImpl - size=40 align=8 - base size=40 base align=8 -QtMetaTypePrivate::QPairVariantInterfaceImpl (0x0x7f64ec81f780) 0 - -Class std::chrono::_V2::system_clock - size=1 align=1 - base size=0 base align=1 -std::chrono::_V2::system_clock (0x0x7f64ec2fb000) 0 empty - -Class std::chrono::_V2::steady_clock - size=1 align=1 - base size=0 base align=1 -std::chrono::_V2::steady_clock (0x0x7f64ec3c6e40) 0 empty - -Vtable for QObjectData -QObjectData::_ZTV11QObjectData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QObjectData) -16 (int (*)(...))__cxa_pure_virtual -24 (int (*)(...))__cxa_pure_virtual - -Class QObjectData - size=48 align=8 - base size=48 base align=8 -QObjectData (0x0x7f64ec3c6ea0) 0 - vptr=((& QObjectData::_ZTV11QObjectData) + 16u) - -Class QObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QObject::QPrivateSignal (0x0x7f64ec4110c0) 0 empty - -Vtable for QObject -QObject::_ZTV7QObject: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QObject) -16 (int (*)(...))QObject::metaObject -24 (int (*)(...))QObject::qt_metacast -32 (int (*)(...))QObject::qt_metacall -40 (int (*)(...))QObject::~QObject -48 (int (*)(...))QObject::~QObject -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QObject - size=16 align=8 - base size=16 base align=8 -QObject (0x0x7f64ec411060) 0 - vptr=((& QObject::_ZTV7QObject) + 16u) - -Vtable for QObjectUserData -QObjectUserData::_ZTV15QObjectUserData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QObjectUserData) -16 (int (*)(...))QObjectUserData::~QObjectUserData -24 (int (*)(...))QObjectUserData::~QObjectUserData - -Class QObjectUserData - size=8 align=8 - base size=8 base align=8 -QObjectUserData (0x0x7f64ec0d3360) 0 nearly-empty - vptr=((& QObjectUserData::_ZTV15QObjectUserData) + 16u) - -Class QSignalBlocker - size=16 align=8 - base size=10 base align=8 -QSignalBlocker (0x0x7f64ec0d33c0) 0 - -Class QAbstractAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractAnimation::QPrivateSignal (0x0x7f64ec0d3480) 0 empty - -Vtable for QAbstractAnimation -QAbstractAnimation::_ZTV18QAbstractAnimation: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QAbstractAnimation) -16 (int (*)(...))QAbstractAnimation::metaObject -24 (int (*)(...))QAbstractAnimation::qt_metacast -32 (int (*)(...))QAbstractAnimation::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAbstractAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection - -Class QAbstractAnimation - size=16 align=8 - base size=16 base align=8 -QAbstractAnimation (0x0x7f64ec0c4888) 0 - vptr=((& QAbstractAnimation::_ZTV18QAbstractAnimation) + 16u) - QObject (0x0x7f64ec0d3420) 0 - primary-for QAbstractAnimation (0x0x7f64ec0c4888) - -Class QAnimationDriver::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAnimationDriver::QPrivateSignal (0x0x7f64ec0d3540) 0 empty - -Vtable for QAnimationDriver -QAnimationDriver::_ZTV16QAnimationDriver: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QAnimationDriver) -16 (int (*)(...))QAnimationDriver::metaObject -24 (int (*)(...))QAnimationDriver::qt_metacast -32 (int (*)(...))QAnimationDriver::qt_metacall -40 (int (*)(...))QAnimationDriver::~QAnimationDriver -48 (int (*)(...))QAnimationDriver::~QAnimationDriver -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAnimationDriver::advance -120 (int (*)(...))QAnimationDriver::elapsed -128 (int (*)(...))QAnimationDriver::start -136 (int (*)(...))QAnimationDriver::stop - -Class QAnimationDriver - size=16 align=8 - base size=16 base align=8 -QAnimationDriver (0x0x7f64ec0c48f0) 0 - vptr=((& QAnimationDriver::_ZTV16QAnimationDriver) + 16u) - QObject (0x0x7f64ec0d34e0) 0 - primary-for QAnimationDriver (0x0x7f64ec0c48f0) - -Class QEventLoop::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QEventLoop::QPrivateSignal (0x0x7f64ec0d3600) 0 empty - -Vtable for QEventLoop -QEventLoop::_ZTV10QEventLoop: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QEventLoop) -16 (int (*)(...))QEventLoop::metaObject -24 (int (*)(...))QEventLoop::qt_metacast -32 (int (*)(...))QEventLoop::qt_metacall -40 (int (*)(...))QEventLoop::~QEventLoop -48 (int (*)(...))QEventLoop::~QEventLoop -56 (int (*)(...))QEventLoop::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QEventLoop - size=16 align=8 - base size=16 base align=8 -QEventLoop (0x0x7f64ec0c4958) 0 - vptr=((& QEventLoop::_ZTV10QEventLoop) + 16u) - QObject (0x0x7f64ec0d35a0) 0 - primary-for QEventLoop (0x0x7f64ec0c4958) - -Class QEventLoopLocker - size=8 align=8 - base size=8 base align=8 -QEventLoopLocker (0x0x7f64ec0d37e0) 0 - -Class QAbstractEventDispatcher::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractEventDispatcher::QPrivateSignal (0x0x7f64ec0d38a0) 0 empty - -Class QAbstractEventDispatcher::TimerInfo - size=12 align=4 - base size=12 base align=4 -QAbstractEventDispatcher::TimerInfo (0x0x7f64ec0d3900) 0 - -Vtable for QAbstractEventDispatcher -QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 28u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QAbstractEventDispatcher) -16 (int (*)(...))QAbstractEventDispatcher::metaObject -24 (int (*)(...))QAbstractEventDispatcher::qt_metacast -32 (int (*)(...))QAbstractEventDispatcher::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))__cxa_pure_virtual -176 (int (*)(...))__cxa_pure_virtual -184 (int (*)(...))__cxa_pure_virtual -192 (int (*)(...))__cxa_pure_virtual -200 (int (*)(...))__cxa_pure_virtual -208 (int (*)(...))QAbstractEventDispatcher::startingUp -216 (int (*)(...))QAbstractEventDispatcher::closingDown - -Class QAbstractEventDispatcher - size=16 align=8 - base size=16 base align=8 -QAbstractEventDispatcher (0x0x7f64ec0c4a90) 0 - vptr=((& QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher) + 16u) - QObject (0x0x7f64ec0d3840) 0 - primary-for QAbstractEventDispatcher (0x0x7f64ec0c4a90) - -Vtable for std::type_info -std::type_info::_ZTVSt9type_info: 8u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt9type_info) -16 (int (*)(...))std::type_info::~type_info -24 (int (*)(...))std::type_info::~type_info -32 (int (*)(...))std::type_info::__is_pointer_p -40 (int (*)(...))std::type_info::__is_function_p -48 (int (*)(...))std::type_info::__do_catch -56 (int (*)(...))std::type_info::__do_upcast - -Class std::type_info - size=16 align=8 - base size=16 base align=8 -std::type_info (0x0x7f64ec0d3ba0) 0 - vptr=((& std::type_info::_ZTVSt9type_info) + 16u) - -Vtable for std::bad_cast -std::bad_cast::_ZTVSt8bad_cast: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt8bad_cast) -16 (int (*)(...))std::bad_cast::~bad_cast -24 (int (*)(...))std::bad_cast::~bad_cast -32 (int (*)(...))std::bad_cast::what - -Class std::bad_cast - size=8 align=8 - base size=8 base align=8 -std::bad_cast (0x0x7f64ec0c4c98) 0 nearly-empty - vptr=((& std::bad_cast::_ZTVSt8bad_cast) + 16u) - std::exception (0x0x7f64ec0d3c00) 0 nearly-empty - primary-for std::bad_cast (0x0x7f64ec0c4c98) - -Vtable for std::bad_typeid -std::bad_typeid::_ZTVSt10bad_typeid: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt10bad_typeid) -16 (int (*)(...))std::bad_typeid::~bad_typeid -24 (int (*)(...))std::bad_typeid::~bad_typeid -32 (int (*)(...))std::bad_typeid::what - -Class std::bad_typeid - size=8 align=8 - base size=8 base align=8 -std::bad_typeid (0x0x7f64ec0c4d00) 0 nearly-empty - vptr=((& std::bad_typeid::_ZTVSt10bad_typeid) + 16u) - std::exception (0x0x7f64ec0d3c60) 0 nearly-empty - primary-for std::bad_typeid (0x0x7f64ec0c4d00) - -Vtable for std::bad_function_call -std::bad_function_call::_ZTVSt17bad_function_call: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt17bad_function_call) -16 (int (*)(...))std::bad_function_call::~bad_function_call -24 (int (*)(...))std::bad_function_call::~bad_function_call -32 (int (*)(...))std::bad_function_call::what - -Class std::bad_function_call - size=8 align=8 - base size=8 base align=8 -std::bad_function_call (0x0x7f64ec218f70) 0 nearly-empty - vptr=((& std::bad_function_call::_ZTVSt17bad_function_call) + 16u) - std::exception (0x0x7f64ec293d20) 0 nearly-empty - primary-for std::bad_function_call (0x0x7f64ec218f70) - -Class std::_Nocopy_types - size=16 align=8 - base size=16 base align=8 -std::_Nocopy_types (0x0x7f64ec293de0) 0 - -Class std::_Any_data - size=16 align=8 - base size=16 base align=8 -std::_Any_data (0x0x7f64ec293e40) 0 - -Class std::_Function_base - size=24 align=8 - base size=24 base align=8 -std::_Function_base (0x0x7f64ec293f60) 0 - -Class QMapNodeBase - size=24 align=8 - base size=24 base align=8 -QMapNodeBase (0x0x7f64ebf36480) 0 - -Class QMapDataBase - size=40 align=8 - base size=40 base align=8 -QMapDataBase (0x0x7f64ebf369c0) 0 - -Class QHashData::Node - size=16 align=8 - base size=16 base align=8 -QHashData::Node (0x0x7f64ebf36d80) 0 - -Class QHashData - size=48 align=8 - base size=44 base align=8 -QHashData (0x0x7f64ebf36d20) 0 - -Class QHashDummyValue - size=1 align=1 - base size=0 base align=1 -QHashDummyValue (0x0x7f64ebf36de0) 0 empty - -Class QVariant::PrivateShared - size=16 align=8 - base size=12 base align=8 -QVariant::PrivateShared (0x0x7f64ebccf6c0) 0 - -Class QVariant::Private::Data - size=8 align=8 - base size=8 base align=8 -QVariant::Private::Data (0x0x7f64ebccf780) 0 - -Class QVariant::Private - size=16 align=8 - base size=12 base align=8 -QVariant::Private (0x0x7f64ebccf720) 0 - -Class QVariant::Handler - size=72 align=8 - base size=72 base align=8 -QVariant::Handler (0x0x7f64ebccf7e0) 0 - -Class QVariant - size=16 align=8 - base size=16 base align=8 -QVariant (0x0x7f64ebccf660) 0 - -Class QVariantComparisonHelper - size=8 align=8 - base size=8 base align=8 -QVariantComparisonHelper (0x0x7f64ebb24300) 0 - -Class QSequentialIterable::const_iterator - size=112 align=8 - base size=112 base align=8 -QSequentialIterable::const_iterator (0x0x7f64ebb24960) 0 - -Class QSequentialIterable - size=104 align=8 - base size=104 base align=8 -QSequentialIterable (0x0x7f64ebb24900) 0 - -Class QAssociativeIterable::const_iterator - size=120 align=8 - base size=120 base align=8 -QAssociativeIterable::const_iterator (0x0x7f64ebb24a20) 0 - -Class QAssociativeIterable - size=112 align=8 - base size=112 base align=8 -QAssociativeIterable (0x0x7f64ebb249c0) 0 - -Class QModelIndex - size=24 align=8 - base size=24 base align=8 -QModelIndex (0x0x7f64ebc4ed20) 0 - -Class QPersistentModelIndex - size=8 align=8 - base size=8 base align=8 -QPersistentModelIndex (0x0x7f64eb993420) 0 - -Class QAbstractItemModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractItemModel::QPrivateSignal (0x0x7f64eba30b40) 0 empty - -Vtable for QAbstractItemModel -QAbstractItemModel::_ZTV18QAbstractItemModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QAbstractItemModel) -16 (int (*)(...))QAbstractItemModel::metaObject -24 (int (*)(...))QAbstractItemModel::qt_metacast -32 (int (*)(...))QAbstractItemModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractItemModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAbstractItemModel::hasChildren -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractItemModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractItemModel::dropMimeData -240 (int (*)(...))QAbstractItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QAbstractItemModel::flags -328 (int (*)(...))QAbstractItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QAbstractItemModel - size=16 align=8 - base size=16 base align=8 -QAbstractItemModel (0x0x7f64eba33d00) 0 - vptr=((& QAbstractItemModel::_ZTV18QAbstractItemModel) + 16u) - QObject (0x0x7f64eba30ae0) 0 - primary-for QAbstractItemModel (0x0x7f64eba33d00) - -Class QAbstractTableModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractTableModel::QPrivateSignal (0x0x7f64eba94420) 0 empty - -Vtable for QAbstractTableModel -QAbstractTableModel::_ZTV19QAbstractTableModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QAbstractTableModel) -16 (int (*)(...))QAbstractTableModel::metaObject -24 (int (*)(...))QAbstractTableModel::qt_metacast -32 (int (*)(...))QAbstractTableModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractTableModel::index -120 (int (*)(...))QAbstractTableModel::parent -128 (int (*)(...))QAbstractTableModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAbstractTableModel::hasChildren -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractItemModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractTableModel::dropMimeData -240 (int (*)(...))QAbstractItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QAbstractTableModel::flags -328 (int (*)(...))QAbstractItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QAbstractTableModel - size=16 align=8 - base size=16 base align=8 -QAbstractTableModel (0x0x7f64eba90410) 0 - vptr=((& QAbstractTableModel::_ZTV19QAbstractTableModel) + 16u) - QAbstractItemModel (0x0x7f64eba90478) 0 - primary-for QAbstractTableModel (0x0x7f64eba90410) - QObject (0x0x7f64eba943c0) 0 - primary-for QAbstractItemModel (0x0x7f64eba90478) - -Class QAbstractListModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractListModel::QPrivateSignal (0x0x7f64eba944e0) 0 empty - -Vtable for QAbstractListModel -QAbstractListModel::_ZTV18QAbstractListModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QAbstractListModel) -16 (int (*)(...))QAbstractListModel::metaObject -24 (int (*)(...))QAbstractListModel::qt_metacast -32 (int (*)(...))QAbstractListModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractListModel::index -120 (int (*)(...))QAbstractListModel::parent -128 (int (*)(...))QAbstractListModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))QAbstractListModel::columnCount -152 (int (*)(...))QAbstractListModel::hasChildren -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractItemModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractListModel::dropMimeData -240 (int (*)(...))QAbstractItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QAbstractListModel::flags -328 (int (*)(...))QAbstractItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QAbstractListModel - size=16 align=8 - base size=16 base align=8 -QAbstractListModel (0x0x7f64eba904e0) 0 - vptr=((& QAbstractListModel::_ZTV18QAbstractListModel) + 16u) - QAbstractItemModel (0x0x7f64eba90548) 0 - primary-for QAbstractListModel (0x0x7f64eba904e0) - QObject (0x0x7f64eba94480) 0 - primary-for QAbstractItemModel (0x0x7f64eba90548) - -Vtable for QAbstractNativeEventFilter -QAbstractNativeEventFilter::_ZTV26QAbstractNativeEventFilter: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAbstractNativeEventFilter) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QAbstractNativeEventFilter - size=16 align=8 - base size=16 base align=8 -QAbstractNativeEventFilter (0x0x7f64eba94780) 0 - vptr=((& QAbstractNativeEventFilter::_ZTV26QAbstractNativeEventFilter) + 16u) - -Class QAbstractProxyModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractProxyModel::QPrivateSignal (0x0x7f64eba94840) 0 empty - -Vtable for QAbstractProxyModel -QAbstractProxyModel::_ZTV19QAbstractProxyModel: 53u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QAbstractProxyModel) -16 (int (*)(...))QAbstractProxyModel::metaObject -24 (int (*)(...))QAbstractProxyModel::qt_metacast -32 (int (*)(...))QAbstractProxyModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractProxyModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAbstractProxyModel::hasChildren -160 (int (*)(...))QAbstractProxyModel::data -168 (int (*)(...))QAbstractProxyModel::setData -176 (int (*)(...))QAbstractProxyModel::headerData -184 (int (*)(...))QAbstractProxyModel::setHeaderData -192 (int (*)(...))QAbstractProxyModel::itemData -200 (int (*)(...))QAbstractProxyModel::setItemData -208 (int (*)(...))QAbstractProxyModel::mimeTypes -216 (int (*)(...))QAbstractProxyModel::mimeData -224 (int (*)(...))QAbstractProxyModel::canDropMimeData -232 (int (*)(...))QAbstractProxyModel::dropMimeData -240 (int (*)(...))QAbstractProxyModel::supportedDropActions -248 (int (*)(...))QAbstractProxyModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractProxyModel::fetchMore -312 (int (*)(...))QAbstractProxyModel::canFetchMore -320 (int (*)(...))QAbstractProxyModel::flags -328 (int (*)(...))QAbstractProxyModel::sort -336 (int (*)(...))QAbstractProxyModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractProxyModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractProxyModel::submit -376 (int (*)(...))QAbstractProxyModel::revert -384 (int (*)(...))QAbstractProxyModel::setSourceModel -392 (int (*)(...))__cxa_pure_virtual -400 (int (*)(...))__cxa_pure_virtual -408 (int (*)(...))QAbstractProxyModel::mapSelectionToSource -416 (int (*)(...))QAbstractProxyModel::mapSelectionFromSource - -Class QAbstractProxyModel - size=16 align=8 - base size=16 base align=8 -QAbstractProxyModel (0x0x7f64eba90680) 0 - vptr=((& QAbstractProxyModel::_ZTV19QAbstractProxyModel) + 16u) - QAbstractItemModel (0x0x7f64eba906e8) 0 - primary-for QAbstractProxyModel (0x0x7f64eba90680) - QObject (0x0x7f64eba947e0) 0 - primary-for QAbstractItemModel (0x0x7f64eba906e8) - -Class QAbstractState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractState::QPrivateSignal (0x0x7f64eba94900) 0 empty - -Vtable for QAbstractState -QAbstractState::_ZTV14QAbstractState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QAbstractState) -16 (int (*)(...))QAbstractState::metaObject -24 (int (*)(...))QAbstractState::qt_metacast -32 (int (*)(...))QAbstractState::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAbstractState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QAbstractState - size=16 align=8 - base size=16 base align=8 -QAbstractState (0x0x7f64eba90750) 0 - vptr=((& QAbstractState::_ZTV14QAbstractState) + 16u) - QObject (0x0x7f64eba948a0) 0 - primary-for QAbstractState (0x0x7f64eba90750) - -Class QAbstractTransition::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractTransition::QPrivateSignal (0x0x7f64eba949c0) 0 empty - -Vtable for QAbstractTransition -QAbstractTransition::_ZTV19QAbstractTransition: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QAbstractTransition) -16 (int (*)(...))QAbstractTransition::metaObject -24 (int (*)(...))QAbstractTransition::qt_metacast -32 (int (*)(...))QAbstractTransition::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAbstractTransition::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QAbstractTransition - size=16 align=8 - base size=16 base align=8 -QAbstractTransition (0x0x7f64eba907b8) 0 - vptr=((& QAbstractTransition::_ZTV19QAbstractTransition) + 16u) - QObject (0x0x7f64eba94960) 0 - primary-for QAbstractTransition (0x0x7f64eba907b8) - -Class QAnimationGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAnimationGroup::QPrivateSignal (0x0x7f64eba94a80) 0 empty - -Vtable for QAnimationGroup -QAnimationGroup::_ZTV15QAnimationGroup: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QAnimationGroup) -16 (int (*)(...))QAnimationGroup::metaObject -24 (int (*)(...))QAnimationGroup::qt_metacast -32 (int (*)(...))QAnimationGroup::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAnimationGroup::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection - -Class QAnimationGroup - size=16 align=8 - base size=16 base align=8 -QAnimationGroup (0x0x7f64eba90820) 0 - vptr=((& QAnimationGroup::_ZTV15QAnimationGroup) + 16u) - QAbstractAnimation (0x0x7f64eba90888) 0 - primary-for QAnimationGroup (0x0x7f64eba90820) - QObject (0x0x7f64eba94a20) 0 - primary-for QAbstractAnimation (0x0x7f64eba90888) - -Class QBasicTimer - size=4 align=4 - base size=4 base align=4 -QBasicTimer (0x0x7f64eb8037e0) 0 - -Class QBitArray - size=8 align=8 - base size=8 base align=8 -QBitArray (0x0x7f64eb803a80) 0 - -Class QBitRef - size=16 align=8 - base size=12 base align=8 -QBitRef (0x0x7f64eb803b40) 0 - -Class QIODevice::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIODevice::QPrivateSignal (0x0x7f64eb803e40) 0 empty - -Vtable for QIODevice -QIODevice::_ZTV9QIODevice: 30u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QIODevice) -16 (int (*)(...))QIODevice::metaObject -24 (int (*)(...))QIODevice::qt_metacast -32 (int (*)(...))QIODevice::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QIODevice::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QIODevice::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QIODevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))__cxa_pure_virtual -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))__cxa_pure_virtual - -Class QIODevice - size=16 align=8 - base size=16 base align=8 -QIODevice (0x0x7f64eba90f08) 0 - vptr=((& QIODevice::_ZTV9QIODevice) + 16u) - QObject (0x0x7f64eb803de0) 0 - primary-for QIODevice (0x0x7f64eba90f08) - -Class QBuffer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QBuffer::QPrivateSignal (0x0x7f64eb4c40c0) 0 empty - -Vtable for QBuffer -QBuffer::_ZTV7QBuffer: 30u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QBuffer) -16 (int (*)(...))QBuffer::metaObject -24 (int (*)(...))QBuffer::qt_metacast -32 (int (*)(...))QBuffer::qt_metacall -40 (int (*)(...))QBuffer::~QBuffer -48 (int (*)(...))QBuffer::~QBuffer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QBuffer::connectNotify -104 (int (*)(...))QBuffer::disconnectNotify -112 (int (*)(...))QIODevice::isSequential -120 (int (*)(...))QBuffer::open -128 (int (*)(...))QBuffer::close -136 (int (*)(...))QBuffer::pos -144 (int (*)(...))QBuffer::size -152 (int (*)(...))QBuffer::seek -160 (int (*)(...))QBuffer::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QBuffer::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QBuffer::readData -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QBuffer::writeData - -Class QBuffer - size=16 align=8 - base size=16 base align=8 -QBuffer (0x0x7f64eb4bd068) 0 - vptr=((& QBuffer::_ZTV7QBuffer) + 16u) - QIODevice (0x0x7f64eb4bd0d0) 0 - primary-for QBuffer (0x0x7f64eb4bd068) - QObject (0x0x7f64eb4c4060) 0 - primary-for QIODevice (0x0x7f64eb4bd0d0) - -Class QByteArrayMatcher::Data - size=272 align=8 - base size=272 base align=8 -QByteArrayMatcher::Data (0x0x7f64eb4c4180) 0 - -Class QByteArrayMatcher - size=1040 align=8 - base size=1040 base align=8 -QByteArrayMatcher (0x0x7f64eb4c4120) 0 - -Class QStaticByteArrayMatcherBase::Skiptable - size=256 align=1 - base size=256 base align=1 -QStaticByteArrayMatcherBase::Skiptable (0x0x7f64eb4c42a0) 0 - -Class QStaticByteArrayMatcherBase - size=256 align=16 - base size=256 base align=16 -QStaticByteArrayMatcherBase (0x0x7f64eb4c4240) 0 - -Class QSharedData - size=4 align=4 - base size=4 base align=4 -QSharedData (0x0x7f64eb4c4480) 0 - -Class QLocale - size=8 align=8 - base size=8 base align=8 -QLocale (0x0x7f64eb4c4660) 0 - -Class QCollatorSortKey - size=8 align=8 - base size=8 base align=8 -QCollatorSortKey (0x0x7f64eb4c4c60) 0 - -Class QCollator - size=8 align=8 - base size=8 base align=8 -QCollator (0x0x7f64eb4c4d20) 0 - -Class QCommandLineOption - size=8 align=8 - base size=8 base align=8 -QCommandLineOption (0x0x7f64eb28bd20) 0 - -Vtable for QEvent -QEvent::_ZTV6QEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QEvent) -16 (int (*)(...))QEvent::~QEvent -24 (int (*)(...))QEvent::~QEvent - -Class QEvent - size=24 align=8 - base size=20 base align=8 -QEvent (0x0x7f64eb2cb1e0) 0 - vptr=((& QEvent::_ZTV6QEvent) + 16u) - -Vtable for QTimerEvent -QTimerEvent::_ZTV11QTimerEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTimerEvent) -16 (int (*)(...))QTimerEvent::~QTimerEvent -24 (int (*)(...))QTimerEvent::~QTimerEvent - -Class QTimerEvent - size=24 align=8 - base size=24 base align=8 -QTimerEvent (0x0x7f64eb2a05b0) 0 - vptr=((& QTimerEvent::_ZTV11QTimerEvent) + 16u) - QEvent (0x0x7f64eb2cb240) 0 - primary-for QTimerEvent (0x0x7f64eb2a05b0) - -Vtable for QChildEvent -QChildEvent::_ZTV11QChildEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QChildEvent) -16 (int (*)(...))QChildEvent::~QChildEvent -24 (int (*)(...))QChildEvent::~QChildEvent - -Class QChildEvent - size=32 align=8 - base size=32 base align=8 -QChildEvent (0x0x7f64eb2a0618) 0 - vptr=((& QChildEvent::_ZTV11QChildEvent) + 16u) - QEvent (0x0x7f64eb2cb2a0) 0 - primary-for QChildEvent (0x0x7f64eb2a0618) - -Vtable for QDynamicPropertyChangeEvent -QDynamicPropertyChangeEvent::_ZTV27QDynamicPropertyChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QDynamicPropertyChangeEvent) -16 (int (*)(...))QDynamicPropertyChangeEvent::~QDynamicPropertyChangeEvent -24 (int (*)(...))QDynamicPropertyChangeEvent::~QDynamicPropertyChangeEvent - -Class QDynamicPropertyChangeEvent - size=32 align=8 - base size=32 base align=8 -QDynamicPropertyChangeEvent (0x0x7f64eb2a0b60) 0 - vptr=((& QDynamicPropertyChangeEvent::_ZTV27QDynamicPropertyChangeEvent) + 16u) - QEvent (0x0x7f64eb2cb780) 0 - primary-for QDynamicPropertyChangeEvent (0x0x7f64eb2a0b60) - -Vtable for QDeferredDeleteEvent -QDeferredDeleteEvent::_ZTV20QDeferredDeleteEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QDeferredDeleteEvent) -16 (int (*)(...))QDeferredDeleteEvent::~QDeferredDeleteEvent -24 (int (*)(...))QDeferredDeleteEvent::~QDeferredDeleteEvent - -Class QDeferredDeleteEvent - size=24 align=8 - base size=24 base align=8 -QDeferredDeleteEvent (0x0x7f64eb2a0bc8) 0 - vptr=((& QDeferredDeleteEvent::_ZTV20QDeferredDeleteEvent) + 16u) - QEvent (0x0x7f64eb2cb7e0) 0 - primary-for QDeferredDeleteEvent (0x0x7f64eb2a0bc8) - -Class QCoreApplication::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QCoreApplication::QPrivateSignal (0x0x7f64eb2cb8a0) 0 empty - -Vtable for QCoreApplication -QCoreApplication::_ZTV16QCoreApplication: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QCoreApplication) -16 (int (*)(...))QCoreApplication::metaObject -24 (int (*)(...))QCoreApplication::qt_metacast -32 (int (*)(...))QCoreApplication::qt_metacall -40 (int (*)(...))QCoreApplication::~QCoreApplication -48 (int (*)(...))QCoreApplication::~QCoreApplication -56 (int (*)(...))QCoreApplication::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QCoreApplication::notify -120 (int (*)(...))QCoreApplication::compressEvent - -Class QCoreApplication - size=16 align=8 - base size=16 base align=8 -QCoreApplication (0x0x7f64eb2a0c30) 0 - vptr=((& QCoreApplication::_ZTV16QCoreApplication) + 16u) - QObject (0x0x7f64eb2cb840) 0 - primary-for QCoreApplication (0x0x7f64eb2a0c30) - -Class QCommandLineParser - size=8 align=8 - base size=8 base align=8 -QCommandLineParser (0x0x7f64eb2cb900) 0 - -Class QContiguousCacheData - size=24 align=4 - base size=24 base align=4 -QContiguousCacheData (0x0x7f64eb2cb960) 0 - -Class QCryptographicHash - size=8 align=8 - base size=8 base align=8 -QCryptographicHash (0x0x7f64eb2cbf60) 0 - -Class QDataStream - size=32 align=8 - base size=32 base align=8 -QDataStream (0x0x7f64eb3bf000) 0 - -Class QtPrivate::StreamStateSaver - size=16 align=8 - base size=12 base align=8 -QtPrivate::StreamStateSaver (0x0x7f64eb3bf0c0) 0 - -Class QDate - size=8 align=8 - base size=8 base align=8 -QDate (0x0x7f64eb3bf5a0) 0 - -Class QTime - size=4 align=4 - base size=4 base align=4 -QTime (0x0x7f64eb3bf840) 0 - -Class QDateTime::ShortData - size=8 align=8 - base size=8 base align=8 -QDateTime::ShortData (0x0x7f64eb07a000) 0 - -Class QDateTime::Data - size=8 align=8 - base size=8 base align=8 -QDateTime::Data (0x0x7f64eb07a060) 0 - -Class QDateTime - size=8 align=8 - base size=8 base align=8 -QDateTime (0x0x7f64eb3bff60) 0 - -Class QElapsedTimer - size=16 align=8 - base size=16 base align=8 -QElapsedTimer (0x0x7f64eb122180) 0 - -Class QDeadlineTimer - size=16 align=8 - base size=16 base align=8 -QDeadlineTimer (0x0x7f64eb122660) 0 - -Vtable for QTextStream -QTextStream::_ZTV11QTextStream: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTextStream) -16 (int (*)(...))QTextStream::~QTextStream -24 (int (*)(...))QTextStream::~QTextStream - -Class QTextStream - size=16 align=8 - base size=16 base align=8 -QTextStream (0x0x7f64eb264600) 0 - vptr=((& QTextStream::_ZTV11QTextStream) + 16u) - -Class QTextStreamManipulator - size=40 align=8 - base size=38 base align=8 -QTextStreamManipulator (0x0x7f64eb2648a0) 0 - -Class QtSharedPointer::NormalDeleter - size=1 align=1 - base size=0 base align=1 -QtSharedPointer::NormalDeleter (0x0x7f64eb264ae0) 0 empty - -Class QtSharedPointer::ExternalRefCountData - size=16 align=8 - base size=16 base align=8 -QtSharedPointer::ExternalRefCountData (0x0x7f64eb264c60) 0 - -Class QDebug::Stream - size=80 align=8 - base size=76 base align=8 -QDebug::Stream (0x0x7f64eaff11e0) 0 - -Class QDebug - size=8 align=8 - base size=8 base align=8 -QDebug (0x0x7f64eaff1180) 0 - -Class QDebugStateSaver - size=8 align=8 - base size=8 base align=8 -QDebugStateSaver (0x0x7f64eacea6c0) 0 - -Class QNoDebug - size=1 align=1 - base size=0 base align=1 -QNoDebug (0x0x7f64eacea780) 0 empty - -Class QFileDevice::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFileDevice::QPrivateSignal (0x0x7f64eadbf900) 0 empty - -Vtable for QFileDevice -QFileDevice::_ZTV11QFileDevice: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QFileDevice) -16 (int (*)(...))QFileDevice::metaObject -24 (int (*)(...))QFileDevice::qt_metacast -32 (int (*)(...))QFileDevice::qt_metacall -40 (int (*)(...))QFileDevice::~QFileDevice -48 (int (*)(...))QFileDevice::~QFileDevice -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QFileDevice::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFileDevice::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QFileDevice::writeData -240 (int (*)(...))QFileDevice::fileName -248 (int (*)(...))QFileDevice::resize -256 (int (*)(...))QFileDevice::permissions -264 (int (*)(...))QFileDevice::setPermissions - -Class QFileDevice - size=16 align=8 - base size=16 base align=8 -QFileDevice (0x0x7f64eadc5d68) 0 - vptr=((& QFileDevice::_ZTV11QFileDevice) + 16u) - QIODevice (0x0x7f64eadc5dd0) 0 - primary-for QFileDevice (0x0x7f64eadc5d68) - QObject (0x0x7f64eadbf8a0) 0 - primary-for QIODevice (0x0x7f64eadc5dd0) - -Class QFile::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFile::QPrivateSignal (0x0x7f64eadbfb40) 0 empty - -Vtable for QFile -QFile::_ZTV5QFile: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI5QFile) -16 (int (*)(...))QFile::metaObject -24 (int (*)(...))QFile::qt_metacast -32 (int (*)(...))QFile::qt_metacall -40 (int (*)(...))QFile::~QFile -48 (int (*)(...))QFile::~QFile -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QFile::open -128 (int (*)(...))QFileDevice::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFile::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QFileDevice::writeData -240 (int (*)(...))QFile::fileName -248 (int (*)(...))QFile::resize -256 (int (*)(...))QFile::permissions -264 (int (*)(...))QFile::setPermissions - -Class QFile - size=16 align=8 - base size=16 base align=8 -QFile (0x0x7f64eadc5f08) 0 - vptr=((& QFile::_ZTV5QFile) + 16u) - QFileDevice (0x0x7f64eadc5f70) 0 - primary-for QFile (0x0x7f64eadc5f08) - QIODevice (0x0x7f64eadc51a0) 0 - primary-for QFileDevice (0x0x7f64eadc5f70) - QObject (0x0x7f64eadbfae0) 0 - primary-for QIODevice (0x0x7f64eadc51a0) - -Class QFileInfo - size=8 align=8 - base size=8 base align=8 -QFileInfo (0x0x7f64eadbfd20) 0 - -Class QDir - size=8 align=8 - base size=8 base align=8 -QDir (0x0x7f64eaa81180) 0 - -Class QDirIterator - size=8 align=8 - base size=8 base align=8 -QDirIterator (0x0x7f64eaa81780) 0 - -Class QEasingCurve - size=8 align=8 - base size=8 base align=8 -QEasingCurve (0x0x7f64eaa819c0) 0 - -Class QEventTransition::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QEventTransition::QPrivateSignal (0x0x7f64eabd4de0) 0 empty - -Vtable for QEventTransition -QEventTransition::_ZTV16QEventTransition: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QEventTransition) -16 (int (*)(...))QEventTransition::metaObject -24 (int (*)(...))QEventTransition::qt_metacast -32 (int (*)(...))QEventTransition::qt_metacall -40 (int (*)(...))QEventTransition::~QEventTransition -48 (int (*)(...))QEventTransition::~QEventTransition -56 (int (*)(...))QEventTransition::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QEventTransition::eventTest -120 (int (*)(...))QEventTransition::onTransition - -Class QEventTransition - size=16 align=8 - base size=16 base align=8 -QEventTransition (0x0x7f64eabd6c30) 0 - vptr=((& QEventTransition::_ZTV16QEventTransition) + 16u) - QAbstractTransition (0x0x7f64eabd6c98) 0 - primary-for QEventTransition (0x0x7f64eabd6c30) - QObject (0x0x7f64eabd4d80) 0 - primary-for QAbstractTransition (0x0x7f64eabd6c98) - -Vtable for QException -QException::_ZTV10QException: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QException) -16 (int (*)(...))QException::~QException -24 (int (*)(...))QException::~QException -32 (int (*)(...))std::exception::what -40 (int (*)(...))QException::raise -48 (int (*)(...))QException::clone - -Class QException - size=8 align=8 - base size=8 base align=8 -QException (0x0x7f64eabd6d00) 0 nearly-empty - vptr=((& QException::_ZTV10QException) + 16u) - std::exception (0x0x7f64eabd4e40) 0 nearly-empty - primary-for QException (0x0x7f64eabd6d00) - -Vtable for QUnhandledException -QUnhandledException::_ZTV19QUnhandledException: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QUnhandledException) -16 (int (*)(...))QUnhandledException::~QUnhandledException -24 (int (*)(...))QUnhandledException::~QUnhandledException -32 (int (*)(...))std::exception::what -40 (int (*)(...))QUnhandledException::raise -48 (int (*)(...))QUnhandledException::clone - -Class QUnhandledException - size=8 align=8 - base size=8 base align=8 -QUnhandledException (0x0x7f64eabd6d68) 0 nearly-empty - vptr=((& QUnhandledException::_ZTV19QUnhandledException) + 16u) - QException (0x0x7f64eabd6dd0) 0 nearly-empty - primary-for QUnhandledException (0x0x7f64eabd6d68) - std::exception (0x0x7f64eabd4ea0) 0 nearly-empty - primary-for QException (0x0x7f64eabd6dd0) - -Class QtPrivate::ExceptionHolder - size=8 align=8 - base size=8 base align=8 -QtPrivate::ExceptionHolder (0x0x7f64eabd4f00) 0 - -Class QtPrivate::ExceptionStore - size=8 align=8 - base size=8 base align=8 -QtPrivate::ExceptionStore (0x0x7f64eac50000) 0 - -Vtable for QFactoryInterface -QFactoryInterface::_ZTV17QFactoryInterface: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QFactoryInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QFactoryInterface - size=8 align=8 - base size=8 base align=8 -QFactoryInterface (0x0x7f64eac50060) 0 nearly-empty - vptr=((& QFactoryInterface::_ZTV17QFactoryInterface) + 16u) - -Class QFileSelector::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFileSelector::QPrivateSignal (0x0x7f64eac50180) 0 empty - -Vtable for QFileSelector -QFileSelector::_ZTV13QFileSelector: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QFileSelector) -16 (int (*)(...))QFileSelector::metaObject -24 (int (*)(...))QFileSelector::qt_metacast -32 (int (*)(...))QFileSelector::qt_metacall -40 (int (*)(...))QFileSelector::~QFileSelector -48 (int (*)(...))QFileSelector::~QFileSelector -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QFileSelector - size=16 align=8 - base size=16 base align=8 -QFileSelector (0x0x7f64eabd6e38) 0 - vptr=((& QFileSelector::_ZTV13QFileSelector) + 16u) - QObject (0x0x7f64eac50120) 0 - primary-for QFileSelector (0x0x7f64eabd6e38) - -Class QFileSystemWatcher::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFileSystemWatcher::QPrivateSignal (0x0x7f64eac50240) 0 empty - -Vtable for QFileSystemWatcher -QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QFileSystemWatcher) -16 (int (*)(...))QFileSystemWatcher::metaObject -24 (int (*)(...))QFileSystemWatcher::qt_metacast -32 (int (*)(...))QFileSystemWatcher::qt_metacall -40 (int (*)(...))QFileSystemWatcher::~QFileSystemWatcher -48 (int (*)(...))QFileSystemWatcher::~QFileSystemWatcher -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QFileSystemWatcher - size=16 align=8 - base size=16 base align=8 -QFileSystemWatcher (0x0x7f64eabd6ea0) 0 - vptr=((& QFileSystemWatcher::_ZTV18QFileSystemWatcher) + 16u) - QObject (0x0x7f64eac501e0) 0 - primary-for QFileSystemWatcher (0x0x7f64eabd6ea0) - -Class QFinalState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFinalState::QPrivateSignal (0x0x7f64eac50300) 0 empty - -Vtable for QFinalState -QFinalState::_ZTV11QFinalState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QFinalState) -16 (int (*)(...))QFinalState::metaObject -24 (int (*)(...))QFinalState::qt_metacast -32 (int (*)(...))QFinalState::qt_metacall -40 (int (*)(...))QFinalState::~QFinalState -48 (int (*)(...))QFinalState::~QFinalState -56 (int (*)(...))QFinalState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFinalState::onEntry -120 (int (*)(...))QFinalState::onExit - -Class QFinalState - size=16 align=8 - base size=16 base align=8 -QFinalState (0x0x7f64eabd6f08) 0 - vptr=((& QFinalState::_ZTV11QFinalState) + 16u) - QAbstractState (0x0x7f64eabd6f70) 0 - primary-for QFinalState (0x0x7f64eabd6f08) - QObject (0x0x7f64eac502a0) 0 - primary-for QAbstractState (0x0x7f64eabd6f70) - -Vtable for QRunnable -QRunnable::_ZTV9QRunnable: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QRunnable) -16 (int (*)(...))__cxa_pure_virtual -24 0u -32 0u - -Class QRunnable - size=16 align=8 - base size=12 base align=8 -QRunnable (0x0x7f64eac50360) 0 - vptr=((& QRunnable::_ZTV9QRunnable) + 16u) - -Class QBasicMutex - size=8 align=8 - base size=8 base align=8 -QBasicMutex (0x0x7f64eac503c0) 0 - -Class QMutex - size=8 align=8 - base size=8 base align=8 -QMutex (0x0x7f64ea8bd0d0) 0 - QBasicMutex (0x0x7f64eac505a0) 0 - -Class QMutexLocker - size=8 align=8 - base size=8 base align=8 -QMutexLocker (0x0x7f64eac50600) 0 - -Class QtPrivate::ResultItem - size=16 align=8 - base size=16 base align=8 -QtPrivate::ResultItem (0x0x7f64eac50660) 0 - -Class QtPrivate::ResultIteratorBase - size=16 align=8 - base size=12 base align=8 -QtPrivate::ResultIteratorBase (0x0x7f64eac506c0) 0 - -Vtable for QtPrivate::ResultStoreBase -QtPrivate::ResultStoreBase::_ZTVN9QtPrivate15ResultStoreBaseE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9QtPrivate15ResultStoreBaseE) -16 (int (*)(...))QtPrivate::ResultStoreBase::~ResultStoreBase -24 (int (*)(...))QtPrivate::ResultStoreBase::~ResultStoreBase - -Class QtPrivate::ResultStoreBase - size=48 align=8 - base size=44 base align=8 -QtPrivate::ResultStoreBase (0x0x7f64eac507e0) 0 - vptr=((& QtPrivate::ResultStoreBase::_ZTVN9QtPrivate15ResultStoreBaseE) + 16u) - -Vtable for QFutureInterfaceBase -QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QFutureInterfaceBase) -16 (int (*)(...))QFutureInterfaceBase::~QFutureInterfaceBase -24 (int (*)(...))QFutureInterfaceBase::~QFutureInterfaceBase - -Class QFutureInterfaceBase - size=16 align=8 - base size=16 base align=8 -QFutureInterfaceBase (0x0x7f64ea979060) 0 - vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 16u) - -Class QFutureWatcherBase::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFutureWatcherBase::QPrivateSignal (0x0x7f64ea979840) 0 empty - -Vtable for QFutureWatcherBase -QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QFutureWatcherBase) -16 (int (*)(...))QFutureWatcherBase::metaObject -24 (int (*)(...))QFutureWatcherBase::qt_metacast -32 (int (*)(...))QFutureWatcherBase::qt_metacall -40 0u -48 0u -56 (int (*)(...))QFutureWatcherBase::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QFutureWatcherBase::connectNotify -104 (int (*)(...))QFutureWatcherBase::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QFutureWatcherBase - size=16 align=8 - base size=16 base align=8 -QFutureWatcherBase (0x0x7f64ea9fc208) 0 - vptr=((& QFutureWatcherBase::_ZTV18QFutureWatcherBase) + 16u) - QObject (0x0x7f64ea9797e0) 0 - primary-for QFutureWatcherBase (0x0x7f64ea9fc208) - -Class QHistoryState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QHistoryState::QPrivateSignal (0x0x7f64ea979e40) 0 empty - -Vtable for QHistoryState -QHistoryState::_ZTV13QHistoryState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QHistoryState) -16 (int (*)(...))QHistoryState::metaObject -24 (int (*)(...))QHistoryState::qt_metacast -32 (int (*)(...))QHistoryState::qt_metacall -40 (int (*)(...))QHistoryState::~QHistoryState -48 (int (*)(...))QHistoryState::~QHistoryState -56 (int (*)(...))QHistoryState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QHistoryState::onEntry -120 (int (*)(...))QHistoryState::onExit - -Class QHistoryState - size=16 align=8 - base size=16 base align=8 -QHistoryState (0x0x7f64ea9fcaf8) 0 - vptr=((& QHistoryState::_ZTV13QHistoryState) + 16u) - QAbstractState (0x0x7f64ea9fcb60) 0 - primary-for QHistoryState (0x0x7f64ea9fcaf8) - QObject (0x0x7f64ea979de0) 0 - primary-for QAbstractState (0x0x7f64ea9fcb60) - -Class QIdentityProxyModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIdentityProxyModel::QPrivateSignal (0x0x7f64ea979f00) 0 empty - -Vtable for QIdentityProxyModel -QIdentityProxyModel::_ZTV19QIdentityProxyModel: 53u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QIdentityProxyModel) -16 (int (*)(...))QIdentityProxyModel::metaObject -24 (int (*)(...))QIdentityProxyModel::qt_metacast -32 (int (*)(...))QIdentityProxyModel::qt_metacall -40 (int (*)(...))QIdentityProxyModel::~QIdentityProxyModel -48 (int (*)(...))QIdentityProxyModel::~QIdentityProxyModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QIdentityProxyModel::index -120 (int (*)(...))QIdentityProxyModel::parent -128 (int (*)(...))QIdentityProxyModel::sibling -136 (int (*)(...))QIdentityProxyModel::rowCount -144 (int (*)(...))QIdentityProxyModel::columnCount -152 (int (*)(...))QAbstractProxyModel::hasChildren -160 (int (*)(...))QAbstractProxyModel::data -168 (int (*)(...))QAbstractProxyModel::setData -176 (int (*)(...))QIdentityProxyModel::headerData -184 (int (*)(...))QAbstractProxyModel::setHeaderData -192 (int (*)(...))QAbstractProxyModel::itemData -200 (int (*)(...))QAbstractProxyModel::setItemData -208 (int (*)(...))QAbstractProxyModel::mimeTypes -216 (int (*)(...))QAbstractProxyModel::mimeData -224 (int (*)(...))QAbstractProxyModel::canDropMimeData -232 (int (*)(...))QIdentityProxyModel::dropMimeData -240 (int (*)(...))QAbstractProxyModel::supportedDropActions -248 (int (*)(...))QAbstractProxyModel::supportedDragActions -256 (int (*)(...))QIdentityProxyModel::insertRows -264 (int (*)(...))QIdentityProxyModel::insertColumns -272 (int (*)(...))QIdentityProxyModel::removeRows -280 (int (*)(...))QIdentityProxyModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractProxyModel::fetchMore -312 (int (*)(...))QAbstractProxyModel::canFetchMore -320 (int (*)(...))QAbstractProxyModel::flags -328 (int (*)(...))QAbstractProxyModel::sort -336 (int (*)(...))QAbstractProxyModel::buddy -344 (int (*)(...))QIdentityProxyModel::match -352 (int (*)(...))QAbstractProxyModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractProxyModel::submit -376 (int (*)(...))QAbstractProxyModel::revert -384 (int (*)(...))QIdentityProxyModel::setSourceModel -392 (int (*)(...))QIdentityProxyModel::mapToSource -400 (int (*)(...))QIdentityProxyModel::mapFromSource -408 (int (*)(...))QIdentityProxyModel::mapSelectionToSource -416 (int (*)(...))QIdentityProxyModel::mapSelectionFromSource - -Class QIdentityProxyModel - size=16 align=8 - base size=16 base align=8 -QIdentityProxyModel (0x0x7f64ea9fcbc8) 0 - vptr=((& QIdentityProxyModel::_ZTV19QIdentityProxyModel) + 16u) - QAbstractProxyModel (0x0x7f64ea9fcc30) 0 - primary-for QIdentityProxyModel (0x0x7f64ea9fcbc8) - QAbstractItemModel (0x0x7f64ea9fcc98) 0 - primary-for QAbstractProxyModel (0x0x7f64ea9fcc30) - QObject (0x0x7f64ea979ea0) 0 - primary-for QAbstractItemModel (0x0x7f64ea9fcc98) - -Class QItemSelectionRange - size=16 align=8 - base size=16 base align=8 -QItemSelectionRange (0x0x7f64ea979f60) 0 - -Class QItemSelectionModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QItemSelectionModel::QPrivateSignal (0x0x7f64ea69a660) 0 empty - -Vtable for QItemSelectionModel -QItemSelectionModel::_ZTV19QItemSelectionModel: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QItemSelectionModel) -16 (int (*)(...))QItemSelectionModel::metaObject -24 (int (*)(...))QItemSelectionModel::qt_metacast -32 (int (*)(...))QItemSelectionModel::qt_metacall -40 (int (*)(...))QItemSelectionModel::~QItemSelectionModel -48 (int (*)(...))QItemSelectionModel::~QItemSelectionModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QItemSelectionModel::setCurrentIndex -120 (int (*)(...))QItemSelectionModel::select -128 (int (*)(...))QItemSelectionModel::select -136 (int (*)(...))QItemSelectionModel::clear -144 (int (*)(...))QItemSelectionModel::reset -152 (int (*)(...))QItemSelectionModel::clearCurrentIndex - -Class QItemSelectionModel - size=16 align=8 - base size=16 base align=8 -QItemSelectionModel (0x0x7f64ea6c34e0) 0 - vptr=((& QItemSelectionModel::_ZTV19QItemSelectionModel) + 16u) - QObject (0x0x7f64ea69a600) 0 - primary-for QItemSelectionModel (0x0x7f64ea6c34e0) - -Class QItemSelection - size=8 align=8 - base size=8 base align=8 -QItemSelection (0x0x7f64ea6c36e8) 0 - QList (0x0x7f64ea6c3750) 0 - QListSpecialMethods (0x0x7f64ea69a960) 0 empty - -Class QJsonValue - size=24 align=8 - base size=20 base align=8 -QJsonValue (0x0x7f64ea69ae40) 0 - -Class QJsonValueRef - size=16 align=8 - base size=12 base align=8 -QJsonValueRef (0x0x7f64ea4d15a0) 0 - -Class QJsonValuePtr - size=24 align=8 - base size=24 base align=8 -QJsonValuePtr (0x0x7f64ea4d1ae0) 0 - -Class QJsonValueRefPtr - size=16 align=8 - base size=16 base align=8 -QJsonValueRefPtr (0x0x7f64ea4d1b40) 0 - -Class QJsonArray::iterator - size=16 align=8 - base size=12 base align=8 -QJsonArray::iterator (0x0x7f64ea4d1d20) 0 - -Class QJsonArray::const_iterator - size=16 align=8 - base size=12 base align=8 -QJsonArray::const_iterator (0x0x7f64ea4d1d80) 0 - -Class QJsonArray - size=16 align=8 - base size=16 base align=8 -QJsonArray (0x0x7f64ea4d1cc0) 0 - -Class QJsonParseError - size=8 align=4 - base size=8 base align=4 -QJsonParseError (0x0x7f64ea63f000) 0 - -Class QJsonDocument - size=8 align=8 - base size=8 base align=8 -QJsonDocument (0x0x7f64ea63f060) 0 - -Class QJsonObject::iterator - size=16 align=8 - base size=12 base align=8 -QJsonObject::iterator (0x0x7f64ea63f6c0) 0 - -Class QJsonObject::const_iterator - size=16 align=8 - base size=12 base align=8 -QJsonObject::const_iterator (0x0x7f64ea63f720) 0 - -Class QJsonObject - size=16 align=8 - base size=16 base align=8 -QJsonObject (0x0x7f64ea63f660) 0 - -Class QLibrary::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QLibrary::QPrivateSignal (0x0x7f64ea2f09c0) 0 empty - -Vtable for QLibrary -QLibrary::_ZTV8QLibrary: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QLibrary) -16 (int (*)(...))QLibrary::metaObject -24 (int (*)(...))QLibrary::qt_metacast -32 (int (*)(...))QLibrary::qt_metacall -40 (int (*)(...))QLibrary::~QLibrary -48 (int (*)(...))QLibrary::~QLibrary -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QLibrary - size=32 align=8 - base size=25 base align=8 -QLibrary (0x0x7f64ea2efa90) 0 - vptr=((& QLibrary::_ZTV8QLibrary) + 16u) - QObject (0x0x7f64ea2f0960) 0 - primary-for QLibrary (0x0x7f64ea2efa90) - -Class QVersionNumber::SegmentStorage - size=8 align=8 - base size=8 base align=8 -QVersionNumber::SegmentStorage (0x0x7f64ea37f0c0) 0 - -Class QVersionNumber - size=8 align=8 - base size=8 base align=8 -QVersionNumber (0x0x7f64ea2f0ba0) 0 - -Class QLibraryInfo - size=1 align=1 - base size=0 base align=1 -QLibraryInfo (0x0x7f64ea37f5a0) 0 empty - -Class QPoint - size=8 align=4 - base size=8 base align=4 -QPoint (0x0x7f64ea37f600) 0 - -Class QPointF - size=16 align=8 - base size=16 base align=8 -QPointF (0x0x7f64ea37f8a0) 0 - -Class QLine - size=16 align=4 - base size=16 base align=4 -QLine (0x0x7f64ea37fb40) 0 - -Class QLineF - size=32 align=8 - base size=32 base align=8 -QLineF (0x0x7f64ea0774e0) 0 - -Class QLinkedListData - size=32 align=8 - base size=25 base align=8 -QLinkedListData (0x0x7f64ea077e40) 0 - -Class QLockFile - size=8 align=8 - base size=8 base align=8 -QLockFile (0x0x7f64ea1161e0) 0 - -Class QLoggingCategory::AtomicBools - size=4 align=1 - base size=4 base align=1 -QLoggingCategory::AtomicBools (0x0x7f64ea116360) 0 - -Class QLoggingCategory - size=24 align=8 - base size=24 base align=8 -QLoggingCategory (0x0x7f64ea116300) 0 - -Class QMargins - size=16 align=4 - base size=16 base align=4 -QMargins (0x0x7f64ea1164e0) 0 - -Class QMarginsF - size=32 align=8 - base size=32 base align=8 -QMarginsF (0x0x7f64ea116780) 0 - -Class QMessageAuthenticationCode - size=8 align=8 - base size=8 base align=8 -QMessageAuthenticationCode (0x0x7f64ea116de0) 0 - -Class QMetaMethod - size=16 align=8 - base size=12 base align=8 -QMetaMethod (0x0x7f64ea116e40) 0 - -Class QMetaEnum - size=16 align=8 - base size=12 base align=8 -QMetaEnum (0x0x7f64e9ee5480) 0 - -Class QMetaProperty - size=32 align=8 - base size=32 base align=8 -QMetaProperty (0x0x7f64e9ee5780) 0 - -Class QMetaClassInfo - size=16 align=8 - base size=12 base align=8 -QMetaClassInfo (0x0x7f64e9ee57e0) 0 - -Class QMimeData::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QMimeData::QPrivateSignal (0x0x7f64e9ee5ae0) 0 empty - -Vtable for QMimeData -QMimeData::_ZTV9QMimeData: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QMimeData) -16 (int (*)(...))QMimeData::metaObject -24 (int (*)(...))QMimeData::qt_metacast -32 (int (*)(...))QMimeData::qt_metacall -40 (int (*)(...))QMimeData::~QMimeData -48 (int (*)(...))QMimeData::~QMimeData -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QMimeData::hasFormat -120 (int (*)(...))QMimeData::formats -128 (int (*)(...))QMimeData::retrieveData - -Class QMimeData - size=16 align=8 - base size=16 base align=8 -QMimeData (0x0x7f64e9e73d00) 0 - vptr=((& QMimeData::_ZTV9QMimeData) + 16u) - QObject (0x0x7f64e9ee5a80) 0 - primary-for QMimeData (0x0x7f64e9e73d00) - -Class QMimeType - size=8 align=8 - base size=8 base align=8 -QMimeType (0x0x7f64e9ee5b40) 0 - -Class QMimeDatabase - size=8 align=8 - base size=8 base align=8 -QMimeDatabase (0x0x7f64e9ee5e40) 0 - -Class QObjectCleanupHandler::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QObjectCleanupHandler::QPrivateSignal (0x0x7f64e9ee5f00) 0 empty - -Vtable for QObjectCleanupHandler -QObjectCleanupHandler::_ZTV21QObjectCleanupHandler: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QObjectCleanupHandler) -16 (int (*)(...))QObjectCleanupHandler::metaObject -24 (int (*)(...))QObjectCleanupHandler::qt_metacast -32 (int (*)(...))QObjectCleanupHandler::qt_metacall -40 (int (*)(...))QObjectCleanupHandler::~QObjectCleanupHandler -48 (int (*)(...))QObjectCleanupHandler::~QObjectCleanupHandler -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QObjectCleanupHandler - size=24 align=8 - base size=24 base align=8 -QObjectCleanupHandler (0x0x7f64e9e73f08) 0 - vptr=((& QObjectCleanupHandler::_ZTV21QObjectCleanupHandler) + 16u) - QObject (0x0x7f64e9ee5ea0) 0 - primary-for QObjectCleanupHandler (0x0x7f64e9e73f08) - -Class QOperatingSystemVersion - size=16 align=4 - base size=16 base align=4 -QOperatingSystemVersion (0x0x7f64e9ee5f60) 0 - -Class QParallelAnimationGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QParallelAnimationGroup::QPrivateSignal (0x0x7f64e9f6e720) 0 empty - -Vtable for QParallelAnimationGroup -QParallelAnimationGroup::_ZTV23QParallelAnimationGroup: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QParallelAnimationGroup) -16 (int (*)(...))QParallelAnimationGroup::metaObject -24 (int (*)(...))QParallelAnimationGroup::qt_metacast -32 (int (*)(...))QParallelAnimationGroup::qt_metacall -40 (int (*)(...))QParallelAnimationGroup::~QParallelAnimationGroup -48 (int (*)(...))QParallelAnimationGroup::~QParallelAnimationGroup -56 (int (*)(...))QParallelAnimationGroup::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QParallelAnimationGroup::duration -120 (int (*)(...))QParallelAnimationGroup::updateCurrentTime -128 (int (*)(...))QParallelAnimationGroup::updateState -136 (int (*)(...))QParallelAnimationGroup::updateDirection - -Class QParallelAnimationGroup - size=16 align=8 - base size=16 base align=8 -QParallelAnimationGroup (0x0x7f64e9f74618) 0 - vptr=((& QParallelAnimationGroup::_ZTV23QParallelAnimationGroup) + 16u) - QAnimationGroup (0x0x7f64e9f74680) 0 - primary-for QParallelAnimationGroup (0x0x7f64e9f74618) - QAbstractAnimation (0x0x7f64e9f746e8) 0 - primary-for QAnimationGroup (0x0x7f64e9f74680) - QObject (0x0x7f64e9f6e6c0) 0 - primary-for QAbstractAnimation (0x0x7f64e9f746e8) - -Class QPauseAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPauseAnimation::QPrivateSignal (0x0x7f64e9f6e7e0) 0 empty - -Vtable for QPauseAnimation -QPauseAnimation::_ZTV15QPauseAnimation: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QPauseAnimation) -16 (int (*)(...))QPauseAnimation::metaObject -24 (int (*)(...))QPauseAnimation::qt_metacast -32 (int (*)(...))QPauseAnimation::qt_metacall -40 (int (*)(...))QPauseAnimation::~QPauseAnimation -48 (int (*)(...))QPauseAnimation::~QPauseAnimation -56 (int (*)(...))QPauseAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QPauseAnimation::duration -120 (int (*)(...))QPauseAnimation::updateCurrentTime -128 (int (*)(...))QAbstractAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection - -Class QPauseAnimation - size=16 align=8 - base size=16 base align=8 -QPauseAnimation (0x0x7f64e9f74750) 0 - vptr=((& QPauseAnimation::_ZTV15QPauseAnimation) + 16u) - QAbstractAnimation (0x0x7f64e9f747b8) 0 - primary-for QPauseAnimation (0x0x7f64e9f74750) - QObject (0x0x7f64e9f6e780) 0 - primary-for QAbstractAnimation (0x0x7f64e9f747b8) - -Class QStaticPlugin - size=16 align=8 - base size=16 base align=8 -QStaticPlugin (0x0x7f64e9f6e9c0) 0 - -Class QPluginLoader::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPluginLoader::QPrivateSignal (0x0x7f64e9f6ecc0) 0 empty - -Vtable for QPluginLoader -QPluginLoader::_ZTV13QPluginLoader: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QPluginLoader) -16 (int (*)(...))QPluginLoader::metaObject -24 (int (*)(...))QPluginLoader::qt_metacast -32 (int (*)(...))QPluginLoader::qt_metacall -40 (int (*)(...))QPluginLoader::~QPluginLoader -48 (int (*)(...))QPluginLoader::~QPluginLoader -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QPluginLoader - size=32 align=8 - base size=25 base align=8 -QPluginLoader (0x0x7f64e9f749c0) 0 - vptr=((& QPluginLoader::_ZTV13QPluginLoader) + 16u) - QObject (0x0x7f64e9f6ec60) 0 - primary-for QPluginLoader (0x0x7f64e9f749c0) - -Class QProcessEnvironment - size=8 align=8 - base size=8 base align=8 -QProcessEnvironment (0x0x7f64e9f6ed20) 0 - -Class QProcess::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QProcess::QPrivateSignal (0x0x7f64e9ff2420) 0 empty - -Vtable for QProcess -QProcess::_ZTV8QProcess: 31u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QProcess) -16 (int (*)(...))QProcess::metaObject -24 (int (*)(...))QProcess::qt_metacast -32 (int (*)(...))QProcess::qt_metacall -40 (int (*)(...))QProcess::~QProcess -48 (int (*)(...))QProcess::~QProcess -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QProcess::isSequential -120 (int (*)(...))QProcess::open -128 (int (*)(...))QProcess::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QProcess::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QProcess::bytesAvailable -184 (int (*)(...))QProcess::bytesToWrite -192 (int (*)(...))QProcess::canReadLine -200 (int (*)(...))QProcess::waitForReadyRead -208 (int (*)(...))QProcess::waitForBytesWritten -216 (int (*)(...))QProcess::readData -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QProcess::writeData -240 (int (*)(...))QProcess::setupChildProcess - -Class QProcess - size=16 align=8 - base size=16 base align=8 -QProcess (0x0x7f64e9ffc068) 0 - vptr=((& QProcess::_ZTV8QProcess) + 16u) - QIODevice (0x0x7f64e9ffc0d0) 0 - primary-for QProcess (0x0x7f64e9ffc068) - QObject (0x0x7f64e9ff23c0) 0 - primary-for QIODevice (0x0x7f64e9ffc0d0) - -Class QVariantAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QVariantAnimation::QPrivateSignal (0x0x7f64e9ff24e0) 0 empty - -Vtable for QVariantAnimation -QVariantAnimation::_ZTV17QVariantAnimation: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QVariantAnimation) -16 (int (*)(...))QVariantAnimation::metaObject -24 (int (*)(...))QVariantAnimation::qt_metacast -32 (int (*)(...))QVariantAnimation::qt_metacall -40 (int (*)(...))QVariantAnimation::~QVariantAnimation -48 (int (*)(...))QVariantAnimation::~QVariantAnimation -56 (int (*)(...))QVariantAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QVariantAnimation::duration -120 (int (*)(...))QVariantAnimation::updateCurrentTime -128 (int (*)(...))QVariantAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection -144 (int (*)(...))QVariantAnimation::updateCurrentValue -152 (int (*)(...))QVariantAnimation::interpolated - -Class QVariantAnimation - size=16 align=8 - base size=16 base align=8 -QVariantAnimation (0x0x7f64e9ffc138) 0 - vptr=((& QVariantAnimation::_ZTV17QVariantAnimation) + 16u) - QAbstractAnimation (0x0x7f64e9ffc1a0) 0 - primary-for QVariantAnimation (0x0x7f64e9ffc138) - QObject (0x0x7f64e9ff2480) 0 - primary-for QAbstractAnimation (0x0x7f64e9ffc1a0) - -Class QPropertyAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPropertyAnimation::QPrivateSignal (0x0x7f64e9ff25a0) 0 empty - -Vtable for QPropertyAnimation -QPropertyAnimation::_ZTV18QPropertyAnimation: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QPropertyAnimation) -16 (int (*)(...))QPropertyAnimation::metaObject -24 (int (*)(...))QPropertyAnimation::qt_metacast -32 (int (*)(...))QPropertyAnimation::qt_metacall -40 (int (*)(...))QPropertyAnimation::~QPropertyAnimation -48 (int (*)(...))QPropertyAnimation::~QPropertyAnimation -56 (int (*)(...))QPropertyAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QVariantAnimation::duration -120 (int (*)(...))QVariantAnimation::updateCurrentTime -128 (int (*)(...))QPropertyAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection -144 (int (*)(...))QPropertyAnimation::updateCurrentValue -152 (int (*)(...))QVariantAnimation::interpolated - -Class QPropertyAnimation - size=16 align=8 - base size=16 base align=8 -QPropertyAnimation (0x0x7f64e9ffc270) 0 - vptr=((& QPropertyAnimation::_ZTV18QPropertyAnimation) + 16u) - QVariantAnimation (0x0x7f64e9ffc2d8) 0 - primary-for QPropertyAnimation (0x0x7f64e9ffc270) - QAbstractAnimation (0x0x7f64e9ffc340) 0 - primary-for QVariantAnimation (0x0x7f64e9ffc2d8) - QObject (0x0x7f64e9ff2540) 0 - primary-for QAbstractAnimation (0x0x7f64e9ffc340) - -Class QRandomGenerator::Storage - size=2504 align=8 - base size=2504 base align=8 -QRandomGenerator::Storage (0x0x7f64e9ff26c0) 0 - -Class QRandomGenerator - size=2512 align=8 - base size=2512 base align=8 -QRandomGenerator (0x0x7f64e9ff2660) 0 - -Class QRandomGenerator64 - size=2512 align=8 - base size=2512 base align=8 -QRandomGenerator64 (0x0x7f64e9cdc618) 0 - QRandomGenerator (0x0x7f64e9cdf660) 0 - -Class QReadWriteLock - size=8 align=8 - base size=8 base align=8 -QReadWriteLock (0x0x7f64e9cdf720) 0 - -Class QReadLocker - size=8 align=8 - base size=8 base align=8 -QReadLocker (0x0x7f64e9cdf9c0) 0 - -Class QWriteLocker - size=8 align=8 - base size=8 base align=8 -QWriteLocker (0x0x7f64e9cdfa80) 0 - -Class QSize - size=8 align=4 - base size=8 base align=4 -QSize (0x0x7f64e9cdfb40) 0 - -Class QSizeF - size=16 align=8 - base size=16 base align=8 -QSizeF (0x0x7f64e9cdfde0) 0 - -Class QRect - size=16 align=4 - base size=16 base align=4 -QRect (0x0x7f64e9df80c0) 0 - -Class QRectF - size=32 align=8 - base size=32 base align=8 -QRectF (0x0x7f64e9df8360) 0 - -Class QRegularExpression - size=8 align=8 - base size=8 base align=8 -QRegularExpression (0x0x7f64e9df8600) 0 - -Class QRegularExpressionMatch - size=8 align=8 - base size=8 base align=8 -QRegularExpressionMatch (0x0x7f64e9df8c00) 0 - -Class QRegularExpressionMatchIterator - size=8 align=8 - base size=8 base align=8 -QRegularExpressionMatchIterator (0x0x7f64e9df8f00) 0 - -Class QResource - size=8 align=8 - base size=8 base align=8 -QResource (0x0x7f64e9bfc240) 0 - -Class QSaveFile::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSaveFile::QPrivateSignal (0x0x7f64e9bfc3c0) 0 empty - -Vtable for QSaveFile -QSaveFile::_ZTV9QSaveFile: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QSaveFile) -16 (int (*)(...))QSaveFile::metaObject -24 (int (*)(...))QSaveFile::qt_metacast -32 (int (*)(...))QSaveFile::qt_metacall -40 (int (*)(...))QSaveFile::~QSaveFile -48 (int (*)(...))QSaveFile::~QSaveFile -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QSaveFile::open -128 (int (*)(...))QSaveFile::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFileDevice::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QSaveFile::writeData -240 (int (*)(...))QSaveFile::fileName -248 (int (*)(...))QFileDevice::resize -256 (int (*)(...))QFileDevice::permissions -264 (int (*)(...))QFileDevice::setPermissions - -Class QSaveFile - size=16 align=8 - base size=16 base align=8 -QSaveFile (0x0x7f64e9ae6820) 0 - vptr=((& QSaveFile::_ZTV9QSaveFile) + 16u) - QFileDevice (0x0x7f64e9ae6888) 0 - primary-for QSaveFile (0x0x7f64e9ae6820) - QIODevice (0x0x7f64e9ae68f0) 0 - primary-for QFileDevice (0x0x7f64e9ae6888) - QObject (0x0x7f64e9bfc360) 0 - primary-for QIODevice (0x0x7f64e9ae68f0) - -Class QSemaphore - size=8 align=8 - base size=8 base align=8 -QSemaphore (0x0x7f64e9bfc480) 0 - -Class QSemaphoreReleaser - size=16 align=8 - base size=12 base align=8 -QSemaphoreReleaser (0x0x7f64e9bfc600) 0 - -Class QSequentialAnimationGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSequentialAnimationGroup::QPrivateSignal (0x0x7f64e9942c00) 0 empty - -Vtable for QSequentialAnimationGroup -QSequentialAnimationGroup::_ZTV25QSequentialAnimationGroup: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QSequentialAnimationGroup) -16 (int (*)(...))QSequentialAnimationGroup::metaObject -24 (int (*)(...))QSequentialAnimationGroup::qt_metacast -32 (int (*)(...))QSequentialAnimationGroup::qt_metacall -40 (int (*)(...))QSequentialAnimationGroup::~QSequentialAnimationGroup -48 (int (*)(...))QSequentialAnimationGroup::~QSequentialAnimationGroup -56 (int (*)(...))QSequentialAnimationGroup::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QSequentialAnimationGroup::duration -120 (int (*)(...))QSequentialAnimationGroup::updateCurrentTime -128 (int (*)(...))QSequentialAnimationGroup::updateState -136 (int (*)(...))QSequentialAnimationGroup::updateDirection - -Class QSequentialAnimationGroup - size=16 align=8 - base size=16 base align=8 -QSequentialAnimationGroup (0x0x7f64e995e1a0) 0 - vptr=((& QSequentialAnimationGroup::_ZTV25QSequentialAnimationGroup) + 16u) - QAnimationGroup (0x0x7f64e995e208) 0 - primary-for QSequentialAnimationGroup (0x0x7f64e995e1a0) - QAbstractAnimation (0x0x7f64e995e270) 0 - primary-for QAnimationGroup (0x0x7f64e995e208) - QObject (0x0x7f64e9942ba0) 0 - primary-for QAbstractAnimation (0x0x7f64e995e270) - -Class QSettings::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSettings::QPrivateSignal (0x0x7f64e9942cc0) 0 empty - -Vtable for QSettings -QSettings::_ZTV9QSettings: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QSettings) -16 (int (*)(...))QSettings::metaObject -24 (int (*)(...))QSettings::qt_metacast -32 (int (*)(...))QSettings::qt_metacall -40 (int (*)(...))QSettings::~QSettings -48 (int (*)(...))QSettings::~QSettings -56 (int (*)(...))QSettings::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSettings - size=16 align=8 - base size=16 base align=8 -QSettings (0x0x7f64e995e2d8) 0 - vptr=((& QSettings::_ZTV9QSettings) + 16u) - QObject (0x0x7f64e9942c60) 0 - primary-for QSettings (0x0x7f64e995e2d8) - -Class QSharedMemory::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSharedMemory::QPrivateSignal (0x0x7f64e9942d80) 0 empty - -Vtable for QSharedMemory -QSharedMemory::_ZTV13QSharedMemory: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QSharedMemory) -16 (int (*)(...))QSharedMemory::metaObject -24 (int (*)(...))QSharedMemory::qt_metacast -32 (int (*)(...))QSharedMemory::qt_metacall -40 (int (*)(...))QSharedMemory::~QSharedMemory -48 (int (*)(...))QSharedMemory::~QSharedMemory -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSharedMemory - size=16 align=8 - base size=16 base align=8 -QSharedMemory (0x0x7f64e995e340) 0 - vptr=((& QSharedMemory::_ZTV13QSharedMemory) + 16u) - QObject (0x0x7f64e9942d20) 0 - primary-for QSharedMemory (0x0x7f64e995e340) - -Class QSignalMapper::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSignalMapper::QPrivateSignal (0x0x7f64e9942e40) 0 empty - -Vtable for QSignalMapper -QSignalMapper::_ZTV13QSignalMapper: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QSignalMapper) -16 (int (*)(...))QSignalMapper::metaObject -24 (int (*)(...))QSignalMapper::qt_metacast -32 (int (*)(...))QSignalMapper::qt_metacall -40 (int (*)(...))QSignalMapper::~QSignalMapper -48 (int (*)(...))QSignalMapper::~QSignalMapper -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSignalMapper - size=16 align=8 - base size=16 base align=8 -QSignalMapper (0x0x7f64e995e3a8) 0 - vptr=((& QSignalMapper::_ZTV13QSignalMapper) + 16u) - QObject (0x0x7f64e9942de0) 0 - primary-for QSignalMapper (0x0x7f64e995e3a8) - -Class QSignalTransition::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSignalTransition::QPrivateSignal (0x0x7f64e9942f00) 0 empty - -Vtable for QSignalTransition -QSignalTransition::_ZTV17QSignalTransition: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSignalTransition) -16 (int (*)(...))QSignalTransition::metaObject -24 (int (*)(...))QSignalTransition::qt_metacast -32 (int (*)(...))QSignalTransition::qt_metacall -40 (int (*)(...))QSignalTransition::~QSignalTransition -48 (int (*)(...))QSignalTransition::~QSignalTransition -56 (int (*)(...))QSignalTransition::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QSignalTransition::eventTest -120 (int (*)(...))QSignalTransition::onTransition - -Class QSignalTransition - size=16 align=8 - base size=16 base align=8 -QSignalTransition (0x0x7f64e995e410) 0 - vptr=((& QSignalTransition::_ZTV17QSignalTransition) + 16u) - QAbstractTransition (0x0x7f64e995e478) 0 - primary-for QSignalTransition (0x0x7f64e995e410) - QObject (0x0x7f64e9942ea0) 0 - primary-for QAbstractTransition (0x0x7f64e995e478) - -Class QSocketNotifier::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSocketNotifier::QPrivateSignal (0x0x7f64e99cf000) 0 empty - -Vtable for QSocketNotifier -QSocketNotifier::_ZTV15QSocketNotifier: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QSocketNotifier) -16 (int (*)(...))QSocketNotifier::metaObject -24 (int (*)(...))QSocketNotifier::qt_metacast -32 (int (*)(...))QSocketNotifier::qt_metacall -40 (int (*)(...))QSocketNotifier::~QSocketNotifier -48 (int (*)(...))QSocketNotifier::~QSocketNotifier -56 (int (*)(...))QSocketNotifier::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSocketNotifier - size=16 align=8 - base size=16 base align=8 -QSocketNotifier (0x0x7f64e995e4e0) 0 - vptr=((& QSocketNotifier::_ZTV15QSocketNotifier) + 16u) - QObject (0x0x7f64e9942f60) 0 - primary-for QSocketNotifier (0x0x7f64e995e4e0) - -Class QSortFilterProxyModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSortFilterProxyModel::QPrivateSignal (0x0x7f64e99cf0c0) 0 empty - -Vtable for QSortFilterProxyModel -QSortFilterProxyModel::_ZTV21QSortFilterProxyModel: 56u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QSortFilterProxyModel) -16 (int (*)(...))QSortFilterProxyModel::metaObject -24 (int (*)(...))QSortFilterProxyModel::qt_metacast -32 (int (*)(...))QSortFilterProxyModel::qt_metacall -40 (int (*)(...))QSortFilterProxyModel::~QSortFilterProxyModel -48 (int (*)(...))QSortFilterProxyModel::~QSortFilterProxyModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QSortFilterProxyModel::index -120 (int (*)(...))QSortFilterProxyModel::parent -128 (int (*)(...))QSortFilterProxyModel::sibling -136 (int (*)(...))QSortFilterProxyModel::rowCount -144 (int (*)(...))QSortFilterProxyModel::columnCount -152 (int (*)(...))QSortFilterProxyModel::hasChildren -160 (int (*)(...))QSortFilterProxyModel::data -168 (int (*)(...))QSortFilterProxyModel::setData -176 (int (*)(...))QSortFilterProxyModel::headerData -184 (int (*)(...))QSortFilterProxyModel::setHeaderData -192 (int (*)(...))QAbstractProxyModel::itemData -200 (int (*)(...))QAbstractProxyModel::setItemData -208 (int (*)(...))QSortFilterProxyModel::mimeTypes -216 (int (*)(...))QSortFilterProxyModel::mimeData -224 (int (*)(...))QAbstractProxyModel::canDropMimeData -232 (int (*)(...))QSortFilterProxyModel::dropMimeData -240 (int (*)(...))QSortFilterProxyModel::supportedDropActions -248 (int (*)(...))QAbstractProxyModel::supportedDragActions -256 (int (*)(...))QSortFilterProxyModel::insertRows -264 (int (*)(...))QSortFilterProxyModel::insertColumns -272 (int (*)(...))QSortFilterProxyModel::removeRows -280 (int (*)(...))QSortFilterProxyModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QSortFilterProxyModel::fetchMore -312 (int (*)(...))QSortFilterProxyModel::canFetchMore -320 (int (*)(...))QSortFilterProxyModel::flags -328 (int (*)(...))QSortFilterProxyModel::sort -336 (int (*)(...))QSortFilterProxyModel::buddy -344 (int (*)(...))QSortFilterProxyModel::match -352 (int (*)(...))QSortFilterProxyModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractProxyModel::submit -376 (int (*)(...))QAbstractProxyModel::revert -384 (int (*)(...))QSortFilterProxyModel::setSourceModel -392 (int (*)(...))QSortFilterProxyModel::mapToSource -400 (int (*)(...))QSortFilterProxyModel::mapFromSource -408 (int (*)(...))QSortFilterProxyModel::mapSelectionToSource -416 (int (*)(...))QSortFilterProxyModel::mapSelectionFromSource -424 (int (*)(...))QSortFilterProxyModel::filterAcceptsRow -432 (int (*)(...))QSortFilterProxyModel::filterAcceptsColumn -440 (int (*)(...))QSortFilterProxyModel::lessThan - -Class QSortFilterProxyModel - size=16 align=8 - base size=16 base align=8 -QSortFilterProxyModel (0x0x7f64e995e548) 0 - vptr=((& QSortFilterProxyModel::_ZTV21QSortFilterProxyModel) + 16u) - QAbstractProxyModel (0x0x7f64e995e5b0) 0 - primary-for QSortFilterProxyModel (0x0x7f64e995e548) - QAbstractItemModel (0x0x7f64e995e618) 0 - primary-for QAbstractProxyModel (0x0x7f64e995e5b0) - QObject (0x0x7f64e99cf060) 0 - primary-for QAbstractItemModel (0x0x7f64e995e618) - -Class QStandardPaths - size=1 align=1 - base size=0 base align=1 -QStandardPaths (0x0x7f64e99cf180) 0 empty - -Class QState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QState::QPrivateSignal (0x0x7f64e99cf3c0) 0 empty - -Vtable for QState -QState::_ZTV6QState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QState) -16 (int (*)(...))QState::metaObject -24 (int (*)(...))QState::qt_metacast -32 (int (*)(...))QState::qt_metacall -40 (int (*)(...))QState::~QState -48 (int (*)(...))QState::~QState -56 (int (*)(...))QState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QState::onEntry -120 (int (*)(...))QState::onExit - -Class QState - size=16 align=8 - base size=16 base align=8 -QState (0x0x7f64e995e7b8) 0 - vptr=((& QState::_ZTV6QState) + 16u) - QAbstractState (0x0x7f64e995e820) 0 - primary-for QState (0x0x7f64e995e7b8) - QObject (0x0x7f64e99cf360) 0 - primary-for QAbstractState (0x0x7f64e995e820) - -Class QStateMachine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStateMachine::QPrivateSignal (0x0x7f64e99cf4e0) 0 empty - -Vtable for QStateMachine::SignalEvent -QStateMachine::SignalEvent::_ZTVN13QStateMachine11SignalEventE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN13QStateMachine11SignalEventE) -16 (int (*)(...))QStateMachine::SignalEvent::~SignalEvent -24 (int (*)(...))QStateMachine::SignalEvent::~SignalEvent - -Class QStateMachine::SignalEvent - size=48 align=8 - base size=48 base align=8 -QStateMachine::SignalEvent (0x0x7f64e995e9c0) 0 - vptr=((& QStateMachine::SignalEvent::_ZTVN13QStateMachine11SignalEventE) + 16u) - QEvent (0x0x7f64e99cf540) 0 - primary-for QStateMachine::SignalEvent (0x0x7f64e995e9c0) - -Vtable for QStateMachine::WrappedEvent -QStateMachine::WrappedEvent::_ZTVN13QStateMachine12WrappedEventE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN13QStateMachine12WrappedEventE) -16 (int (*)(...))QStateMachine::WrappedEvent::~WrappedEvent -24 (int (*)(...))QStateMachine::WrappedEvent::~WrappedEvent - -Class QStateMachine::WrappedEvent - size=40 align=8 - base size=40 base align=8 -QStateMachine::WrappedEvent (0x0x7f64e995ea28) 0 - vptr=((& QStateMachine::WrappedEvent::_ZTVN13QStateMachine12WrappedEventE) + 16u) - QEvent (0x0x7f64e99cf5a0) 0 - primary-for QStateMachine::WrappedEvent (0x0x7f64e995ea28) - -Vtable for QStateMachine -QStateMachine::_ZTV13QStateMachine: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QStateMachine) -16 (int (*)(...))QStateMachine::metaObject -24 (int (*)(...))QStateMachine::qt_metacast -32 (int (*)(...))QStateMachine::qt_metacall -40 (int (*)(...))QStateMachine::~QStateMachine -48 (int (*)(...))QStateMachine::~QStateMachine -56 (int (*)(...))QStateMachine::event -64 (int (*)(...))QStateMachine::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QStateMachine::onEntry -120 (int (*)(...))QStateMachine::onExit -128 (int (*)(...))QStateMachine::beginSelectTransitions -136 (int (*)(...))QStateMachine::endSelectTransitions -144 (int (*)(...))QStateMachine::beginMicrostep -152 (int (*)(...))QStateMachine::endMicrostep - -Class QStateMachine - size=16 align=8 - base size=16 base align=8 -QStateMachine (0x0x7f64e995e888) 0 - vptr=((& QStateMachine::_ZTV13QStateMachine) + 16u) - QState (0x0x7f64e995e8f0) 0 - primary-for QStateMachine (0x0x7f64e995e888) - QAbstractState (0x0x7f64e995e958) 0 - primary-for QState (0x0x7f64e995e8f0) - QObject (0x0x7f64e99cf480) 0 - primary-for QAbstractState (0x0x7f64e995e958) - -Class QStorageInfo - size=8 align=8 - base size=8 base align=8 -QStorageInfo (0x0x7f64e99cf600) 0 - -Class QAbstractConcatenable - size=1 align=1 - base size=0 base align=1 -QAbstractConcatenable (0x0x7f64e96c5540) 0 empty - -Class QStringListModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStringListModel::QPrivateSignal (0x0x7f64e974a900) 0 empty - -Vtable for QStringListModel -QStringListModel::_ZTV16QStringListModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QStringListModel) -16 (int (*)(...))QStringListModel::metaObject -24 (int (*)(...))QStringListModel::qt_metacast -32 (int (*)(...))QStringListModel::qt_metacall -40 (int (*)(...))QStringListModel::~QStringListModel -48 (int (*)(...))QStringListModel::~QStringListModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractListModel::index -120 (int (*)(...))QAbstractListModel::parent -128 (int (*)(...))QStringListModel::sibling -136 (int (*)(...))QStringListModel::rowCount -144 (int (*)(...))QAbstractListModel::columnCount -152 (int (*)(...))QAbstractListModel::hasChildren -160 (int (*)(...))QStringListModel::data -168 (int (*)(...))QStringListModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractListModel::dropMimeData -240 (int (*)(...))QStringListModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QStringListModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QStringListModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QStringListModel::flags -328 (int (*)(...))QStringListModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QStringListModel - size=24 align=8 - base size=24 base align=8 -QStringListModel (0x0x7f64e974fa28) 0 - vptr=((& QStringListModel::_ZTV16QStringListModel) + 16u) - QAbstractListModel (0x0x7f64e974fa90) 0 - primary-for QStringListModel (0x0x7f64e974fa28) - QAbstractItemModel (0x0x7f64e974faf8) 0 - primary-for QAbstractListModel (0x0x7f64e974fa90) - QObject (0x0x7f64e974a8a0) 0 - primary-for QAbstractItemModel (0x0x7f64e974faf8) - -Class QSystemSemaphore - size=8 align=8 - base size=8 base align=8 -QSystemSemaphore (0x0x7f64e974a960) 0 - -Class QTemporaryDir - size=8 align=8 - base size=8 base align=8 -QTemporaryDir (0x0x7f64e974aa20) 0 - -Class QTemporaryFile::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTemporaryFile::QPrivateSignal (0x0x7f64e974ab40) 0 empty - -Vtable for QTemporaryFile -QTemporaryFile::_ZTV14QTemporaryFile: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QTemporaryFile) -16 (int (*)(...))QTemporaryFile::metaObject -24 (int (*)(...))QTemporaryFile::qt_metacast -32 (int (*)(...))QTemporaryFile::qt_metacall -40 (int (*)(...))QTemporaryFile::~QTemporaryFile -48 (int (*)(...))QTemporaryFile::~QTemporaryFile -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QTemporaryFile::open -128 (int (*)(...))QFileDevice::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFile::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QFileDevice::writeData -240 (int (*)(...))QTemporaryFile::fileName -248 (int (*)(...))QFile::resize -256 (int (*)(...))QFile::permissions -264 (int (*)(...))QFile::setPermissions - -Class QTemporaryFile - size=16 align=8 - base size=16 base align=8 -QTemporaryFile (0x0x7f64e974fb60) 0 - vptr=((& QTemporaryFile::_ZTV14QTemporaryFile) + 16u) - QFile (0x0x7f64e974fbc8) 0 - primary-for QTemporaryFile (0x0x7f64e974fb60) - QFileDevice (0x0x7f64e974fc30) 0 - primary-for QFile (0x0x7f64e974fbc8) - QIODevice (0x0x7f64e974fc98) 0 - primary-for QFileDevice (0x0x7f64e974fc30) - QObject (0x0x7f64e974aae0) 0 - primary-for QIODevice (0x0x7f64e974fc98) - -Class QTextBoundaryFinder - size=48 align=8 - base size=48 base align=8 -QTextBoundaryFinder (0x0x7f64e974aba0) 0 - -Class QTextCodec::ConverterState - size=32 align=8 - base size=32 base align=8 -QTextCodec::ConverterState (0x0x7f64e974ade0) 0 - -Vtable for QTextCodec -QTextCodec::_ZTV10QTextCodec: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTextCodec) -16 (int (*)(...))__cxa_pure_virtual -24 (int (*)(...))QTextCodec::aliases -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 0u -64 0u - -Class QTextCodec - size=8 align=8 - base size=8 base align=8 -QTextCodec (0x0x7f64e974ad80) 0 nearly-empty - vptr=((& QTextCodec::_ZTV10QTextCodec) + 16u) - -Class QTextEncoder - size=40 align=8 - base size=40 base align=8 -QTextEncoder (0x0x7f64e9836000) 0 - -Class QTextDecoder - size=40 align=8 - base size=40 base align=8 -QTextDecoder (0x0x7f64e9836060) 0 - -Class std::__mutex_base - size=40 align=8 - base size=40 base align=8 -std::__mutex_base (0x0x7f64e98360c0) 0 - -Class std::__recursive_mutex_base - size=40 align=8 - base size=40 base align=8 -std::__recursive_mutex_base (0x0x7f64e9836120) 0 - -Class std::mutex - size=40 align=8 - base size=40 base align=8 -std::mutex (0x0x7f64e974fea0) 0 - std::__mutex_base (0x0x7f64e9836180) 0 - -Class std::recursive_mutex - size=40 align=8 - base size=40 base align=8 -std::recursive_mutex (0x0x7f64e974ff08) 0 - std::__recursive_mutex_base (0x0x7f64e98361e0) 0 - -Class std::timed_mutex - size=40 align=8 - base size=40 base align=8 -std::timed_mutex (0x0x7f64e9461690) 0 - std::__mutex_base (0x0x7f64e9836300) 0 - std::__timed_mutex_impl (0x0x7f64e9836360) 0 empty - -Class std::recursive_timed_mutex - size=40 align=8 - base size=40 base align=8 -std::recursive_timed_mutex (0x0x7f64e947b070) 0 - std::__recursive_mutex_base (0x0x7f64e9836420) 0 - std::__timed_mutex_impl (0x0x7f64e9836480) 0 empty - -Class std::defer_lock_t - size=1 align=1 - base size=0 base align=1 -std::defer_lock_t (0x0x7f64e98364e0) 0 empty - -Class std::try_to_lock_t - size=1 align=1 - base size=0 base align=1 -std::try_to_lock_t (0x0x7f64e9836540) 0 empty - -Class std::adopt_lock_t - size=1 align=1 - base size=0 base align=1 -std::adopt_lock_t (0x0x7f64e98365a0) 0 empty - -Class std::once_flag - size=4 align=4 - base size=4 base align=4 -std::once_flag (0x0x7f64e98367e0) 0 - -Vtable for __gnu_cxx::__concurrence_lock_error -__gnu_cxx::__concurrence_lock_error::_ZTVN9__gnu_cxx24__concurrence_lock_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx24__concurrence_lock_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_lock_error::~__concurrence_lock_error -24 (int (*)(...))__gnu_cxx::__concurrence_lock_error::~__concurrence_lock_error -32 (int (*)(...))__gnu_cxx::__concurrence_lock_error::what - -Class __gnu_cxx::__concurrence_lock_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_lock_error (0x0x7f64e94c8068) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_lock_error::_ZTVN9__gnu_cxx24__concurrence_lock_errorE) + 16u) - std::exception (0x0x7f64e98368a0) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_lock_error (0x0x7f64e94c8068) - -Vtable for __gnu_cxx::__concurrence_unlock_error -__gnu_cxx::__concurrence_unlock_error::_ZTVN9__gnu_cxx26__concurrence_unlock_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx26__concurrence_unlock_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_unlock_error::~__concurrence_unlock_error -24 (int (*)(...))__gnu_cxx::__concurrence_unlock_error::~__concurrence_unlock_error -32 (int (*)(...))__gnu_cxx::__concurrence_unlock_error::what - -Class __gnu_cxx::__concurrence_unlock_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_unlock_error (0x0x7f64e94c80d0) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_unlock_error::_ZTVN9__gnu_cxx26__concurrence_unlock_errorE) + 16u) - std::exception (0x0x7f64e9836960) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_unlock_error (0x0x7f64e94c80d0) - -Vtable for __gnu_cxx::__concurrence_broadcast_error -__gnu_cxx::__concurrence_broadcast_error::_ZTVN9__gnu_cxx29__concurrence_broadcast_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx29__concurrence_broadcast_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_broadcast_error::~__concurrence_broadcast_error -24 (int (*)(...))__gnu_cxx::__concurrence_broadcast_error::~__concurrence_broadcast_error -32 (int (*)(...))__gnu_cxx::__concurrence_broadcast_error::what - -Class __gnu_cxx::__concurrence_broadcast_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_broadcast_error (0x0x7f64e94c8138) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_broadcast_error::_ZTVN9__gnu_cxx29__concurrence_broadcast_errorE) + 16u) - std::exception (0x0x7f64e9836a20) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_broadcast_error (0x0x7f64e94c8138) - -Vtable for __gnu_cxx::__concurrence_wait_error -__gnu_cxx::__concurrence_wait_error::_ZTVN9__gnu_cxx24__concurrence_wait_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx24__concurrence_wait_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_wait_error::~__concurrence_wait_error -24 (int (*)(...))__gnu_cxx::__concurrence_wait_error::~__concurrence_wait_error -32 (int (*)(...))__gnu_cxx::__concurrence_wait_error::what - -Class __gnu_cxx::__concurrence_wait_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_wait_error (0x0x7f64e94c8208) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_wait_error::_ZTVN9__gnu_cxx24__concurrence_wait_errorE) + 16u) - std::exception (0x0x7f64e9836ae0) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_wait_error (0x0x7f64e94c8208) - -Class __gnu_cxx::__mutex - size=40 align=8 - base size=40 base align=8 -__gnu_cxx::__mutex (0x0x7f64e9836ba0) 0 - -Class __gnu_cxx::__recursive_mutex - size=40 align=8 - base size=40 base align=8 -__gnu_cxx::__recursive_mutex (0x0x7f64e9836c00) 0 - -Class __gnu_cxx::__scoped_lock - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__scoped_lock (0x0x7f64e9836c60) 0 - -Class __gnu_cxx::__cond - size=48 align=8 - base size=48 base align=8 -__gnu_cxx::__cond (0x0x7f64e9836cc0) 0 - -Vtable for std::bad_weak_ptr -std::bad_weak_ptr::_ZTVSt12bad_weak_ptr: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12bad_weak_ptr) -16 (int (*)(...))std::bad_weak_ptr::~bad_weak_ptr -24 (int (*)(...))std::bad_weak_ptr::~bad_weak_ptr -32 (int (*)(...))std::bad_weak_ptr::what - -Class std::bad_weak_ptr - size=8 align=8 - base size=8 base align=8 -std::bad_weak_ptr (0x0x7f64e94c84e0) 0 nearly-empty - vptr=((& std::bad_weak_ptr::_ZTVSt12bad_weak_ptr) + 16u) - std::exception (0x0x7f64e958a060) 0 nearly-empty - primary-for std::bad_weak_ptr (0x0x7f64e94c84e0) - -Class std::_Sp_make_shared_tag - size=1 align=1 - base size=0 base align=1 -std::_Sp_make_shared_tag (0x0x7f64e958a8a0) 0 empty - -Class std::_Sp_locker - size=2 align=1 - base size=2 base align=1 -std::_Sp_locker (0x0x7f64e93060c0) 0 - -Class std::thread::id - size=8 align=8 - base size=8 base align=8 -std::thread::id (0x0x7f64e93062a0) 0 - -Vtable for std::thread::_Impl_base -std::thread::_Impl_base::_ZTVNSt6thread10_Impl_baseE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt6thread10_Impl_baseE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class std::thread::_Impl_base - size=24 align=8 - base size=24 base align=8 -std::thread::_Impl_base (0x0x7f64e9306300) 0 - vptr=((& std::thread::_Impl_base::_ZTVNSt6thread10_Impl_baseE) + 16u) - -Class std::thread - size=8 align=8 - base size=8 base align=8 -std::thread (0x0x7f64e9306240) 0 - -Class std::condition_variable - size=48 align=8 - base size=48 base align=8 -std::condition_variable (0x0x7f64e9082f00) 0 - -Class std::__at_thread_exit_elt - size=16 align=8 - base size=16 base align=8 -std::__at_thread_exit_elt (0x0x7f64e90e4000) 0 - -Class std::_V2::condition_variable_any - size=64 align=8 - base size=64 base align=8 -std::_V2::condition_variable_any (0x0x7f64e90e4060) 0 - -Class std::__atomic_futex_unsigned_base - size=1 align=1 - base size=0 base align=1 -std::__atomic_futex_unsigned_base (0x0x7f64e916f6c0) 0 empty - -Vtable for std::future_error -std::future_error::_ZTVSt12future_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12future_error) -16 (int (*)(...))std::future_error::~future_error -24 (int (*)(...))std::future_error::~future_error -32 (int (*)(...))std::future_error::what - -Class std::future_error - size=32 align=8 - base size=32 base align=8 -std::future_error (0x0x7f64e9170820) 0 - vptr=((& std::future_error::_ZTVSt12future_error) + 16u) - std::logic_error (0x0x7f64e9170888) 0 - primary-for std::future_error (0x0x7f64e9170820) - std::exception (0x0x7f64e916f7e0) 0 nearly-empty - primary-for std::logic_error (0x0x7f64e9170888) - -Class std::__future_base::_Result_base::_Deleter - size=1 align=1 - base size=0 base align=1 -std::__future_base::_Result_base::_Deleter (0x0x7f64e916f900) 0 empty - -Vtable for std::__future_base::_Result_base -std::__future_base::_Result_base::_ZTVNSt13__future_base12_Result_baseE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt13__future_base12_Result_baseE) -16 (int (*)(...))__cxa_pure_virtual -24 0u -32 0u - -Class std::__future_base::_Result_base - size=16 align=8 - base size=16 base align=8 -std::__future_base::_Result_base (0x0x7f64e916f8a0) 0 - vptr=((& std::__future_base::_Result_base::_ZTVNSt13__future_base12_Result_baseE) + 16u) - -Class std::__future_base::_State_baseV2::__exception_ptr_tag - size=1 align=1 - base size=0 base align=1 -std::__future_base::_State_baseV2::__exception_ptr_tag (0x0x7f64e8e28e40) 0 empty - -Class std::__future_base::_State_baseV2::_Make_ready - size=32 align=8 - base size=32 base align=8 -std::__future_base::_State_baseV2::_Make_ready (0x0x7f64e8e2be38) 0 - std::__at_thread_exit_elt (0x0x7f64e8e28f00) 0 - -Vtable for std::__future_base::_State_baseV2 -std::__future_base::_State_baseV2::_ZTVNSt13__future_base13_State_baseV2E: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt13__future_base13_State_baseV2E) -16 (int (*)(...))std::__future_base::_State_baseV2::~_State_baseV2 -24 (int (*)(...))std::__future_base::_State_baseV2::~_State_baseV2 -32 (int (*)(...))std::__future_base::_State_baseV2::_M_complete_async -40 (int (*)(...))std::__future_base::_State_baseV2::_M_is_deferred_future - -Class std::__future_base::_State_baseV2 - size=32 align=8 - base size=28 base align=8 -std::__future_base::_State_baseV2 (0x0x7f64e916fa80) 0 - vptr=((& std::__future_base::_State_baseV2::_ZTVNSt13__future_base13_State_baseV2E) + 16u) - -Class std::__future_base - size=1 align=1 - base size=0 base align=1 -std::__future_base (0x0x7f64e916f840) 0 empty - -Vtable for std::__future_base::_Async_state_commonV2 -std::__future_base::_Async_state_commonV2::_ZTVNSt13__future_base21_Async_state_commonV2E: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt13__future_base21_Async_state_commonV2E) -16 (int (*)(...))std::__future_base::_Async_state_commonV2::~_Async_state_commonV2 -24 (int (*)(...))std::__future_base::_Async_state_commonV2::~_Async_state_commonV2 -32 (int (*)(...))std::__future_base::_Async_state_commonV2::_M_complete_async -40 (int (*)(...))std::__future_base::_State_baseV2::_M_is_deferred_future - -Class std::__future_base::_Async_state_commonV2 - size=48 align=8 - base size=44 base align=8 -std::__future_base::_Async_state_commonV2 (0x0x7f64e8c25a28) 0 - vptr=((& std::__future_base::_Async_state_commonV2::_ZTVNSt13__future_base21_Async_state_commonV2E) + 16u) - std::__future_base::_State_baseV2 (0x0x7f64e8c11de0) 0 - primary-for std::__future_base::_Async_state_commonV2 (0x0x7f64e8c25a28) - -Class QThread::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QThread::QPrivateSignal (0x0x7f64e8880540) 0 empty - -Vtable for QThread -QThread::_ZTV7QThread: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QThread) -16 (int (*)(...))QThread::metaObject -24 (int (*)(...))QThread::qt_metacast -32 (int (*)(...))QThread::qt_metacall -40 (int (*)(...))QThread::~QThread -48 (int (*)(...))QThread::~QThread -56 (int (*)(...))QThread::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QThread::run - -Class QThread - size=16 align=8 - base size=16 base align=8 -QThread (0x0x7f64e88864e0) 0 - vptr=((& QThread::_ZTV7QThread) + 16u) - QObject (0x0x7f64e88804e0) 0 - primary-for QThread (0x0x7f64e88864e0) - -Class QThreadPool::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QThreadPool::QPrivateSignal (0x0x7f64e8880660) 0 empty - -Vtable for QThreadPool -QThreadPool::_ZTV11QThreadPool: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QThreadPool) -16 (int (*)(...))QThreadPool::metaObject -24 (int (*)(...))QThreadPool::qt_metacast -32 (int (*)(...))QThreadPool::qt_metacall -40 (int (*)(...))QThreadPool::~QThreadPool -48 (int (*)(...))QThreadPool::~QThreadPool -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QThreadPool - size=16 align=8 - base size=16 base align=8 -QThreadPool (0x0x7f64e8886548) 0 - vptr=((& QThreadPool::_ZTV11QThreadPool) + 16u) - QObject (0x0x7f64e8880600) 0 - primary-for QThreadPool (0x0x7f64e8886548) - -Class QThreadStorageData - size=4 align=4 - base size=4 base align=4 -QThreadStorageData (0x0x7f64e88806c0) 0 - -Class QTimeLine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTimeLine::QPrivateSignal (0x0x7f64e88807e0) 0 empty - -Vtable for QTimeLine -QTimeLine::_ZTV9QTimeLine: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QTimeLine) -16 (int (*)(...))QTimeLine::metaObject -24 (int (*)(...))QTimeLine::qt_metacast -32 (int (*)(...))QTimeLine::qt_metacall -40 (int (*)(...))QTimeLine::~QTimeLine -48 (int (*)(...))QTimeLine::~QTimeLine -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QTimeLine::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTimeLine::valueForTime - -Class QTimeLine - size=16 align=8 - base size=16 base align=8 -QTimeLine (0x0x7f64e88865b0) 0 - vptr=((& QTimeLine::_ZTV9QTimeLine) + 16u) - QObject (0x0x7f64e8880780) 0 - primary-for QTimeLine (0x0x7f64e88865b0) - -Class QTimer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTimer::QPrivateSignal (0x0x7f64e88808a0) 0 empty - -Vtable for QTimer -QTimer::_ZTV6QTimer: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QTimer) -16 (int (*)(...))QTimer::metaObject -24 (int (*)(...))QTimer::qt_metacast -32 (int (*)(...))QTimer::qt_metacall -40 (int (*)(...))QTimer::~QTimer -48 (int (*)(...))QTimer::~QTimer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QTimer::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTimer - size=32 align=8 - base size=29 base align=8 -QTimer (0x0x7f64e8886618) 0 - vptr=((& QTimer::_ZTV6QTimer) + 16u) - QObject (0x0x7f64e8880840) 0 - primary-for QTimer (0x0x7f64e8886618) - -Class QTimeZone::OffsetData - size=32 align=8 - base size=28 base align=8 -QTimeZone::OffsetData (0x0x7f64e8880f60) 0 - -Class QTimeZone - size=8 align=8 - base size=8 base align=8 -QTimeZone (0x0x7f64e8880f00) 0 - -Class QTranslator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTranslator::QPrivateSignal (0x0x7f64e895b540) 0 empty - -Vtable for QTranslator -QTranslator::_ZTV11QTranslator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTranslator) -16 (int (*)(...))QTranslator::metaObject -24 (int (*)(...))QTranslator::qt_metacast -32 (int (*)(...))QTranslator::qt_metacall -40 (int (*)(...))QTranslator::~QTranslator -48 (int (*)(...))QTranslator::~QTranslator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTranslator::translate -120 (int (*)(...))QTranslator::isEmpty - -Class QTranslator - size=16 align=8 - base size=16 base align=8 -QTranslator (0x0x7f64e8978068) 0 - vptr=((& QTranslator::_ZTV11QTranslator) + 16u) - QObject (0x0x7f64e895b4e0) 0 - primary-for QTranslator (0x0x7f64e8978068) - -Class QUrl - size=8 align=8 - base size=8 base align=8 -QUrl (0x0x7f64e895b660) 0 - -Class QUrlQuery - size=8 align=8 - base size=8 base align=8 -QUrlQuery (0x0x7f64e867dd20) 0 - -Class QUuid - size=16 align=4 - base size=16 base align=4 -QUuid (0x0x7f64e871f3c0) 0 - -Class QWaitCondition - size=8 align=8 - base size=8 base align=8 -QWaitCondition (0x0x7f64e871f9c0) 0 - -Class QXmlStreamStringRef - size=16 align=8 - base size=16 base align=8 -QXmlStreamStringRef (0x0x7f64e871fa20) 0 - -Class QXmlStreamAttribute - size=80 align=8 - base size=73 base align=8 -QXmlStreamAttribute (0x0x7f64e871fcc0) 0 - -Class QXmlStreamAttributes - size=8 align=8 - base size=8 base align=8 -QXmlStreamAttributes (0x0x7f64e874faf8) 0 - QVector (0x0x7f64e87ca0c0) 0 - -Class QXmlStreamNamespaceDeclaration - size=40 align=8 - base size=40 base align=8 -QXmlStreamNamespaceDeclaration (0x0x7f64e87ca120) 0 - -Class QXmlStreamNotationDeclaration - size=56 align=8 - base size=56 base align=8 -QXmlStreamNotationDeclaration (0x0x7f64e87ca3c0) 0 - -Class QXmlStreamEntityDeclaration - size=88 align=8 - base size=88 base align=8 -QXmlStreamEntityDeclaration (0x0x7f64e87ca660) 0 - -Vtable for QXmlStreamEntityResolver -QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QXmlStreamEntityResolver) -16 (int (*)(...))QXmlStreamEntityResolver::~QXmlStreamEntityResolver -24 (int (*)(...))QXmlStreamEntityResolver::~QXmlStreamEntityResolver -32 (int (*)(...))QXmlStreamEntityResolver::resolveEntity -40 (int (*)(...))QXmlStreamEntityResolver::resolveUndeclaredEntity - -Class QXmlStreamEntityResolver - size=8 align=8 - base size=8 base align=8 -QXmlStreamEntityResolver (0x0x7f64e87ca900) 0 nearly-empty - vptr=((& QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver) + 16u) - -Class QXmlStreamReader - size=8 align=8 - base size=8 base align=8 -QXmlStreamReader (0x0x7f64e87ca960) 0 - -Class QXmlStreamWriter - size=8 align=8 - base size=8 base align=8 -QXmlStreamWriter (0x0x7f64e84c43c0) 0 - -Class QRgba64 - size=8 align=8 - base size=8 base align=8 -QRgba64 (0x0x7f64e84c44e0) 0 - -Class QColor - size=16 align=4 - base size=14 base align=4 -QColor (0x0x7f64e84c4780) 0 - -Class QRegion::QRegionData - size=16 align=8 - base size=16 base align=8 -QRegion::QRegionData (0x0x7f64e85cc180) 0 - -Class QRegion - size=8 align=8 - base size=8 base align=8 -QRegion (0x0x7f64e85cc120) 0 - -Class QKeySequence - size=8 align=8 - base size=8 base align=8 -QKeySequence (0x0x7f64e826c4e0) 0 - -Class QVector2D - size=8 align=4 - base size=8 base align=4 -QVector2D (0x0x7f64e831aa20) 0 - -Class QTouchDevice - size=8 align=8 - base size=8 base align=8 -QTouchDevice (0x0x7f64e831acc0) 0 - -Vtable for QInputEvent -QInputEvent::_ZTV11QInputEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QInputEvent) -16 (int (*)(...))QInputEvent::~QInputEvent -24 (int (*)(...))QInputEvent::~QInputEvent - -Class QInputEvent - size=32 align=8 - base size=32 base align=8 -QInputEvent (0x0x7f64e83218f0) 0 - vptr=((& QInputEvent::_ZTV11QInputEvent) + 16u) - QEvent (0x0x7f64e831aea0) 0 - primary-for QInputEvent (0x0x7f64e83218f0) - -Vtable for QEnterEvent -QEnterEvent::_ZTV11QEnterEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QEnterEvent) -16 (int (*)(...))QEnterEvent::~QEnterEvent -24 (int (*)(...))QEnterEvent::~QEnterEvent - -Class QEnterEvent - size=72 align=8 - base size=72 base align=8 -QEnterEvent (0x0x7f64e8321958) 0 - vptr=((& QEnterEvent::_ZTV11QEnterEvent) + 16u) - QEvent (0x0x7f64e831af00) 0 - primary-for QEnterEvent (0x0x7f64e8321958) - -Vtable for QMouseEvent -QMouseEvent::_ZTV11QMouseEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QMouseEvent) -16 (int (*)(...))QMouseEvent::~QMouseEvent -24 (int (*)(...))QMouseEvent::~QMouseEvent - -Class QMouseEvent - size=104 align=8 - base size=100 base align=8 -QMouseEvent (0x0x7f64e83219c0) 0 - vptr=((& QMouseEvent::_ZTV11QMouseEvent) + 16u) - QInputEvent (0x0x7f64e8321a28) 0 - primary-for QMouseEvent (0x0x7f64e83219c0) - QEvent (0x0x7f64e831af60) 0 - primary-for QInputEvent (0x0x7f64e8321a28) - -Vtable for QHoverEvent -QHoverEvent::_ZTV11QHoverEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QHoverEvent) -16 (int (*)(...))QHoverEvent::~QHoverEvent -24 (int (*)(...))QHoverEvent::~QHoverEvent - -Class QHoverEvent - size=64 align=8 - base size=64 base align=8 -QHoverEvent (0x0x7f64e8321a90) 0 - vptr=((& QHoverEvent::_ZTV11QHoverEvent) + 16u) - QInputEvent (0x0x7f64e8321af8) 0 - primary-for QHoverEvent (0x0x7f64e8321a90) - QEvent (0x0x7f64e83eb000) 0 - primary-for QInputEvent (0x0x7f64e8321af8) - -Vtable for QWheelEvent -QWheelEvent::_ZTV11QWheelEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QWheelEvent) -16 (int (*)(...))QWheelEvent::~QWheelEvent -24 (int (*)(...))QWheelEvent::~QWheelEvent - -Class QWheelEvent - size=96 align=8 - base size=96 base align=8 -QWheelEvent (0x0x7f64e8321b60) 0 - vptr=((& QWheelEvent::_ZTV11QWheelEvent) + 16u) - QInputEvent (0x0x7f64e8321bc8) 0 - primary-for QWheelEvent (0x0x7f64e8321b60) - QEvent (0x0x7f64e83eb060) 0 - primary-for QInputEvent (0x0x7f64e8321bc8) - -Vtable for QTabletEvent -QTabletEvent::_ZTV12QTabletEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QTabletEvent) -16 (int (*)(...))QTabletEvent::~QTabletEvent -24 (int (*)(...))QTabletEvent::~QTabletEvent - -Class QTabletEvent - size=128 align=8 - base size=128 base align=8 -QTabletEvent (0x0x7f64e8321c30) 0 - vptr=((& QTabletEvent::_ZTV12QTabletEvent) + 16u) - QInputEvent (0x0x7f64e8321c98) 0 - primary-for QTabletEvent (0x0x7f64e8321c30) - QEvent (0x0x7f64e83eb0c0) 0 - primary-for QInputEvent (0x0x7f64e8321c98) - -Vtable for QNativeGestureEvent -QNativeGestureEvent::_ZTV19QNativeGestureEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QNativeGestureEvent) -16 (int (*)(...))QNativeGestureEvent::~QNativeGestureEvent -24 (int (*)(...))QNativeGestureEvent::~QNativeGestureEvent - -Class QNativeGestureEvent - size=112 align=8 - base size=112 base align=8 -QNativeGestureEvent (0x0x7f64e8321d00) 0 - vptr=((& QNativeGestureEvent::_ZTV19QNativeGestureEvent) + 16u) - QInputEvent (0x0x7f64e8321d68) 0 - primary-for QNativeGestureEvent (0x0x7f64e8321d00) - QEvent (0x0x7f64e83eb120) 0 - primary-for QInputEvent (0x0x7f64e8321d68) - -Vtable for QKeyEvent -QKeyEvent::_ZTV9QKeyEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QKeyEvent) -16 (int (*)(...))QKeyEvent::~QKeyEvent -24 (int (*)(...))QKeyEvent::~QKeyEvent - -Class QKeyEvent - size=64 align=8 - base size=59 base align=8 -QKeyEvent (0x0x7f64e8321dd0) 0 - vptr=((& QKeyEvent::_ZTV9QKeyEvent) + 16u) - QInputEvent (0x0x7f64e8321e38) 0 - primary-for QKeyEvent (0x0x7f64e8321dd0) - QEvent (0x0x7f64e83eb180) 0 - primary-for QInputEvent (0x0x7f64e8321e38) - -Vtable for QFocusEvent -QFocusEvent::_ZTV11QFocusEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QFocusEvent) -16 (int (*)(...))QFocusEvent::~QFocusEvent -24 (int (*)(...))QFocusEvent::~QFocusEvent - -Class QFocusEvent - size=24 align=8 - base size=24 base align=8 -QFocusEvent (0x0x7f64e8321ea0) 0 - vptr=((& QFocusEvent::_ZTV11QFocusEvent) + 16u) - QEvent (0x0x7f64e83eb1e0) 0 - primary-for QFocusEvent (0x0x7f64e8321ea0) - -Vtable for QPaintEvent -QPaintEvent::_ZTV11QPaintEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QPaintEvent) -16 (int (*)(...))QPaintEvent::~QPaintEvent -24 (int (*)(...))QPaintEvent::~QPaintEvent - -Class QPaintEvent - size=56 align=8 - base size=49 base align=8 -QPaintEvent (0x0x7f64e8321f08) 0 - vptr=((& QPaintEvent::_ZTV11QPaintEvent) + 16u) - QEvent (0x0x7f64e83eb240) 0 - primary-for QPaintEvent (0x0x7f64e8321f08) - -Vtable for QMoveEvent -QMoveEvent::_ZTV10QMoveEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QMoveEvent) -16 (int (*)(...))QMoveEvent::~QMoveEvent -24 (int (*)(...))QMoveEvent::~QMoveEvent - -Class QMoveEvent - size=40 align=8 - base size=36 base align=8 -QMoveEvent (0x0x7f64e8321f70) 0 - vptr=((& QMoveEvent::_ZTV10QMoveEvent) + 16u) - QEvent (0x0x7f64e83eb2a0) 0 - primary-for QMoveEvent (0x0x7f64e8321f70) - -Vtable for QExposeEvent -QExposeEvent::_ZTV12QExposeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QExposeEvent) -16 (int (*)(...))QExposeEvent::~QExposeEvent -24 (int (*)(...))QExposeEvent::~QExposeEvent - -Class QExposeEvent - size=32 align=8 - base size=32 base align=8 -QExposeEvent (0x0x7f64e8064000) 0 - vptr=((& QExposeEvent::_ZTV12QExposeEvent) + 16u) - QEvent (0x0x7f64e83eb300) 0 - primary-for QExposeEvent (0x0x7f64e8064000) - -Vtable for QPlatformSurfaceEvent -QPlatformSurfaceEvent::_ZTV21QPlatformSurfaceEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QPlatformSurfaceEvent) -16 (int (*)(...))QPlatformSurfaceEvent::~QPlatformSurfaceEvent -24 (int (*)(...))QPlatformSurfaceEvent::~QPlatformSurfaceEvent - -Class QPlatformSurfaceEvent - size=24 align=8 - base size=24 base align=8 -QPlatformSurfaceEvent (0x0x7f64e8064068) 0 - vptr=((& QPlatformSurfaceEvent::_ZTV21QPlatformSurfaceEvent) + 16u) - QEvent (0x0x7f64e83eb360) 0 - primary-for QPlatformSurfaceEvent (0x0x7f64e8064068) - -Vtable for QResizeEvent -QResizeEvent::_ZTV12QResizeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QResizeEvent) -16 (int (*)(...))QResizeEvent::~QResizeEvent -24 (int (*)(...))QResizeEvent::~QResizeEvent - -Class QResizeEvent - size=40 align=8 - base size=36 base align=8 -QResizeEvent (0x0x7f64e80640d0) 0 - vptr=((& QResizeEvent::_ZTV12QResizeEvent) + 16u) - QEvent (0x0x7f64e83eb3c0) 0 - primary-for QResizeEvent (0x0x7f64e80640d0) - -Vtable for QCloseEvent -QCloseEvent::_ZTV11QCloseEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QCloseEvent) -16 (int (*)(...))QCloseEvent::~QCloseEvent -24 (int (*)(...))QCloseEvent::~QCloseEvent - -Class QCloseEvent - size=24 align=8 - base size=20 base align=8 -QCloseEvent (0x0x7f64e8064138) 0 - vptr=((& QCloseEvent::_ZTV11QCloseEvent) + 16u) - QEvent (0x0x7f64e83eb420) 0 - primary-for QCloseEvent (0x0x7f64e8064138) - -Vtable for QIconDragEvent -QIconDragEvent::_ZTV14QIconDragEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QIconDragEvent) -16 (int (*)(...))QIconDragEvent::~QIconDragEvent -24 (int (*)(...))QIconDragEvent::~QIconDragEvent - -Class QIconDragEvent - size=24 align=8 - base size=20 base align=8 -QIconDragEvent (0x0x7f64e80641a0) 0 - vptr=((& QIconDragEvent::_ZTV14QIconDragEvent) + 16u) - QEvent (0x0x7f64e83eb480) 0 - primary-for QIconDragEvent (0x0x7f64e80641a0) - -Vtable for QShowEvent -QShowEvent::_ZTV10QShowEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QShowEvent) -16 (int (*)(...))QShowEvent::~QShowEvent -24 (int (*)(...))QShowEvent::~QShowEvent - -Class QShowEvent - size=24 align=8 - base size=20 base align=8 -QShowEvent (0x0x7f64e8064208) 0 - vptr=((& QShowEvent::_ZTV10QShowEvent) + 16u) - QEvent (0x0x7f64e83eb4e0) 0 - primary-for QShowEvent (0x0x7f64e8064208) - -Vtable for QHideEvent -QHideEvent::_ZTV10QHideEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QHideEvent) -16 (int (*)(...))QHideEvent::~QHideEvent -24 (int (*)(...))QHideEvent::~QHideEvent - -Class QHideEvent - size=24 align=8 - base size=20 base align=8 -QHideEvent (0x0x7f64e8064270) 0 - vptr=((& QHideEvent::_ZTV10QHideEvent) + 16u) - QEvent (0x0x7f64e83eb540) 0 - primary-for QHideEvent (0x0x7f64e8064270) - -Vtable for QContextMenuEvent -QContextMenuEvent::_ZTV17QContextMenuEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QContextMenuEvent) -16 (int (*)(...))QContextMenuEvent::~QContextMenuEvent -24 (int (*)(...))QContextMenuEvent::~QContextMenuEvent - -Class QContextMenuEvent - size=56 align=8 - base size=49 base align=8 -QContextMenuEvent (0x0x7f64e80642d8) 0 - vptr=((& QContextMenuEvent::_ZTV17QContextMenuEvent) + 16u) - QInputEvent (0x0x7f64e8064340) 0 - primary-for QContextMenuEvent (0x0x7f64e80642d8) - QEvent (0x0x7f64e83eb5a0) 0 - primary-for QInputEvent (0x0x7f64e8064340) - -Class QInputMethodEvent::Attribute - size=32 align=8 - base size=32 base align=8 -QInputMethodEvent::Attribute (0x0x7f64e83eb660) 0 - -Vtable for QInputMethodEvent -QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QInputMethodEvent) -16 (int (*)(...))QInputMethodEvent::~QInputMethodEvent -24 (int (*)(...))QInputMethodEvent::~QInputMethodEvent - -Class QInputMethodEvent - size=56 align=8 - base size=56 base align=8 -QInputMethodEvent (0x0x7f64e80643a8) 0 - vptr=((& QInputMethodEvent::_ZTV17QInputMethodEvent) + 16u) - QEvent (0x0x7f64e83eb600) 0 - primary-for QInputMethodEvent (0x0x7f64e80643a8) - -Class QInputMethodQueryEvent::QueryPair - size=24 align=8 - base size=24 base align=8 -QInputMethodQueryEvent::QueryPair (0x0x7f64e83ebae0) 0 - -Vtable for QInputMethodQueryEvent -QInputMethodQueryEvent::_ZTV22QInputMethodQueryEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QInputMethodQueryEvent) -16 (int (*)(...))QInputMethodQueryEvent::~QInputMethodQueryEvent -24 (int (*)(...))QInputMethodQueryEvent::~QInputMethodQueryEvent - -Class QInputMethodQueryEvent - size=32 align=8 - base size=32 base align=8 -QInputMethodQueryEvent (0x0x7f64e80646e8) 0 - vptr=((& QInputMethodQueryEvent::_ZTV22QInputMethodQueryEvent) + 16u) - QEvent (0x0x7f64e83eba80) 0 - primary-for QInputMethodQueryEvent (0x0x7f64e80646e8) - -Vtable for QDropEvent -QDropEvent::_ZTV10QDropEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QDropEvent) -16 (int (*)(...))QDropEvent::~QDropEvent -24 (int (*)(...))QDropEvent::~QDropEvent - -Class QDropEvent - size=72 align=8 - base size=72 base align=8 -QDropEvent (0x0x7f64e80649c0) 0 - vptr=((& QDropEvent::_ZTV10QDropEvent) + 16u) - QEvent (0x0x7f64e83ebe40) 0 - primary-for QDropEvent (0x0x7f64e80649c0) - -Vtable for QDragMoveEvent -QDragMoveEvent::_ZTV14QDragMoveEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QDragMoveEvent) -16 (int (*)(...))QDragMoveEvent::~QDragMoveEvent -24 (int (*)(...))QDragMoveEvent::~QDragMoveEvent - -Class QDragMoveEvent - size=88 align=8 - base size=88 base align=8 -QDragMoveEvent (0x0x7f64e8064a28) 0 - vptr=((& QDragMoveEvent::_ZTV14QDragMoveEvent) + 16u) - QDropEvent (0x0x7f64e8064a90) 0 - primary-for QDragMoveEvent (0x0x7f64e8064a28) - QEvent (0x0x7f64e83ebea0) 0 - primary-for QDropEvent (0x0x7f64e8064a90) - -Vtable for QDragEnterEvent -QDragEnterEvent::_ZTV15QDragEnterEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QDragEnterEvent) -16 (int (*)(...))QDragEnterEvent::~QDragEnterEvent -24 (int (*)(...))QDragEnterEvent::~QDragEnterEvent - -Class QDragEnterEvent - size=88 align=8 - base size=88 base align=8 -QDragEnterEvent (0x0x7f64e8064af8) 0 - vptr=((& QDragEnterEvent::_ZTV15QDragEnterEvent) + 16u) - QDragMoveEvent (0x0x7f64e8064b60) 0 - primary-for QDragEnterEvent (0x0x7f64e8064af8) - QDropEvent (0x0x7f64e8064bc8) 0 - primary-for QDragMoveEvent (0x0x7f64e8064b60) - QEvent (0x0x7f64e83ebf00) 0 - primary-for QDropEvent (0x0x7f64e8064bc8) - -Vtable for QDragLeaveEvent -QDragLeaveEvent::_ZTV15QDragLeaveEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QDragLeaveEvent) -16 (int (*)(...))QDragLeaveEvent::~QDragLeaveEvent -24 (int (*)(...))QDragLeaveEvent::~QDragLeaveEvent - -Class QDragLeaveEvent - size=24 align=8 - base size=20 base align=8 -QDragLeaveEvent (0x0x7f64e8064c30) 0 - vptr=((& QDragLeaveEvent::_ZTV15QDragLeaveEvent) + 16u) - QEvent (0x0x7f64e83ebf60) 0 - primary-for QDragLeaveEvent (0x0x7f64e8064c30) - -Vtable for QHelpEvent -QHelpEvent::_ZTV10QHelpEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QHelpEvent) -16 (int (*)(...))QHelpEvent::~QHelpEvent -24 (int (*)(...))QHelpEvent::~QHelpEvent - -Class QHelpEvent - size=40 align=8 - base size=36 base align=8 -QHelpEvent (0x0x7f64e8064c98) 0 - vptr=((& QHelpEvent::_ZTV10QHelpEvent) + 16u) - QEvent (0x0x7f64e8132000) 0 - primary-for QHelpEvent (0x0x7f64e8064c98) - -Vtable for QStatusTipEvent -QStatusTipEvent::_ZTV15QStatusTipEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QStatusTipEvent) -16 (int (*)(...))QStatusTipEvent::~QStatusTipEvent -24 (int (*)(...))QStatusTipEvent::~QStatusTipEvent - -Class QStatusTipEvent - size=32 align=8 - base size=32 base align=8 -QStatusTipEvent (0x0x7f64e8064d00) 0 - vptr=((& QStatusTipEvent::_ZTV15QStatusTipEvent) + 16u) - QEvent (0x0x7f64e8132060) 0 - primary-for QStatusTipEvent (0x0x7f64e8064d00) - -Vtable for QWhatsThisClickedEvent -QWhatsThisClickedEvent::_ZTV22QWhatsThisClickedEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QWhatsThisClickedEvent) -16 (int (*)(...))QWhatsThisClickedEvent::~QWhatsThisClickedEvent -24 (int (*)(...))QWhatsThisClickedEvent::~QWhatsThisClickedEvent - -Class QWhatsThisClickedEvent - size=32 align=8 - base size=32 base align=8 -QWhatsThisClickedEvent (0x0x7f64e8064d68) 0 - vptr=((& QWhatsThisClickedEvent::_ZTV22QWhatsThisClickedEvent) + 16u) - QEvent (0x0x7f64e81320c0) 0 - primary-for QWhatsThisClickedEvent (0x0x7f64e8064d68) - -Vtable for QActionEvent -QActionEvent::_ZTV12QActionEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QActionEvent) -16 (int (*)(...))QActionEvent::~QActionEvent -24 (int (*)(...))QActionEvent::~QActionEvent - -Class QActionEvent - size=40 align=8 - base size=40 base align=8 -QActionEvent (0x0x7f64e8064dd0) 0 - vptr=((& QActionEvent::_ZTV12QActionEvent) + 16u) - QEvent (0x0x7f64e8132120) 0 - primary-for QActionEvent (0x0x7f64e8064dd0) - -Vtable for QFileOpenEvent -QFileOpenEvent::_ZTV14QFileOpenEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QFileOpenEvent) -16 (int (*)(...))QFileOpenEvent::~QFileOpenEvent -24 (int (*)(...))QFileOpenEvent::~QFileOpenEvent - -Class QFileOpenEvent - size=40 align=8 - base size=40 base align=8 -QFileOpenEvent (0x0x7f64e8064e38) 0 - vptr=((& QFileOpenEvent::_ZTV14QFileOpenEvent) + 16u) - QEvent (0x0x7f64e8132180) 0 - primary-for QFileOpenEvent (0x0x7f64e8064e38) - -Vtable for QToolBarChangeEvent -QToolBarChangeEvent::_ZTV19QToolBarChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QToolBarChangeEvent) -16 (int (*)(...))QToolBarChangeEvent::~QToolBarChangeEvent -24 (int (*)(...))QToolBarChangeEvent::~QToolBarChangeEvent - -Class QToolBarChangeEvent - size=24 align=8 - base size=21 base align=8 -QToolBarChangeEvent (0x0x7f64e8064ea0) 0 - vptr=((& QToolBarChangeEvent::_ZTV19QToolBarChangeEvent) + 16u) - QEvent (0x0x7f64e81321e0) 0 - primary-for QToolBarChangeEvent (0x0x7f64e8064ea0) - -Vtable for QShortcutEvent -QShortcutEvent::_ZTV14QShortcutEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QShortcutEvent) -16 (int (*)(...))QShortcutEvent::~QShortcutEvent -24 (int (*)(...))QShortcutEvent::~QShortcutEvent - -Class QShortcutEvent - size=40 align=8 - base size=40 base align=8 -QShortcutEvent (0x0x7f64e8064f08) 0 - vptr=((& QShortcutEvent::_ZTV14QShortcutEvent) + 16u) - QEvent (0x0x7f64e8132240) 0 - primary-for QShortcutEvent (0x0x7f64e8064f08) - -Vtable for QWindowStateChangeEvent -QWindowStateChangeEvent::_ZTV23QWindowStateChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QWindowStateChangeEvent) -16 (int (*)(...))QWindowStateChangeEvent::~QWindowStateChangeEvent -24 (int (*)(...))QWindowStateChangeEvent::~QWindowStateChangeEvent - -Class QWindowStateChangeEvent - size=32 align=8 - base size=25 base align=8 -QWindowStateChangeEvent (0x0x7f64e8064f70) 0 - vptr=((& QWindowStateChangeEvent::_ZTV23QWindowStateChangeEvent) + 16u) - QEvent (0x0x7f64e81322a0) 0 - primary-for QWindowStateChangeEvent (0x0x7f64e8064f70) - -Class QPointingDeviceUniqueId - size=8 align=8 - base size=8 base align=8 -QPointingDeviceUniqueId (0x0x7f64e8132300) 0 - -Class QTouchEvent::TouchPoint - size=8 align=8 - base size=8 base align=8 -QTouchEvent::TouchPoint (0x0x7f64e81329c0) 0 - -Vtable for QTouchEvent -QTouchEvent::_ZTV11QTouchEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTouchEvent) -16 (int (*)(...))QTouchEvent::~QTouchEvent -24 (int (*)(...))QTouchEvent::~QTouchEvent - -Class QTouchEvent - size=72 align=8 - base size=72 base align=8 -QTouchEvent (0x0x7f64e8167618) 0 - vptr=((& QTouchEvent::_ZTV11QTouchEvent) + 16u) - QInputEvent (0x0x7f64e8167680) 0 - primary-for QTouchEvent (0x0x7f64e8167618) - QEvent (0x0x7f64e8132960) 0 - primary-for QInputEvent (0x0x7f64e8167680) - -Vtable for QScrollPrepareEvent -QScrollPrepareEvent::_ZTV19QScrollPrepareEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QScrollPrepareEvent) -16 (int (*)(...))QScrollPrepareEvent::~QScrollPrepareEvent -24 (int (*)(...))QScrollPrepareEvent::~QScrollPrepareEvent - -Class QScrollPrepareEvent - size=112 align=8 - base size=112 base align=8 -QScrollPrepareEvent (0x0x7f64e7d2bea0) 0 - vptr=((& QScrollPrepareEvent::_ZTV19QScrollPrepareEvent) + 16u) - QEvent (0x0x7f64e7d59060) 0 - primary-for QScrollPrepareEvent (0x0x7f64e7d2bea0) - -Vtable for QScrollEvent -QScrollEvent::_ZTV12QScrollEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QScrollEvent) -16 (int (*)(...))QScrollEvent::~QScrollEvent -24 (int (*)(...))QScrollEvent::~QScrollEvent - -Class QScrollEvent - size=64 align=8 - base size=60 base align=8 -QScrollEvent (0x0x7f64e7d2bf08) 0 - vptr=((& QScrollEvent::_ZTV12QScrollEvent) + 16u) - QEvent (0x0x7f64e7d590c0) 0 - primary-for QScrollEvent (0x0x7f64e7d2bf08) - -Vtable for QScreenOrientationChangeEvent -QScreenOrientationChangeEvent::_ZTV29QScreenOrientationChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI29QScreenOrientationChangeEvent) -16 (int (*)(...))QScreenOrientationChangeEvent::~QScreenOrientationChangeEvent -24 (int (*)(...))QScreenOrientationChangeEvent::~QScreenOrientationChangeEvent - -Class QScreenOrientationChangeEvent - size=40 align=8 - base size=36 base align=8 -QScreenOrientationChangeEvent (0x0x7f64e7d2bf70) 0 - vptr=((& QScreenOrientationChangeEvent::_ZTV29QScreenOrientationChangeEvent) + 16u) - QEvent (0x0x7f64e7d59120) 0 - primary-for QScreenOrientationChangeEvent (0x0x7f64e7d2bf70) - -Vtable for QApplicationStateChangeEvent -QApplicationStateChangeEvent::_ZTV28QApplicationStateChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI28QApplicationStateChangeEvent) -16 (int (*)(...))QApplicationStateChangeEvent::~QApplicationStateChangeEvent -24 (int (*)(...))QApplicationStateChangeEvent::~QApplicationStateChangeEvent - -Class QApplicationStateChangeEvent - size=24 align=8 - base size=24 base align=8 -QApplicationStateChangeEvent (0x0x7f64e7d89000) 0 - vptr=((& QApplicationStateChangeEvent::_ZTV28QApplicationStateChangeEvent) + 16u) - QEvent (0x0x7f64e7d59180) 0 - primary-for QApplicationStateChangeEvent (0x0x7f64e7d89000) - -Class QFont - size=16 align=8 - base size=12 base align=8 -QFont (0x0x7f64e7d591e0) 0 - -Class QPolygon - size=8 align=8 - base size=8 base align=8 -QPolygon (0x0x7f64e7d89d68) 0 - QVector (0x0x7f64e7d59ea0) 0 - -Class QPolygonF - size=8 align=8 - base size=8 base align=8 -QPolygonF (0x0x7f64e7e5d138) 0 - QVector (0x0x7f64e7e50360) 0 - -Class QMatrix - size=48 align=8 - base size=48 base align=8 -QMatrix (0x0x7f64e7e50720) 0 - -Class QPainterPath::Element - size=24 align=8 - base size=24 base align=8 -QPainterPath::Element (0x0x7f64e7e50a20) 0 - -Class QPainterPath - size=8 align=8 - base size=8 base align=8 -QPainterPath (0x0x7f64e7e509c0) 0 - -Class QPainterPathStroker - size=8 align=8 - base size=8 base align=8 -QPainterPathStroker (0x0x7f64e7b60420) 0 - -Class QTransform - size=88 align=8 - base size=88 base align=8 -QTransform (0x0x7f64e7b60540) 0 - -Vtable for QPaintDevice -QPaintDevice::_ZTV12QPaintDevice: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QPaintDevice) -16 0u -24 0u -32 (int (*)(...))QPaintDevice::devType -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QPaintDevice::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QPaintDevice - size=24 align=8 - base size=24 base align=8 -QPaintDevice (0x0x7f64e7b60c60) 0 - vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 16u) - -Class QPixelFormat - size=8 align=8 - base size=8 base align=8 -QPixelFormat (0x0x7f64e7b60cc0) 0 - -Vtable for QImage -QImage::_ZTV6QImage: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QImage) -16 (int (*)(...))QImage::~QImage -24 (int (*)(...))QImage::~QImage -32 (int (*)(...))QImage::devType -40 (int (*)(...))QImage::paintEngine -48 (int (*)(...))QImage::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QImage - size=32 align=8 - base size=32 base align=8 -QImage (0x0x7f64e7cb6000) 0 - vptr=((& QImage::_ZTV6QImage) + 16u) - QPaintDevice (0x0x7f64e7c87780) 0 - primary-for QImage (0x0x7f64e7cb6000) - -Vtable for QPixmap -QPixmap::_ZTV7QPixmap: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QPixmap) -16 (int (*)(...))QPixmap::~QPixmap -24 (int (*)(...))QPixmap::~QPixmap -32 (int (*)(...))QPixmap::devType -40 (int (*)(...))QPixmap::paintEngine -48 (int (*)(...))QPixmap::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QPixmap - size=32 align=8 - base size=32 base align=8 -QPixmap (0x0x7f64e795fb60) 0 - vptr=((& QPixmap::_ZTV7QPixmap) + 16u) - QPaintDevice (0x0x7f64e7960720) 0 - primary-for QPixmap (0x0x7f64e795fb60) - -Class QBrush - size=8 align=8 - base size=8 base align=8 -QBrush (0x0x7f64e7960a20) 0 - -Class QBrushData - size=112 align=8 - base size=112 base align=8 -QBrushData (0x0x7f64e79f91e0) 0 - -Class QGradient - size=64 align=8 - base size=64 base align=8 -QGradient (0x0x7f64e79f9240) 0 - -Class QLinearGradient - size=64 align=8 - base size=64 base align=8 -QLinearGradient (0x0x7f64e79f44e0) 0 - QGradient (0x0x7f64e79f94e0) 0 - -Class QRadialGradient - size=64 align=8 - base size=64 base align=8 -QRadialGradient (0x0x7f64e79f4548) 0 - QGradient (0x0x7f64e79f9540) 0 - -Class QConicalGradient - size=64 align=8 - base size=64 base align=8 -QConicalGradient (0x0x7f64e79f45b0) 0 - QGradient (0x0x7f64e79f95a0) 0 - -Class QPen - size=8 align=8 - base size=8 base align=8 -QPen (0x0x7f64e79f9600) 0 - -Class QTextOption::Tab - size=16 align=8 - base size=14 base align=8 -QTextOption::Tab (0x0x7f64e7ae0840) 0 - -Class QTextOption - size=32 align=8 - base size=32 base align=8 -QTextOption (0x0x7f64e7ae07e0) 0 - -Class QTextLength - size=16 align=8 - base size=16 base align=8 -QTextLength (0x0x7f64e7763000) 0 - -Class QTextFormat - size=16 align=8 - base size=12 base align=8 -QTextFormat (0x0x7f64e7763720) 0 - -Class QTextCharFormat - size=16 align=8 - base size=12 base align=8 -QTextCharFormat (0x0x7f64e77eb548) 0 - QTextFormat (0x0x7f64e77ea5a0) 0 - -Class QTextBlockFormat - size=16 align=8 - base size=12 base align=8 -QTextBlockFormat (0x0x7f64e77eb750) 0 - QTextFormat (0x0x7f64e77ea840) 0 - -Class QTextListFormat - size=16 align=8 - base size=12 base align=8 -QTextListFormat (0x0x7f64e77eb9c0) 0 - QTextFormat (0x0x7f64e77eaae0) 0 - -Class QTextImageFormat - size=16 align=8 - base size=12 base align=8 -QTextImageFormat (0x0x7f64e77ebbc8) 0 - QTextCharFormat (0x0x7f64e77ebc30) 0 - QTextFormat (0x0x7f64e77ead80) 0 - -Class QTextFrameFormat - size=16 align=8 - base size=12 base align=8 -QTextFrameFormat (0x0x7f64e77ebe38) 0 - QTextFormat (0x0x7f64e790b060) 0 - -Class QTextTableFormat - size=16 align=8 - base size=12 base align=8 -QTextTableFormat (0x0x7f64e7540000) 0 - QTextFrameFormat (0x0x7f64e7540068) 0 - QTextFormat (0x0x7f64e790b300) 0 - -Class QTextTableCellFormat - size=16 align=8 - base size=12 base align=8 -QTextTableCellFormat (0x0x7f64e7540270) 0 - QTextCharFormat (0x0x7f64e75402d8) 0 - QTextFormat (0x0x7f64e790b600) 0 - -Class QFontDatabase - size=8 align=8 - base size=8 base align=8 -QFontDatabase (0x0x7f64e790b8a0) 0 - -Class QRawFont - size=8 align=8 - base size=8 base align=8 -QRawFont (0x0x7f64e790b900) 0 - -Class QGlyphRun - size=8 align=8 - base size=8 base align=8 -QGlyphRun (0x0x7f64e790bde0) 0 - -Class QTextCursor - size=8 align=8 - base size=8 base align=8 -QTextCursor (0x0x7f64e7607120) 0 - -Class QTextInlineObject - size=16 align=8 - base size=16 base align=8 -QTextInlineObject (0x0x7f64e7607420) 0 - -Class QTextLayout::FormatRange - size=24 align=8 - base size=24 base align=8 -QTextLayout::FormatRange (0x0x7f64e76074e0) 0 - -Class QTextLayout - size=8 align=8 - base size=8 base align=8 -QTextLayout (0x0x7f64e7607480) 0 - -Class QTextLine - size=16 align=8 - base size=16 base align=8 -QTextLine (0x0x7f64e7607f00) 0 - -Vtable for QAbstractUndoItem -QAbstractUndoItem::_ZTV17QAbstractUndoItem: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAbstractUndoItem) -16 (int (*)(...))__cxa_pure_virtual -24 (int (*)(...))__cxa_pure_virtual -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QAbstractUndoItem - size=8 align=8 - base size=8 base align=8 -QAbstractUndoItem (0x0x7f64e7607f60) 0 nearly-empty - vptr=((& QAbstractUndoItem::_ZTV17QAbstractUndoItem) + 16u) - -Class QTextDocument::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextDocument::QPrivateSignal (0x0x7f64e76cc060) 0 empty - -Vtable for QTextDocument -QTextDocument::_ZTV13QTextDocument: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QTextDocument) -16 (int (*)(...))QTextDocument::metaObject -24 (int (*)(...))QTextDocument::qt_metacast -32 (int (*)(...))QTextDocument::qt_metacall -40 (int (*)(...))QTextDocument::~QTextDocument -48 (int (*)(...))QTextDocument::~QTextDocument -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTextDocument::clear -120 (int (*)(...))QTextDocument::createObject -128 (int (*)(...))QTextDocument::loadResource - -Class QTextDocument - size=16 align=8 - base size=16 base align=8 -QTextDocument (0x0x7f64e76a4618) 0 - vptr=((& QTextDocument::_ZTV13QTextDocument) + 16u) - QObject (0x0x7f64e76cc000) 0 - primary-for QTextDocument (0x0x7f64e76a4618) - -Class QPalette::Data - size=4 align=4 - base size=4 base align=4 -QPalette::Data (0x0x7f64e76cc2a0) 0 - -Class QPalette - size=16 align=8 - base size=12 base align=8 -QPalette (0x0x7f64e76cc240) 0 - -Class QAbstractTextDocumentLayout::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractTextDocumentLayout::QPrivateSignal (0x0x7f64e73d2360) 0 empty - -Class QAbstractTextDocumentLayout::Selection - size=24 align=8 - base size=24 base align=8 -QAbstractTextDocumentLayout::Selection (0x0x7f64e73d23c0) 0 - -Class QAbstractTextDocumentLayout::PaintContext - size=64 align=8 - base size=64 base align=8 -QAbstractTextDocumentLayout::PaintContext (0x0x7f64e73d2420) 0 - -Vtable for QAbstractTextDocumentLayout -QAbstractTextDocumentLayout::_ZTV27QAbstractTextDocumentLayout: 24u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QAbstractTextDocumentLayout) -16 (int (*)(...))QAbstractTextDocumentLayout::metaObject -24 (int (*)(...))QAbstractTextDocumentLayout::qt_metacast -32 (int (*)(...))QAbstractTextDocumentLayout::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractTextDocumentLayout::resizeInlineObject -176 (int (*)(...))QAbstractTextDocumentLayout::positionInlineObject -184 (int (*)(...))QAbstractTextDocumentLayout::drawInlineObject - -Class QAbstractTextDocumentLayout - size=16 align=8 - base size=16 base align=8 -QAbstractTextDocumentLayout (0x0x7f64e73d3340) 0 - vptr=((& QAbstractTextDocumentLayout::_ZTV27QAbstractTextDocumentLayout) + 16u) - QObject (0x0x7f64e73d2300) 0 - primary-for QAbstractTextDocumentLayout (0x0x7f64e73d3340) - -Vtable for QTextObjectInterface -QTextObjectInterface::_ZTV20QTextObjectInterface: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QTextObjectInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QTextObjectInterface - size=8 align=8 - base size=8 base align=8 -QTextObjectInterface (0x0x7f64e73d29c0) 0 nearly-empty - vptr=((& QTextObjectInterface::_ZTV20QTextObjectInterface) + 16u) - -Class QAccessible::State - size=8 align=8 - base size=5 base align=8 -QAccessible::State (0x0x7f64e73d2ae0) 0 - -Vtable for QAccessible::ActivationObserver -QAccessible::ActivationObserver::_ZTVN11QAccessible18ActivationObserverE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN11QAccessible18ActivationObserverE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QAccessible::ActivationObserver - size=8 align=8 - base size=8 base align=8 -QAccessible::ActivationObserver (0x0x7f64e73d2b40) 0 nearly-empty - vptr=((& QAccessible::ActivationObserver::_ZTVN11QAccessible18ActivationObserverE) + 16u) - -Class QAccessible - size=1 align=1 - base size=0 base align=1 -QAccessible (0x0x7f64e73d2a80) 0 empty - -Vtable for QAccessibleInterface -QAccessibleInterface::_ZTV20QAccessibleInterface: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QAccessibleInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QAccessibleInterface::window -56 (int (*)(...))QAccessibleInterface::relations -64 (int (*)(...))QAccessibleInterface::focusChild -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAccessibleInterface::foregroundColor -160 (int (*)(...))QAccessibleInterface::backgroundColor -168 (int (*)(...))QAccessibleInterface::virtual_hook -176 (int (*)(...))QAccessibleInterface::interface_cast - -Class QAccessibleInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleInterface (0x0x7f64e73d2d20) 0 nearly-empty - vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 16u) - -Vtable for QAccessibleTextInterface -QAccessibleTextInterface::_ZTV24QAccessibleTextInterface: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QAccessibleTextInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))QAccessibleTextInterface::textBeforeOffset -104 (int (*)(...))QAccessibleTextInterface::textAfterOffset -112 (int (*)(...))QAccessibleTextInterface::textAtOffset -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleTextInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleTextInterface (0x0x7f64e73d2d80) 0 nearly-empty - vptr=((& QAccessibleTextInterface::_ZTV24QAccessibleTextInterface) + 16u) - -Vtable for QAccessibleEditableTextInterface -QAccessibleEditableTextInterface::_ZTV32QAccessibleEditableTextInterface: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI32QAccessibleEditableTextInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleEditableTextInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleEditableTextInterface (0x0x7f64e73d2de0) 0 nearly-empty - vptr=((& QAccessibleEditableTextInterface::_ZTV32QAccessibleEditableTextInterface) + 16u) - -Vtable for QAccessibleValueInterface -QAccessibleValueInterface::_ZTV25QAccessibleValueInterface: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QAccessibleValueInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleValueInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleValueInterface (0x0x7f64e73d2e40) 0 nearly-empty - vptr=((& QAccessibleValueInterface::_ZTV25QAccessibleValueInterface) + 16u) - -Vtable for QAccessibleTableCellInterface -QAccessibleTableCellInterface::_ZTV29QAccessibleTableCellInterface: 12u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI29QAccessibleTableCellInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleTableCellInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleTableCellInterface (0x0x7f64e73d2ea0) 0 nearly-empty - vptr=((& QAccessibleTableCellInterface::_ZTV29QAccessibleTableCellInterface) + 16u) - -Vtable for QAccessibleTableInterface -QAccessibleTableInterface::_ZTV25QAccessibleTableInterface: 24u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QAccessibleTableInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))__cxa_pure_virtual -176 (int (*)(...))__cxa_pure_virtual -184 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleTableInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleTableInterface (0x0x7f64e73d2f00) 0 nearly-empty - vptr=((& QAccessibleTableInterface::_ZTV25QAccessibleTableInterface) + 16u) - -Vtable for QAccessibleActionInterface -QAccessibleActionInterface::_ZTV26QAccessibleActionInterface: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleActionInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QAccessibleActionInterface::localizedActionName -48 (int (*)(...))QAccessibleActionInterface::localizedActionDescription -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleActionInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleActionInterface (0x0x7f64e73d2f60) 0 nearly-empty - vptr=((& QAccessibleActionInterface::_ZTV26QAccessibleActionInterface) + 16u) - -Vtable for QAccessibleImageInterface -QAccessibleImageInterface::_ZTV25QAccessibleImageInterface: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QAccessibleImageInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleImageInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleImageInterface (0x0x7f64e74df000) 0 nearly-empty - vptr=((& QAccessibleImageInterface::_ZTV25QAccessibleImageInterface) + 16u) - -Vtable for QAccessibleEvent -QAccessibleEvent::_ZTV16QAccessibleEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QAccessibleEvent) -16 (int (*)(...))QAccessibleEvent::~QAccessibleEvent -24 (int (*)(...))QAccessibleEvent::~QAccessibleEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleEvent - size=32 align=8 - base size=28 base align=8 -QAccessibleEvent (0x0x7f64e74df060) 0 - vptr=((& QAccessibleEvent::_ZTV16QAccessibleEvent) + 16u) - -Vtable for QAccessibleStateChangeEvent -QAccessibleStateChangeEvent::_ZTV27QAccessibleStateChangeEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QAccessibleStateChangeEvent) -16 (int (*)(...))QAccessibleStateChangeEvent::~QAccessibleStateChangeEvent -24 (int (*)(...))QAccessibleStateChangeEvent::~QAccessibleStateChangeEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleStateChangeEvent - size=40 align=8 - base size=40 base align=8 -QAccessibleStateChangeEvent (0x0x7f64e73d3d68) 0 - vptr=((& QAccessibleStateChangeEvent::_ZTV27QAccessibleStateChangeEvent) + 16u) - QAccessibleEvent (0x0x7f64e74df5a0) 0 - primary-for QAccessibleStateChangeEvent (0x0x7f64e73d3d68) - -Vtable for QAccessibleTextCursorEvent -QAccessibleTextCursorEvent::_ZTV26QAccessibleTextCursorEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextCursorEvent) -16 (int (*)(...))QAccessibleTextCursorEvent::~QAccessibleTextCursorEvent -24 (int (*)(...))QAccessibleTextCursorEvent::~QAccessibleTextCursorEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextCursorEvent - size=32 align=8 - base size=32 base align=8 -QAccessibleTextCursorEvent (0x0x7f64e73d3dd0) 0 - vptr=((& QAccessibleTextCursorEvent::_ZTV26QAccessibleTextCursorEvent) + 16u) - QAccessibleEvent (0x0x7f64e74df600) 0 - primary-for QAccessibleTextCursorEvent (0x0x7f64e73d3dd0) - -Vtable for QAccessibleTextSelectionEvent -QAccessibleTextSelectionEvent::_ZTV29QAccessibleTextSelectionEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI29QAccessibleTextSelectionEvent) -16 (int (*)(...))QAccessibleTextSelectionEvent::~QAccessibleTextSelectionEvent -24 (int (*)(...))QAccessibleTextSelectionEvent::~QAccessibleTextSelectionEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextSelectionEvent - size=40 align=8 - base size=40 base align=8 -QAccessibleTextSelectionEvent (0x0x7f64e73d3e38) 0 - vptr=((& QAccessibleTextSelectionEvent::_ZTV29QAccessibleTextSelectionEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7f64e73d3ea0) 0 - primary-for QAccessibleTextSelectionEvent (0x0x7f64e73d3e38) - QAccessibleEvent (0x0x7f64e74df660) 0 - primary-for QAccessibleTextCursorEvent (0x0x7f64e73d3ea0) - -Vtable for QAccessibleTextInsertEvent -QAccessibleTextInsertEvent::_ZTV26QAccessibleTextInsertEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextInsertEvent) -16 (int (*)(...))QAccessibleTextInsertEvent::~QAccessibleTextInsertEvent -24 (int (*)(...))QAccessibleTextInsertEvent::~QAccessibleTextInsertEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextInsertEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleTextInsertEvent (0x0x7f64e73d3f08) 0 - vptr=((& QAccessibleTextInsertEvent::_ZTV26QAccessibleTextInsertEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7f64e73d3f70) 0 - primary-for QAccessibleTextInsertEvent (0x0x7f64e73d3f08) - QAccessibleEvent (0x0x7f64e74df6c0) 0 - primary-for QAccessibleTextCursorEvent (0x0x7f64e73d3f70) - -Vtable for QAccessibleTextRemoveEvent -QAccessibleTextRemoveEvent::_ZTV26QAccessibleTextRemoveEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextRemoveEvent) -16 (int (*)(...))QAccessibleTextRemoveEvent::~QAccessibleTextRemoveEvent -24 (int (*)(...))QAccessibleTextRemoveEvent::~QAccessibleTextRemoveEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextRemoveEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleTextRemoveEvent (0x0x7f64e7170000) 0 - vptr=((& QAccessibleTextRemoveEvent::_ZTV26QAccessibleTextRemoveEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7f64e7170068) 0 - primary-for QAccessibleTextRemoveEvent (0x0x7f64e7170000) - QAccessibleEvent (0x0x7f64e74df720) 0 - primary-for QAccessibleTextCursorEvent (0x0x7f64e7170068) - -Vtable for QAccessibleTextUpdateEvent -QAccessibleTextUpdateEvent::_ZTV26QAccessibleTextUpdateEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextUpdateEvent) -16 (int (*)(...))QAccessibleTextUpdateEvent::~QAccessibleTextUpdateEvent -24 (int (*)(...))QAccessibleTextUpdateEvent::~QAccessibleTextUpdateEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextUpdateEvent - size=56 align=8 - base size=56 base align=8 -QAccessibleTextUpdateEvent (0x0x7f64e71700d0) 0 - vptr=((& QAccessibleTextUpdateEvent::_ZTV26QAccessibleTextUpdateEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7f64e7170138) 0 - primary-for QAccessibleTextUpdateEvent (0x0x7f64e71700d0) - QAccessibleEvent (0x0x7f64e74df780) 0 - primary-for QAccessibleTextCursorEvent (0x0x7f64e7170138) - -Vtable for QAccessibleValueChangeEvent -QAccessibleValueChangeEvent::_ZTV27QAccessibleValueChangeEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QAccessibleValueChangeEvent) -16 (int (*)(...))QAccessibleValueChangeEvent::~QAccessibleValueChangeEvent -24 (int (*)(...))QAccessibleValueChangeEvent::~QAccessibleValueChangeEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleValueChangeEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleValueChangeEvent (0x0x7f64e71701a0) 0 - vptr=((& QAccessibleValueChangeEvent::_ZTV27QAccessibleValueChangeEvent) + 16u) - QAccessibleEvent (0x0x7f64e74df7e0) 0 - primary-for QAccessibleValueChangeEvent (0x0x7f64e71701a0) - -Vtable for QAccessibleTableModelChangeEvent -QAccessibleTableModelChangeEvent::_ZTV32QAccessibleTableModelChangeEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI32QAccessibleTableModelChangeEvent) -16 (int (*)(...))QAccessibleTableModelChangeEvent::~QAccessibleTableModelChangeEvent -24 (int (*)(...))QAccessibleTableModelChangeEvent::~QAccessibleTableModelChangeEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTableModelChangeEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleTableModelChangeEvent (0x0x7f64e7170208) 0 - vptr=((& QAccessibleTableModelChangeEvent::_ZTV32QAccessibleTableModelChangeEvent) + 16u) - QAccessibleEvent (0x0x7f64e74df840) 0 - primary-for QAccessibleTableModelChangeEvent (0x0x7f64e7170208) - -Vtable for QAccessibleBridge -QAccessibleBridge::_ZTV17QAccessibleBridge: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAccessibleBridge) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleBridge - size=8 align=8 - base size=8 base align=8 -QAccessibleBridge (0x0x7f64e74df900) 0 nearly-empty - vptr=((& QAccessibleBridge::_ZTV17QAccessibleBridge) + 16u) - -Class QAccessibleBridgePlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessibleBridgePlugin::QPrivateSignal (0x0x7f64e74df9c0) 0 empty - -Vtable for QAccessibleBridgePlugin -QAccessibleBridgePlugin::_ZTV23QAccessibleBridgePlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QAccessibleBridgePlugin) -16 (int (*)(...))QAccessibleBridgePlugin::metaObject -24 (int (*)(...))QAccessibleBridgePlugin::qt_metacast -32 (int (*)(...))QAccessibleBridgePlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleBridgePlugin - size=16 align=8 - base size=16 base align=8 -QAccessibleBridgePlugin (0x0x7f64e7170270) 0 - vptr=((& QAccessibleBridgePlugin::_ZTV23QAccessibleBridgePlugin) + 16u) - QObject (0x0x7f64e74df960) 0 - primary-for QAccessibleBridgePlugin (0x0x7f64e7170270) - -Vtable for QAccessibleObject -QAccessibleObject::_ZTV17QAccessibleObject: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAccessibleObject) -16 0u -24 0u -32 (int (*)(...))QAccessibleObject::isValid -40 (int (*)(...))QAccessibleObject::object -48 (int (*)(...))QAccessibleInterface::window -56 (int (*)(...))QAccessibleInterface::relations -64 (int (*)(...))QAccessibleInterface::focusChild -72 (int (*)(...))QAccessibleObject::childAt -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QAccessibleObject::setText -128 (int (*)(...))QAccessibleObject::rect -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAccessibleInterface::foregroundColor -160 (int (*)(...))QAccessibleInterface::backgroundColor -168 (int (*)(...))QAccessibleInterface::virtual_hook -176 (int (*)(...))QAccessibleInterface::interface_cast - -Class QAccessibleObject - size=16 align=8 - base size=16 base align=8 -QAccessibleObject (0x0x7f64e71702d8) 0 - vptr=((& QAccessibleObject::_ZTV17QAccessibleObject) + 16u) - QAccessibleInterface (0x0x7f64e74dfa20) 0 nearly-empty - primary-for QAccessibleObject (0x0x7f64e71702d8) - -Vtable for QAccessibleApplication -QAccessibleApplication::_ZTV22QAccessibleApplication: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QAccessibleApplication) -16 (int (*)(...))QAccessibleApplication::~QAccessibleApplication -24 (int (*)(...))QAccessibleApplication::~QAccessibleApplication -32 (int (*)(...))QAccessibleObject::isValid -40 (int (*)(...))QAccessibleObject::object -48 (int (*)(...))QAccessibleApplication::window -56 (int (*)(...))QAccessibleInterface::relations -64 (int (*)(...))QAccessibleApplication::focusChild -72 (int (*)(...))QAccessibleObject::childAt -80 (int (*)(...))QAccessibleApplication::parent -88 (int (*)(...))QAccessibleApplication::child -96 (int (*)(...))QAccessibleApplication::childCount -104 (int (*)(...))QAccessibleApplication::indexOfChild -112 (int (*)(...))QAccessibleApplication::text -120 (int (*)(...))QAccessibleObject::setText -128 (int (*)(...))QAccessibleObject::rect -136 (int (*)(...))QAccessibleApplication::role -144 (int (*)(...))QAccessibleApplication::state -152 (int (*)(...))QAccessibleInterface::foregroundColor -160 (int (*)(...))QAccessibleInterface::backgroundColor -168 (int (*)(...))QAccessibleInterface::virtual_hook -176 (int (*)(...))QAccessibleInterface::interface_cast - -Class QAccessibleApplication - size=16 align=8 - base size=16 base align=8 -QAccessibleApplication (0x0x7f64e7170340) 0 - vptr=((& QAccessibleApplication::_ZTV22QAccessibleApplication) + 16u) - QAccessibleObject (0x0x7f64e71703a8) 0 - primary-for QAccessibleApplication (0x0x7f64e7170340) - QAccessibleInterface (0x0x7f64e74dfa80) 0 nearly-empty - primary-for QAccessibleObject (0x0x7f64e71703a8) - -Class QAccessiblePlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessiblePlugin::QPrivateSignal (0x0x7f64e74dfb40) 0 empty - -Vtable for QAccessiblePlugin -QAccessiblePlugin::_ZTV17QAccessiblePlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAccessiblePlugin) -16 (int (*)(...))QAccessiblePlugin::metaObject -24 (int (*)(...))QAccessiblePlugin::qt_metacast -32 (int (*)(...))QAccessiblePlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QAccessiblePlugin - size=16 align=8 - base size=16 base align=8 -QAccessiblePlugin (0x0x7f64e7170410) 0 - vptr=((& QAccessiblePlugin::_ZTV17QAccessiblePlugin) + 16u) - QObject (0x0x7f64e74dfae0) 0 - primary-for QAccessiblePlugin (0x0x7f64e7170410) - -Class QSurfaceFormat - size=8 align=8 - base size=8 base align=8 -QSurfaceFormat (0x0x7f64e74dfba0) 0 - -Vtable for QSurface -QSurface::_ZTV8QSurface: 8u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QSurface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual - -Class QSurface - size=24 align=8 - base size=24 base align=8 -QSurface (0x0x7f64e74dfd80) 0 - vptr=((& QSurface::_ZTV8QSurface) + 16u) - -Class QIcon - size=8 align=8 - base size=8 base align=8 -QIcon (0x0x7f64e74dff00) 0 - -Class QCursor - size=8 align=8 - base size=8 base align=8 -QCursor (0x0x7f64e72d4300) 0 - -Class QWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QWindow::QPrivateSignal (0x0x7f64e6f5e900) 0 empty - -Vtable for QWindow -QWindow::_ZTV7QWindow: 45u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QWindow) -16 (int (*)(...))QWindow::metaObject -24 (int (*)(...))QWindow::qt_metacast -32 (int (*)(...))QWindow::qt_metacall -40 (int (*)(...))QWindow::~QWindow -48 (int (*)(...))QWindow::~QWindow -56 (int (*)(...))QWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QWindow::exposeEvent -160 (int (*)(...))QWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))-16 -304 (int (*)(...))(& _ZTI7QWindow) -312 (int (*)(...))QWindow::_ZThn16_N7QWindowD1Ev -320 (int (*)(...))QWindow::_ZThn16_N7QWindowD0Ev -328 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -336 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -344 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv - -Class QWindow - size=40 align=8 - base size=40 base align=8 -QWindow (0x0x7f64e6f73230) 0 - vptr=((& QWindow::_ZTV7QWindow) + 16u) - QObject (0x0x7f64e6f5e840) 0 - primary-for QWindow (0x0x7f64e6f73230) - QSurface (0x0x7f64e6f5e8a0) 16 - vptr=((& QWindow::_ZTV7QWindow) + 312u) - -Class QBackingStore - size=8 align=8 - base size=8 base align=8 -QBackingStore (0x0x7f64e6f5ea20) 0 - -Vtable for QBitmap -QBitmap::_ZTV7QBitmap: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QBitmap) -16 (int (*)(...))QBitmap::~QBitmap -24 (int (*)(...))QBitmap::~QBitmap -32 (int (*)(...))QPixmap::devType -40 (int (*)(...))QPixmap::paintEngine -48 (int (*)(...))QPixmap::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QBitmap - size=32 align=8 - base size=32 base align=8 -QBitmap (0x0x7f64e6f70478) 0 - vptr=((& QBitmap::_ZTV7QBitmap) + 16u) - QPixmap (0x0x7f64e6f704e0) 0 - primary-for QBitmap (0x0x7f64e6f70478) - QPaintDevice (0x0x7f64e6f5eae0) 0 - primary-for QPixmap (0x0x7f64e6f704e0) - -Class QClipboard::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QClipboard::QPrivateSignal (0x0x7f64e6f5ee40) 0 empty - -Vtable for QClipboard -QClipboard::_ZTV10QClipboard: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QClipboard) -16 (int (*)(...))QClipboard::metaObject -24 (int (*)(...))QClipboard::qt_metacast -32 (int (*)(...))QClipboard::qt_metacall -40 (int (*)(...))QClipboard::~QClipboard -48 (int (*)(...))QClipboard::~QClipboard -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QClipboard - size=16 align=8 - base size=16 base align=8 -QClipboard (0x0x7f64e6f70750) 0 - vptr=((& QClipboard::_ZTV10QClipboard) + 16u) - QObject (0x0x7f64e6f5ede0) 0 - primary-for QClipboard (0x0x7f64e6f70750) - -Class QDesktopServices - size=1 align=1 - base size=0 base align=1 -QDesktopServices (0x0x7f64e6f5eea0) 0 empty - -Class QDrag::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QDrag::QPrivateSignal (0x0x7f64e6f5ef60) 0 empty - -Vtable for QDrag -QDrag::_ZTV5QDrag: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI5QDrag) -16 (int (*)(...))QDrag::metaObject -24 (int (*)(...))QDrag::qt_metacast -32 (int (*)(...))QDrag::qt_metacall -40 (int (*)(...))QDrag::~QDrag -48 (int (*)(...))QDrag::~QDrag -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QDrag - size=16 align=8 - base size=16 base align=8 -QDrag (0x0x7f64e6f707b8) 0 - vptr=((& QDrag::_ZTV5QDrag) + 16u) - QObject (0x0x7f64e6f5ef00) 0 - primary-for QDrag (0x0x7f64e6f707b8) - -Class QFontInfo - size=8 align=8 - base size=8 base align=8 -QFontInfo (0x0x7f64e7016000) 0 - -Class QFontMetrics - size=8 align=8 - base size=8 base align=8 -QFontMetrics (0x0x7f64e70162a0) 0 - -Class QFontMetricsF - size=8 align=8 - base size=8 base align=8 -QFontMetricsF (0x0x7f64e70165a0) 0 - -Class QGenericPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QGenericPlugin::QPrivateSignal (0x0x7f64e70cbd20) 0 empty - -Vtable for QGenericPlugin -QGenericPlugin::_ZTV14QGenericPlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QGenericPlugin) -16 (int (*)(...))QGenericPlugin::metaObject -24 (int (*)(...))QGenericPlugin::qt_metacast -32 (int (*)(...))QGenericPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QGenericPlugin - size=16 align=8 - base size=16 base align=8 -QGenericPlugin (0x0x7f64e70c9270) 0 - vptr=((& QGenericPlugin::_ZTV14QGenericPlugin) + 16u) - QObject (0x0x7f64e70cbcc0) 0 - primary-for QGenericPlugin (0x0x7f64e70c9270) - -Class QGenericPluginFactory - size=1 align=1 - base size=0 base align=1 -QGenericPluginFactory (0x0x7f64e70cbd80) 0 empty - -Class QInputMethod::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QInputMethod::QPrivateSignal (0x0x7f64e70cbe40) 0 empty - -Vtable for QInputMethod -QInputMethod::_ZTV12QInputMethod: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QInputMethod) -16 (int (*)(...))QInputMethod::metaObject -24 (int (*)(...))QInputMethod::qt_metacast -32 (int (*)(...))QInputMethod::qt_metacall -40 (int (*)(...))QInputMethod::~QInputMethod -48 (int (*)(...))QInputMethod::~QInputMethod -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QInputMethod - size=16 align=8 - base size=16 base align=8 -QInputMethod (0x0x7f64e70c92d8) 0 - vptr=((& QInputMethod::_ZTV12QInputMethod) + 16u) - QObject (0x0x7f64e70cbde0) 0 - primary-for QInputMethod (0x0x7f64e70c92d8) - -Class QGuiApplication::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QGuiApplication::QPrivateSignal (0x0x7f64e70cbf00) 0 empty - -Vtable for QGuiApplication -QGuiApplication::_ZTV15QGuiApplication: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QGuiApplication) -16 (int (*)(...))QGuiApplication::metaObject -24 (int (*)(...))QGuiApplication::qt_metacast -32 (int (*)(...))QGuiApplication::qt_metacall -40 (int (*)(...))QGuiApplication::~QGuiApplication -48 (int (*)(...))QGuiApplication::~QGuiApplication -56 (int (*)(...))QGuiApplication::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QGuiApplication::notify -120 (int (*)(...))QGuiApplication::compressEvent - -Class QGuiApplication - size=16 align=8 - base size=16 base align=8 -QGuiApplication (0x0x7f64e70c9340) 0 - vptr=((& QGuiApplication::_ZTV15QGuiApplication) + 16u) - QCoreApplication (0x0x7f64e70c93a8) 0 - primary-for QGuiApplication (0x0x7f64e70c9340) - QObject (0x0x7f64e70cbea0) 0 - primary-for QCoreApplication (0x0x7f64e70c93a8) - -Class QIconEngine::AvailableSizesArgument - size=16 align=8 - base size=16 base align=8 -QIconEngine::AvailableSizesArgument (0x0x7f64e6dee480) 0 - -Class QIconEngine::ScaledPixmapArgument - size=56 align=8 - base size=56 base align=8 -QIconEngine::ScaledPixmapArgument (0x0x7f64e6dee600) 0 - -Vtable for QIconEngine -QIconEngine::_ZTV11QIconEngine: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QIconEngine) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QIconEngine::actualSize -48 (int (*)(...))QIconEngine::pixmap -56 (int (*)(...))QIconEngine::addPixmap -64 (int (*)(...))QIconEngine::addFile -72 (int (*)(...))QIconEngine::key -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))QIconEngine::read -96 (int (*)(...))QIconEngine::write -104 (int (*)(...))QIconEngine::availableSizes -112 (int (*)(...))QIconEngine::iconName -120 (int (*)(...))QIconEngine::virtual_hook - -Class QIconEngine - size=8 align=8 - base size=8 base align=8 -QIconEngine (0x0x7f64e6dee420) 0 nearly-empty - vptr=((& QIconEngine::_ZTV11QIconEngine) + 16u) - -Class QIconEnginePlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIconEnginePlugin::QPrivateSignal (0x0x7f64e6dee6c0) 0 empty - -Vtable for QIconEnginePlugin -QIconEnginePlugin::_ZTV17QIconEnginePlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QIconEnginePlugin) -16 (int (*)(...))QIconEnginePlugin::metaObject -24 (int (*)(...))QIconEnginePlugin::qt_metacast -32 (int (*)(...))QIconEnginePlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QIconEnginePlugin - size=16 align=8 - base size=16 base align=8 -QIconEnginePlugin (0x0x7f64e70c99c0) 0 - vptr=((& QIconEnginePlugin::_ZTV17QIconEnginePlugin) + 16u) - QObject (0x0x7f64e6dee660) 0 - primary-for QIconEnginePlugin (0x0x7f64e70c99c0) - -Vtable for QImageIOHandler -QImageIOHandler::_ZTV15QImageIOHandler: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QImageIOHandler) -16 0u -24 0u -32 (int (*)(...))QImageIOHandler::name -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))QImageIOHandler::write -64 (int (*)(...))QImageIOHandler::option -72 (int (*)(...))QImageIOHandler::setOption -80 (int (*)(...))QImageIOHandler::supportsOption -88 (int (*)(...))QImageIOHandler::jumpToNextImage -96 (int (*)(...))QImageIOHandler::jumpToImage -104 (int (*)(...))QImageIOHandler::loopCount -112 (int (*)(...))QImageIOHandler::imageCount -120 (int (*)(...))QImageIOHandler::nextImageDelay -128 (int (*)(...))QImageIOHandler::currentImageNumber -136 (int (*)(...))QImageIOHandler::currentImageRect - -Class QImageIOHandler - size=16 align=8 - base size=16 base align=8 -QImageIOHandler (0x0x7f64e6dee720) 0 - vptr=((& QImageIOHandler::_ZTV15QImageIOHandler) + 16u) - -Class QImageIOPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QImageIOPlugin::QPrivateSignal (0x0x7f64e6dee8a0) 0 empty - -Vtable for QImageIOPlugin -QImageIOPlugin::_ZTV14QImageIOPlugin: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QImageIOPlugin) -16 (int (*)(...))QImageIOPlugin::metaObject -24 (int (*)(...))QImageIOPlugin::qt_metacast -32 (int (*)(...))QImageIOPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QImageIOPlugin - size=16 align=8 - base size=16 base align=8 -QImageIOPlugin (0x0x7f64e70c9a28) 0 - vptr=((& QImageIOPlugin::_ZTV14QImageIOPlugin) + 16u) - QObject (0x0x7f64e6dee840) 0 - primary-for QImageIOPlugin (0x0x7f64e70c9a28) - -Class QImageReader - size=8 align=8 - base size=8 base align=8 -QImageReader (0x0x7f64e6deea80) 0 - -Class QImageWriter - size=8 align=8 - base size=8 base align=8 -QImageWriter (0x0x7f64e6deeae0) 0 - -Class QVector3D - size=12 align=4 - base size=12 base align=4 -QVector3D (0x0x7f64e6deeb40) 0 - -Class QVector4D - size=16 align=4 - base size=16 base align=4 -QVector4D (0x0x7f64e6deede0) 0 - -Class QQuaternion - size=16 align=4 - base size=16 base align=4 -QQuaternion (0x0x7f64e6b250c0) 0 - -Class QMatrix4x4 - size=68 align=4 - base size=68 base align=4 -QMatrix4x4 (0x0x7f64e6b256c0) 0 - -Class QMovie::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QMovie::QPrivateSignal (0x0x7f64e6b25e40) 0 empty - -Vtable for QMovie -QMovie::_ZTV6QMovie: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QMovie) -16 (int (*)(...))QMovie::metaObject -24 (int (*)(...))QMovie::qt_metacast -32 (int (*)(...))QMovie::qt_metacall -40 (int (*)(...))QMovie::~QMovie -48 (int (*)(...))QMovie::~QMovie -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QMovie - size=16 align=8 - base size=16 base align=8 -QMovie (0x0x7f64e6b7dc30) 0 - vptr=((& QMovie::_ZTV6QMovie) + 16u) - QObject (0x0x7f64e6b25de0) 0 - primary-for QMovie (0x0x7f64e6b7dc30) - -Class QOffscreenSurface::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOffscreenSurface::QPrivateSignal (0x0x7f64e6b25f60) 0 empty - -Vtable for QOffscreenSurface -QOffscreenSurface::_ZTV17QOffscreenSurface: 26u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QOffscreenSurface) -16 (int (*)(...))QOffscreenSurface::metaObject -24 (int (*)(...))QOffscreenSurface::qt_metacast -32 (int (*)(...))QOffscreenSurface::qt_metacall -40 (int (*)(...))QOffscreenSurface::~QOffscreenSurface -48 (int (*)(...))QOffscreenSurface::~QOffscreenSurface -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QOffscreenSurface::surfaceType -120 (int (*)(...))QOffscreenSurface::format -128 (int (*)(...))QOffscreenSurface::size -136 (int (*)(...))QOffscreenSurface::surfaceHandle -144 (int (*)(...))-16 -152 (int (*)(...))(& _ZTI17QOffscreenSurface) -160 (int (*)(...))QOffscreenSurface::_ZThn16_N17QOffscreenSurfaceD1Ev -168 (int (*)(...))QOffscreenSurface::_ZThn16_N17QOffscreenSurfaceD0Ev -176 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface6formatEv -184 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface13surfaceHandleEv -192 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface11surfaceTypeEv -200 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface4sizeEv - -Class QOffscreenSurface - size=40 align=8 - base size=40 base align=8 -QOffscreenSurface (0x0x7f64e6ccbd20) 0 - vptr=((& QOffscreenSurface::_ZTV17QOffscreenSurface) + 16u) - QObject (0x0x7f64e6b25ea0) 0 - primary-for QOffscreenSurface (0x0x7f64e6ccbd20) - QSurface (0x0x7f64e6b25f00) 16 - vptr=((& QOffscreenSurface::_ZTV17QOffscreenSurface) + 160u) - -Class QOpenGLBuffer - size=8 align=8 - base size=8 base align=8 -QOpenGLBuffer (0x0x7f64e6a81060) 0 - -Class QOpenGLVersionStatus - size=12 align=4 - base size=12 base align=4 -QOpenGLVersionStatus (0x0x7f64e6a81240) 0 - -Class QOpenGLVersionFunctionsBackend - size=16 align=8 - base size=12 base align=8 -QOpenGLVersionFunctionsBackend (0x0x7f64e669dd20) 0 - -Class QOpenGLVersionFunctionsStorage - size=8 align=8 - base size=8 base align=8 -QOpenGLVersionFunctionsStorage (0x0x7f64e669dd80) 0 - -Class QAbstractOpenGLFunctionsPrivate - size=16 align=8 - base size=9 base align=8 -QAbstractOpenGLFunctionsPrivate (0x0x7f64e669dde0) 0 - -Vtable for QAbstractOpenGLFunctions -QAbstractOpenGLFunctions::_ZTV24QAbstractOpenGLFunctions: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QAbstractOpenGLFunctions) -16 (int (*)(...))QAbstractOpenGLFunctions::~QAbstractOpenGLFunctions -24 (int (*)(...))QAbstractOpenGLFunctions::~QAbstractOpenGLFunctions -32 (int (*)(...))QAbstractOpenGLFunctions::initializeOpenGLFunctions - -Class QAbstractOpenGLFunctions - size=16 align=8 - base size=16 base align=8 -QAbstractOpenGLFunctions (0x0x7f64e669de40) 0 - vptr=((& QAbstractOpenGLFunctions::_ZTV24QAbstractOpenGLFunctions) + 16u) - -Class QOpenGLFunctions_1_0_CoreBackend::Functions - size=384 align=8 - base size=384 base align=8 -QOpenGLFunctions_1_0_CoreBackend::Functions (0x0x7f64e669df00) 0 - -Class QOpenGLFunctions_1_0_CoreBackend - size=400 align=8 - base size=400 base align=8 -QOpenGLFunctions_1_0_CoreBackend (0x0x7f64e669eea0) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e669dea0) 0 - -Class QOpenGLFunctions_1_1_CoreBackend::Functions - size=128 align=8 - base size=128 base align=8 -QOpenGLFunctions_1_1_CoreBackend::Functions (0x0x7f64e66e8060) 0 - -Class QOpenGLFunctions_1_1_CoreBackend - size=144 align=8 - base size=144 base align=8 -QOpenGLFunctions_1_1_CoreBackend (0x0x7f64e669ef08) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8000) 0 - -Class QOpenGLFunctions_1_2_CoreBackend::Functions - size=48 align=8 - base size=48 base align=8 -QOpenGLFunctions_1_2_CoreBackend::Functions (0x0x7f64e66e8180) 0 - -Class QOpenGLFunctions_1_2_CoreBackend - size=64 align=8 - base size=64 base align=8 -QOpenGLFunctions_1_2_CoreBackend (0x0x7f64e669ef70) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8120) 0 - -Class QOpenGLFunctions_1_3_CoreBackend::Functions - size=72 align=8 - base size=72 base align=8 -QOpenGLFunctions_1_3_CoreBackend::Functions (0x0x7f64e66e82a0) 0 - -Class QOpenGLFunctions_1_3_CoreBackend - size=88 align=8 - base size=88 base align=8 -QOpenGLFunctions_1_3_CoreBackend (0x0x7f64e66fd000) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8240) 0 - -Class QOpenGLFunctions_1_4_CoreBackend::Functions - size=56 align=8 - base size=56 base align=8 -QOpenGLFunctions_1_4_CoreBackend::Functions (0x0x7f64e66e8420) 0 - -Class QOpenGLFunctions_1_4_CoreBackend - size=72 align=8 - base size=72 base align=8 -QOpenGLFunctions_1_4_CoreBackend (0x0x7f64e66fd068) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e83c0) 0 - -Class QOpenGLFunctions_1_5_CoreBackend::Functions - size=152 align=8 - base size=152 base align=8 -QOpenGLFunctions_1_5_CoreBackend::Functions (0x0x7f64e66e8540) 0 - -Class QOpenGLFunctions_1_5_CoreBackend - size=168 align=8 - base size=168 base align=8 -QOpenGLFunctions_1_5_CoreBackend (0x0x7f64e66fd0d0) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e84e0) 0 - -Class QOpenGLFunctions_2_0_CoreBackend::Functions - size=744 align=8 - base size=744 base align=8 -QOpenGLFunctions_2_0_CoreBackend::Functions (0x0x7f64e66e8660) 0 - -Class QOpenGLFunctions_2_0_CoreBackend - size=760 align=8 - base size=760 base align=8 -QOpenGLFunctions_2_0_CoreBackend (0x0x7f64e66fd138) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8600) 0 - -Class QOpenGLFunctions_2_1_CoreBackend::Functions - size=48 align=8 - base size=48 base align=8 -QOpenGLFunctions_2_1_CoreBackend::Functions (0x0x7f64e66e8780) 0 - -Class QOpenGLFunctions_2_1_CoreBackend - size=64 align=8 - base size=64 base align=8 -QOpenGLFunctions_2_1_CoreBackend (0x0x7f64e66fd1a0) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8720) 0 - -Class QOpenGLFunctions_3_0_CoreBackend::Functions - size=672 align=8 - base size=672 base align=8 -QOpenGLFunctions_3_0_CoreBackend::Functions (0x0x7f64e66e88a0) 0 - -Class QOpenGLFunctions_3_0_CoreBackend - size=688 align=8 - base size=688 base align=8 -QOpenGLFunctions_3_0_CoreBackend (0x0x7f64e66fd208) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8840) 0 - -Class QOpenGLFunctions_3_1_CoreBackend::Functions - size=96 align=8 - base size=96 base align=8 -QOpenGLFunctions_3_1_CoreBackend::Functions (0x0x7f64e66e89c0) 0 - -Class QOpenGLFunctions_3_1_CoreBackend - size=112 align=8 - base size=112 base align=8 -QOpenGLFunctions_3_1_CoreBackend (0x0x7f64e66fd270) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8960) 0 - -Class QOpenGLFunctions_3_2_CoreBackend::Functions - size=152 align=8 - base size=152 base align=8 -QOpenGLFunctions_3_2_CoreBackend::Functions (0x0x7f64e66e8ae0) 0 - -Class QOpenGLFunctions_3_2_CoreBackend - size=168 align=8 - base size=168 base align=8 -QOpenGLFunctions_3_2_CoreBackend (0x0x7f64e66fd2d8) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8a80) 0 - -Class QOpenGLFunctions_3_3_CoreBackend::Functions - size=464 align=8 - base size=464 base align=8 -QOpenGLFunctions_3_3_CoreBackend::Functions (0x0x7f64e66e8c00) 0 - -Class QOpenGLFunctions_3_3_CoreBackend - size=480 align=8 - base size=480 base align=8 -QOpenGLFunctions_3_3_CoreBackend (0x0x7f64e66fd340) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8ba0) 0 - -Class QOpenGLFunctions_4_0_CoreBackend::Functions - size=368 align=8 - base size=368 base align=8 -QOpenGLFunctions_4_0_CoreBackend::Functions (0x0x7f64e66e8d20) 0 - -Class QOpenGLFunctions_4_0_CoreBackend - size=384 align=8 - base size=384 base align=8 -QOpenGLFunctions_4_0_CoreBackend (0x0x7f64e66fd3a8) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8cc0) 0 - -Class QOpenGLFunctions_4_1_CoreBackend::Functions - size=704 align=8 - base size=704 base align=8 -QOpenGLFunctions_4_1_CoreBackend::Functions (0x0x7f64e66e8e40) 0 - -Class QOpenGLFunctions_4_1_CoreBackend - size=720 align=8 - base size=720 base align=8 -QOpenGLFunctions_4_1_CoreBackend (0x0x7f64e66fd410) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8de0) 0 - -Class QOpenGLFunctions_4_2_CoreBackend::Functions - size=96 align=8 - base size=96 base align=8 -QOpenGLFunctions_4_2_CoreBackend::Functions (0x0x7f64e66e8f60) 0 - -Class QOpenGLFunctions_4_2_CoreBackend - size=112 align=8 - base size=112 base align=8 -QOpenGLFunctions_4_2_CoreBackend (0x0x7f64e66fd478) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e66e8f00) 0 - -Class QOpenGLFunctions_4_3_CoreBackend::Functions - size=344 align=8 - base size=344 base align=8 -QOpenGLFunctions_4_3_CoreBackend::Functions (0x0x7f64e63d40c0) 0 - -Class QOpenGLFunctions_4_3_CoreBackend - size=360 align=8 - base size=360 base align=8 -QOpenGLFunctions_4_3_CoreBackend (0x0x7f64e66fd4e0) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d4060) 0 - -Class QOpenGLFunctions_4_4_CoreBackend::Functions - size=72 align=8 - base size=72 base align=8 -QOpenGLFunctions_4_4_CoreBackend::Functions (0x0x7f64e63d41e0) 0 - -Class QOpenGLFunctions_4_4_CoreBackend - size=88 align=8 - base size=88 base align=8 -QOpenGLFunctions_4_4_CoreBackend (0x0x7f64e66fd548) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d4180) 0 - -Class QOpenGLFunctions_4_5_CoreBackend::Functions - size=848 align=8 - base size=848 base align=8 -QOpenGLFunctions_4_5_CoreBackend::Functions (0x0x7f64e63d4360) 0 - -Class QOpenGLFunctions_4_5_CoreBackend - size=864 align=8 - base size=864 base align=8 -QOpenGLFunctions_4_5_CoreBackend (0x0x7f64e66fd5b0) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d4300) 0 - -Class QOpenGLFunctions_1_0_DeprecatedBackend::Functions - size=2064 align=8 - base size=2064 base align=8 -QOpenGLFunctions_1_0_DeprecatedBackend::Functions (0x0x7f64e63d4480) 0 - -Class QOpenGLFunctions_1_0_DeprecatedBackend - size=2080 align=8 - base size=2080 base align=8 -QOpenGLFunctions_1_0_DeprecatedBackend (0x0x7f64e66fd618) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d4420) 0 - -Class QOpenGLFunctions_1_1_DeprecatedBackend::Functions - size=136 align=8 - base size=136 base align=8 -QOpenGLFunctions_1_1_DeprecatedBackend::Functions (0x0x7f64e63d45a0) 0 - -Class QOpenGLFunctions_1_1_DeprecatedBackend - size=152 align=8 - base size=152 base align=8 -QOpenGLFunctions_1_1_DeprecatedBackend (0x0x7f64e66fd680) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d4540) 0 - -Class QOpenGLFunctions_1_2_DeprecatedBackend::Functions - size=256 align=8 - base size=256 base align=8 -QOpenGLFunctions_1_2_DeprecatedBackend::Functions (0x0x7f64e63d46c0) 0 - -Class QOpenGLFunctions_1_2_DeprecatedBackend - size=272 align=8 - base size=272 base align=8 -QOpenGLFunctions_1_2_DeprecatedBackend (0x0x7f64e66fd6e8) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d4660) 0 - -Class QOpenGLFunctions_1_3_DeprecatedBackend::Functions - size=296 align=8 - base size=296 base align=8 -QOpenGLFunctions_1_3_DeprecatedBackend::Functions (0x0x7f64e63d47e0) 0 - -Class QOpenGLFunctions_1_3_DeprecatedBackend - size=312 align=8 - base size=312 base align=8 -QOpenGLFunctions_1_3_DeprecatedBackend (0x0x7f64e66fd750) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d4780) 0 - -Class QOpenGLFunctions_1_4_DeprecatedBackend::Functions - size=304 align=8 - base size=304 base align=8 -QOpenGLFunctions_1_4_DeprecatedBackend::Functions (0x0x7f64e63d4900) 0 - -Class QOpenGLFunctions_1_4_DeprecatedBackend - size=320 align=8 - base size=320 base align=8 -QOpenGLFunctions_1_4_DeprecatedBackend (0x0x7f64e66fd7b8) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d48a0) 0 - -Class QOpenGLFunctions_2_0_DeprecatedBackend::Functions - size=288 align=8 - base size=288 base align=8 -QOpenGLFunctions_2_0_DeprecatedBackend::Functions (0x0x7f64e63d4a20) 0 - -Class QOpenGLFunctions_2_0_DeprecatedBackend - size=304 align=8 - base size=304 base align=8 -QOpenGLFunctions_2_0_DeprecatedBackend (0x0x7f64e66fd820) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d49c0) 0 - -Class QOpenGLFunctions_3_0_DeprecatedBackend::Functions - size=160 align=8 - base size=160 base align=8 -QOpenGLFunctions_3_0_DeprecatedBackend::Functions (0x0x7f64e63d4b40) 0 - -Class QOpenGLFunctions_3_0_DeprecatedBackend - size=176 align=8 - base size=176 base align=8 -QOpenGLFunctions_3_0_DeprecatedBackend (0x0x7f64e66fd888) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d4ae0) 0 - -Class QOpenGLFunctions_3_3_DeprecatedBackend::Functions - size=240 align=8 - base size=240 base align=8 -QOpenGLFunctions_3_3_DeprecatedBackend::Functions (0x0x7f64e63d4c60) 0 - -Class QOpenGLFunctions_3_3_DeprecatedBackend - size=256 align=8 - base size=256 base align=8 -QOpenGLFunctions_3_3_DeprecatedBackend (0x0x7f64e66fd8f0) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d4c00) 0 - -Class QOpenGLFunctions_4_5_DeprecatedBackend::Functions - size=96 align=8 - base size=96 base align=8 -QOpenGLFunctions_4_5_DeprecatedBackend::Functions (0x0x7f64e63d4d80) 0 - -Class QOpenGLFunctions_4_5_DeprecatedBackend - size=112 align=8 - base size=112 base align=8 -QOpenGLFunctions_4_5_DeprecatedBackend (0x0x7f64e66fd958) 0 - QOpenGLVersionFunctionsBackend (0x0x7f64e63d4d20) 0 - -Class QOpenGLVersionProfile - size=8 align=8 - base size=8 base align=8 -QOpenGLVersionProfile (0x0x7f64e63d4e40) 0 - -Class QOpenGLContextGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLContextGroup::QPrivateSignal (0x0x7f64e64fb840) 0 empty - -Vtable for QOpenGLContextGroup -QOpenGLContextGroup::_ZTV19QOpenGLContextGroup: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QOpenGLContextGroup) -16 (int (*)(...))QOpenGLContextGroup::metaObject -24 (int (*)(...))QOpenGLContextGroup::qt_metacast -32 (int (*)(...))QOpenGLContextGroup::qt_metacall -40 (int (*)(...))QOpenGLContextGroup::~QOpenGLContextGroup -48 (int (*)(...))QOpenGLContextGroup::~QOpenGLContextGroup -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLContextGroup - size=16 align=8 - base size=16 base align=8 -QOpenGLContextGroup (0x0x7f64e650a3a8) 0 - vptr=((& QOpenGLContextGroup::_ZTV19QOpenGLContextGroup) + 16u) - QObject (0x0x7f64e64fb7e0) 0 - primary-for QOpenGLContextGroup (0x0x7f64e650a3a8) - -Class QOpenGLContext::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLContext::QPrivateSignal (0x0x7f64e64fb900) 0 empty - -Vtable for QOpenGLContext -QOpenGLContext::_ZTV14QOpenGLContext: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QOpenGLContext) -16 (int (*)(...))QOpenGLContext::metaObject -24 (int (*)(...))QOpenGLContext::qt_metacast -32 (int (*)(...))QOpenGLContext::qt_metacall -40 (int (*)(...))QOpenGLContext::~QOpenGLContext -48 (int (*)(...))QOpenGLContext::~QOpenGLContext -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLContext - size=16 align=8 - base size=16 base align=8 -QOpenGLContext (0x0x7f64e650a410) 0 - vptr=((& QOpenGLContext::_ZTV14QOpenGLContext) + 16u) - QObject (0x0x7f64e64fb8a0) 0 - primary-for QOpenGLContext (0x0x7f64e650a410) - -Class QOpenGLDebugMessage - size=8 align=8 - base size=8 base align=8 -QOpenGLDebugMessage (0x0x7f64e64fb960) 0 - -Class QOpenGLDebugLogger::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLDebugLogger::QPrivateSignal (0x0x7f64e61b7180) 0 empty - -Vtable for QOpenGLDebugLogger -QOpenGLDebugLogger::_ZTV18QOpenGLDebugLogger: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QOpenGLDebugLogger) -16 (int (*)(...))QOpenGLDebugLogger::metaObject -24 (int (*)(...))QOpenGLDebugLogger::qt_metacast -32 (int (*)(...))QOpenGLDebugLogger::qt_metacall -40 (int (*)(...))QOpenGLDebugLogger::~QOpenGLDebugLogger -48 (int (*)(...))QOpenGLDebugLogger::~QOpenGLDebugLogger -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLDebugLogger - size=16 align=8 - base size=16 base align=8 -QOpenGLDebugLogger (0x0x7f64e650a888) 0 - vptr=((& QOpenGLDebugLogger::_ZTV18QOpenGLDebugLogger) + 16u) - QObject (0x0x7f64e61b7120) 0 - primary-for QOpenGLDebugLogger (0x0x7f64e650a888) - -Class QOpenGLFunctions - size=8 align=8 - base size=8 base align=8 -QOpenGLFunctions (0x0x7f64e61b7300) 0 - -Class QOpenGLFunctionsPrivate::Functions - size=1152 align=8 - base size=1152 base align=8 -QOpenGLFunctionsPrivate::Functions (0x0x7f64e61b7540) 0 - -Class QOpenGLFunctionsPrivate - size=1152 align=8 - base size=1152 base align=8 -QOpenGLFunctionsPrivate (0x0x7f64e61b74e0) 0 - -Class QOpenGLExtraFunctions - size=8 align=8 - base size=8 base align=8 -QOpenGLExtraFunctions (0x0x7f64e650aaf8) 0 - QOpenGLFunctions (0x0x7f64e5f6ec60) 0 - -Class QOpenGLExtraFunctionsPrivate::Functions - size=1728 align=8 - base size=1728 base align=8 -QOpenGLExtraFunctionsPrivate::Functions (0x0x7f64e5f6ed20) 0 - -Class QOpenGLExtraFunctionsPrivate - size=2880 align=8 - base size=2880 base align=8 -QOpenGLExtraFunctionsPrivate (0x0x7f64e650ab60) 0 - QOpenGLFunctionsPrivate (0x0x7f64e5f6ecc0) 0 - -Vtable for QOpenGLFramebufferObject -QOpenGLFramebufferObject::_ZTV24QOpenGLFramebufferObject: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QOpenGLFramebufferObject) -16 (int (*)(...))QOpenGLFramebufferObject::~QOpenGLFramebufferObject -24 (int (*)(...))QOpenGLFramebufferObject::~QOpenGLFramebufferObject - -Class QOpenGLFramebufferObject - size=16 align=8 - base size=16 base align=8 -QOpenGLFramebufferObject (0x0x7f64e5dd7420) 0 - vptr=((& QOpenGLFramebufferObject::_ZTV24QOpenGLFramebufferObject) + 16u) - -Class QOpenGLFramebufferObjectFormat - size=8 align=8 - base size=8 base align=8 -QOpenGLFramebufferObjectFormat (0x0x7f64e5dd7540) 0 - -Vtable for QOpenGLPaintDevice -QOpenGLPaintDevice::_ZTV18QOpenGLPaintDevice: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QOpenGLPaintDevice) -16 (int (*)(...))QOpenGLPaintDevice::~QOpenGLPaintDevice -24 (int (*)(...))QOpenGLPaintDevice::~QOpenGLPaintDevice -32 (int (*)(...))QOpenGLPaintDevice::devType -40 (int (*)(...))QOpenGLPaintDevice::paintEngine -48 (int (*)(...))QOpenGLPaintDevice::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter -80 (int (*)(...))QOpenGLPaintDevice::ensureActiveTarget - -Class QOpenGLPaintDevice - size=32 align=8 - base size=32 base align=8 -QOpenGLPaintDevice (0x0x7f64e650ae38) 0 - vptr=((& QOpenGLPaintDevice::_ZTV18QOpenGLPaintDevice) + 16u) - QPaintDevice (0x0x7f64e5dd75a0) 0 - primary-for QOpenGLPaintDevice (0x0x7f64e650ae38) - -Class QOpenGLPixelTransferOptions - size=8 align=8 - base size=8 base align=8 -QOpenGLPixelTransferOptions (0x0x7f64e5dd76c0) 0 - -Class QOpenGLShader::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLShader::QPrivateSignal (0x0x7f64e5dd7a20) 0 empty - -Vtable for QOpenGLShader -QOpenGLShader::_ZTV13QOpenGLShader: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QOpenGLShader) -16 (int (*)(...))QOpenGLShader::metaObject -24 (int (*)(...))QOpenGLShader::qt_metacast -32 (int (*)(...))QOpenGLShader::qt_metacall -40 (int (*)(...))QOpenGLShader::~QOpenGLShader -48 (int (*)(...))QOpenGLShader::~QOpenGLShader -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLShader - size=16 align=8 - base size=16 base align=8 -QOpenGLShader (0x0x7f64e5e41068) 0 - vptr=((& QOpenGLShader::_ZTV13QOpenGLShader) + 16u) - QObject (0x0x7f64e5dd79c0) 0 - primary-for QOpenGLShader (0x0x7f64e5e41068) - -Class QOpenGLShaderProgram::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLShaderProgram::QPrivateSignal (0x0x7f64e5dd7c60) 0 empty - -Vtable for QOpenGLShaderProgram -QOpenGLShaderProgram::_ZTV20QOpenGLShaderProgram: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QOpenGLShaderProgram) -16 (int (*)(...))QOpenGLShaderProgram::metaObject -24 (int (*)(...))QOpenGLShaderProgram::qt_metacast -32 (int (*)(...))QOpenGLShaderProgram::qt_metacall -40 (int (*)(...))QOpenGLShaderProgram::~QOpenGLShaderProgram -48 (int (*)(...))QOpenGLShaderProgram::~QOpenGLShaderProgram -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QOpenGLShaderProgram::link - -Class QOpenGLShaderProgram - size=16 align=8 - base size=16 base align=8 -QOpenGLShaderProgram (0x0x7f64e5e411a0) 0 - vptr=((& QOpenGLShaderProgram::_ZTV20QOpenGLShaderProgram) + 16u) - QObject (0x0x7f64e5dd7c00) 0 - primary-for QOpenGLShaderProgram (0x0x7f64e5e411a0) - -Class QOpenGLTexture - size=8 align=8 - base size=8 base align=8 -QOpenGLTexture (0x0x7f64e5dd7cc0) 0 - -Class QOpenGLTextureBlitter - size=8 align=8 - base size=8 base align=8 -QOpenGLTextureBlitter (0x0x7f64e5dd7f60) 0 - -Class QOpenGLTimerQuery::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLTimerQuery::QPrivateSignal (0x0x7f64e5b81120) 0 empty - -Vtable for QOpenGLTimerQuery -QOpenGLTimerQuery::_ZTV17QOpenGLTimerQuery: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QOpenGLTimerQuery) -16 (int (*)(...))QOpenGLTimerQuery::metaObject -24 (int (*)(...))QOpenGLTimerQuery::qt_metacast -32 (int (*)(...))QOpenGLTimerQuery::qt_metacall -40 (int (*)(...))QOpenGLTimerQuery::~QOpenGLTimerQuery -48 (int (*)(...))QOpenGLTimerQuery::~QOpenGLTimerQuery -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLTimerQuery - size=16 align=8 - base size=16 base align=8 -QOpenGLTimerQuery (0x0x7f64e5e412d8) 0 - vptr=((& QOpenGLTimerQuery::_ZTV17QOpenGLTimerQuery) + 16u) - QObject (0x0x7f64e5b810c0) 0 - primary-for QOpenGLTimerQuery (0x0x7f64e5e412d8) - -Class QOpenGLTimeMonitor::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLTimeMonitor::QPrivateSignal (0x0x7f64e5b811e0) 0 empty - -Vtable for QOpenGLTimeMonitor -QOpenGLTimeMonitor::_ZTV18QOpenGLTimeMonitor: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QOpenGLTimeMonitor) -16 (int (*)(...))QOpenGLTimeMonitor::metaObject -24 (int (*)(...))QOpenGLTimeMonitor::qt_metacast -32 (int (*)(...))QOpenGLTimeMonitor::qt_metacall -40 (int (*)(...))QOpenGLTimeMonitor::~QOpenGLTimeMonitor -48 (int (*)(...))QOpenGLTimeMonitor::~QOpenGLTimeMonitor -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLTimeMonitor - size=16 align=8 - base size=16 base align=8 -QOpenGLTimeMonitor (0x0x7f64e5e41340) 0 - vptr=((& QOpenGLTimeMonitor::_ZTV18QOpenGLTimeMonitor) + 16u) - QObject (0x0x7f64e5b81180) 0 - primary-for QOpenGLTimeMonitor (0x0x7f64e5e41340) - -Class QOpenGLVertexArrayObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLVertexArrayObject::QPrivateSignal (0x0x7f64e5b812a0) 0 empty - -Class QOpenGLVertexArrayObject::Binder - size=8 align=8 - base size=8 base align=8 -QOpenGLVertexArrayObject::Binder (0x0x7f64e5b81300) 0 - -Vtable for QOpenGLVertexArrayObject -QOpenGLVertexArrayObject::_ZTV24QOpenGLVertexArrayObject: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QOpenGLVertexArrayObject) -16 (int (*)(...))QOpenGLVertexArrayObject::metaObject -24 (int (*)(...))QOpenGLVertexArrayObject::qt_metacast -32 (int (*)(...))QOpenGLVertexArrayObject::qt_metacall -40 (int (*)(...))QOpenGLVertexArrayObject::~QOpenGLVertexArrayObject -48 (int (*)(...))QOpenGLVertexArrayObject::~QOpenGLVertexArrayObject -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLVertexArrayObject - size=16 align=8 - base size=16 base align=8 -QOpenGLVertexArrayObject (0x0x7f64e5e413a8) 0 - vptr=((& QOpenGLVertexArrayObject::_ZTV24QOpenGLVertexArrayObject) + 16u) - QObject (0x0x7f64e5b81240) 0 - primary-for QOpenGLVertexArrayObject (0x0x7f64e5e413a8) - -Class QPaintDeviceWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPaintDeviceWindow::QPrivateSignal (0x0x7f64e5b81480) 0 empty - -Vtable for QPaintDeviceWindow -QPaintDeviceWindow::_ZTV18QPaintDeviceWindow: 58u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QPaintDeviceWindow) -16 (int (*)(...))QPaintDeviceWindow::metaObject -24 (int (*)(...))QPaintDeviceWindow::qt_metacast -32 (int (*)(...))QPaintDeviceWindow::qt_metacall -40 (int (*)(...))QPaintDeviceWindow::~QPaintDeviceWindow -48 (int (*)(...))QPaintDeviceWindow::~QPaintDeviceWindow -56 (int (*)(...))QPaintDeviceWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QPaintDeviceWindow::exposeEvent -160 (int (*)(...))QWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))QPaintDeviceWindow::paintEvent -304 (int (*)(...))QPaintDeviceWindow::metric -312 (int (*)(...))QPaintDeviceWindow::paintEngine -320 (int (*)(...))-16 -328 (int (*)(...))(& _ZTI18QPaintDeviceWindow) -336 (int (*)(...))QPaintDeviceWindow::_ZThn16_N18QPaintDeviceWindowD1Ev -344 (int (*)(...))QPaintDeviceWindow::_ZThn16_N18QPaintDeviceWindowD0Ev -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -360 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -368 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -376 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv -384 (int (*)(...))-40 -392 (int (*)(...))(& _ZTI18QPaintDeviceWindow) -400 (int (*)(...))QPaintDeviceWindow::_ZThn40_N18QPaintDeviceWindowD1Ev -408 (int (*)(...))QPaintDeviceWindow::_ZThn40_N18QPaintDeviceWindowD0Ev -416 (int (*)(...))QPaintDevice::devType -424 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow11paintEngineEv -432 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow6metricEN12QPaintDevice17PaintDeviceMetricE -440 (int (*)(...))QPaintDevice::initPainter -448 (int (*)(...))QPaintDevice::redirected -456 (int (*)(...))QPaintDevice::sharedPainter - -Class QPaintDeviceWindow - size=64 align=8 - base size=64 base align=8 -QPaintDeviceWindow (0x0x7f64e5baabd0) 0 - vptr=((& QPaintDeviceWindow::_ZTV18QPaintDeviceWindow) + 16u) - QWindow (0x0x7f64e5baac40) 0 - primary-for QPaintDeviceWindow (0x0x7f64e5baabd0) - QObject (0x0x7f64e5b81360) 0 - primary-for QWindow (0x0x7f64e5baac40) - QSurface (0x0x7f64e5b813c0) 16 - vptr=((& QPaintDeviceWindow::_ZTV18QPaintDeviceWindow) + 336u) - QPaintDevice (0x0x7f64e5b81420) 40 - vptr=((& QPaintDeviceWindow::_ZTV18QPaintDeviceWindow) + 400u) - -Class QOpenGLWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLWindow::QPrivateSignal (0x0x7f64e5b81600) 0 empty - -Vtable for QOpenGLWindow -QOpenGLWindow::_ZTV13QOpenGLWindow: 64u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QOpenGLWindow) -16 (int (*)(...))QOpenGLWindow::metaObject -24 (int (*)(...))QOpenGLWindow::qt_metacast -32 (int (*)(...))QOpenGLWindow::qt_metacall -40 (int (*)(...))QOpenGLWindow::~QOpenGLWindow -48 (int (*)(...))QOpenGLWindow::~QOpenGLWindow -56 (int (*)(...))QPaintDeviceWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QPaintDeviceWindow::exposeEvent -160 (int (*)(...))QOpenGLWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))QOpenGLWindow::paintEvent -304 (int (*)(...))QOpenGLWindow::metric -312 (int (*)(...))QPaintDeviceWindow::paintEngine -320 (int (*)(...))QOpenGLWindow::initializeGL -328 (int (*)(...))QOpenGLWindow::resizeGL -336 (int (*)(...))QOpenGLWindow::paintGL -344 (int (*)(...))QOpenGLWindow::paintUnderGL -352 (int (*)(...))QOpenGLWindow::paintOverGL -360 (int (*)(...))QOpenGLWindow::redirected -368 (int (*)(...))-16 -376 (int (*)(...))(& _ZTI13QOpenGLWindow) -384 (int (*)(...))QOpenGLWindow::_ZThn16_N13QOpenGLWindowD1Ev -392 (int (*)(...))QOpenGLWindow::_ZThn16_N13QOpenGLWindowD0Ev -400 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -408 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -416 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -424 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv -432 (int (*)(...))-40 -440 (int (*)(...))(& _ZTI13QOpenGLWindow) -448 (int (*)(...))QOpenGLWindow::_ZThn40_N13QOpenGLWindowD1Ev -456 (int (*)(...))QOpenGLWindow::_ZThn40_N13QOpenGLWindowD0Ev -464 (int (*)(...))QPaintDevice::devType -472 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow11paintEngineEv -480 (int (*)(...))QOpenGLWindow::_ZThn40_NK13QOpenGLWindow6metricEN12QPaintDevice17PaintDeviceMetricE -488 (int (*)(...))QPaintDevice::initPainter -496 (int (*)(...))QOpenGLWindow::_ZThn40_NK13QOpenGLWindow10redirectedEP6QPoint -504 (int (*)(...))QPaintDevice::sharedPainter - -Class QOpenGLWindow - size=64 align=8 - base size=64 base align=8 -QOpenGLWindow (0x0x7f64e5e41478) 0 - vptr=((& QOpenGLWindow::_ZTV13QOpenGLWindow) + 16u) - QPaintDeviceWindow (0x0x7f64e5bd5000) 0 - primary-for QOpenGLWindow (0x0x7f64e5e41478) - QWindow (0x0x7f64e5bd5070) 0 - primary-for QPaintDeviceWindow (0x0x7f64e5bd5000) - QObject (0x0x7f64e5b814e0) 0 - primary-for QWindow (0x0x7f64e5bd5070) - QSurface (0x0x7f64e5b81540) 16 - vptr=((& QOpenGLWindow::_ZTV13QOpenGLWindow) + 384u) - QPaintDevice (0x0x7f64e5b815a0) 40 - vptr=((& QOpenGLWindow::_ZTV13QOpenGLWindow) + 448u) - -Class QPageSize - size=8 align=8 - base size=8 base align=8 -QPageSize (0x0x7f64e5b81660) 0 - -Class QPageLayout - size=8 align=8 - base size=8 base align=8 -QPageLayout (0x0x7f64e5c40060) 0 - -Class QPagedPaintDevice::Margins - size=32 align=8 - base size=32 base align=8 -QPagedPaintDevice::Margins (0x0x7f64e5c40a80) 0 - -Vtable for QPagedPaintDevice -QPagedPaintDevice::_ZTV17QPagedPaintDevice: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QPagedPaintDevice) -16 0u -24 0u -32 (int (*)(...))QPaintDevice::devType -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QPaintDevice::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))QPagedPaintDevice::setPageSize -96 (int (*)(...))QPagedPaintDevice::setPageSizeMM -104 (int (*)(...))QPagedPaintDevice::setMargins - -Class QPagedPaintDevice - size=32 align=8 - base size=32 base align=8 -QPagedPaintDevice (0x0x7f64e5c701a0) 0 - vptr=((& QPagedPaintDevice::_ZTV17QPagedPaintDevice) + 16u) - QPaintDevice (0x0x7f64e5c40a20) 0 - primary-for QPagedPaintDevice (0x0x7f64e5c701a0) - -Class QPainter::PixmapFragment - size=80 align=8 - base size=80 base align=8 -QPainter::PixmapFragment (0x0x7f64e5c40b40) 0 - -Class QPainter - size=8 align=8 - base size=8 base align=8 -QPainter (0x0x7f64e5c40ae0) 0 - -Class QTextItem - size=1 align=1 - base size=0 base align=1 -QTextItem (0x0x7f64e5942960) 0 empty - -Vtable for QPaintEngine -QPaintEngine::_ZTV12QPaintEngine: 24u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QPaintEngine) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))QPaintEngine::drawRects -64 (int (*)(...))QPaintEngine::drawRects -72 (int (*)(...))QPaintEngine::drawLines -80 (int (*)(...))QPaintEngine::drawLines -88 (int (*)(...))QPaintEngine::drawEllipse -96 (int (*)(...))QPaintEngine::drawEllipse -104 (int (*)(...))QPaintEngine::drawPath -112 (int (*)(...))QPaintEngine::drawPoints -120 (int (*)(...))QPaintEngine::drawPoints -128 (int (*)(...))QPaintEngine::drawPolygon -136 (int (*)(...))QPaintEngine::drawPolygon -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QPaintEngine::drawTextItem -160 (int (*)(...))QPaintEngine::drawTiledPixmap -168 (int (*)(...))QPaintEngine::drawImage -176 (int (*)(...))QPaintEngine::coordinateOffset -184 (int (*)(...))__cxa_pure_virtual - -Class QPaintEngine - size=32 align=8 - base size=32 base align=8 -QPaintEngine (0x0x7f64e5942c00) 0 - vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 16u) - -Class QPaintEngineState - size=4 align=4 - base size=4 base align=4 -QPaintEngineState (0x0x7f64e5942ea0) 0 - -Class QPdfWriter::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPdfWriter::QPrivateSignal (0x0x7f64e5af6300) 0 empty - -Vtable for QPdfWriter -QPdfWriter::_ZTV10QPdfWriter: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QPdfWriter) -16 (int (*)(...))QPdfWriter::metaObject -24 (int (*)(...))QPdfWriter::qt_metacast -32 (int (*)(...))QPdfWriter::qt_metacall -40 (int (*)(...))QPdfWriter::~QPdfWriter -48 (int (*)(...))QPdfWriter::~QPdfWriter -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QPdfWriter::newPage -120 (int (*)(...))QPdfWriter::setPageSize -128 (int (*)(...))QPdfWriter::setPageSizeMM -136 (int (*)(...))QPdfWriter::setMargins -144 (int (*)(...))QPdfWriter::paintEngine -152 (int (*)(...))QPdfWriter::metric -160 (int (*)(...))-16 -168 (int (*)(...))(& _ZTI10QPdfWriter) -176 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriterD1Ev -184 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriterD0Ev -192 (int (*)(...))QPaintDevice::devType -200 (int (*)(...))QPdfWriter::_ZThn16_NK10QPdfWriter11paintEngineEv -208 (int (*)(...))QPdfWriter::_ZThn16_NK10QPdfWriter6metricEN12QPaintDevice17PaintDeviceMetricE -216 (int (*)(...))QPaintDevice::initPainter -224 (int (*)(...))QPaintDevice::redirected -232 (int (*)(...))QPaintDevice::sharedPainter -240 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter7newPageEv -248 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter11setPageSizeEN17QPagedPaintDevice8PageSizeE -256 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter13setPageSizeMMERK6QSizeF -264 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter10setMarginsERKN17QPagedPaintDevice7MarginsE - -Class QPdfWriter - size=48 align=8 - base size=48 base align=8 -QPdfWriter (0x0x7f64e57544d0) 0 - vptr=((& QPdfWriter::_ZTV10QPdfWriter) + 16u) - QObject (0x0x7f64e5af6240) 0 - primary-for QPdfWriter (0x0x7f64e57544d0) - QPagedPaintDevice (0x0x7f64e5abc208) 16 - vptr=((& QPdfWriter::_ZTV10QPdfWriter) + 176u) - QPaintDevice (0x0x7f64e5af62a0) 16 - primary-for QPagedPaintDevice (0x0x7f64e5abc208) - -Vtable for QPicture -QPicture::_ZTV8QPicture: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QPicture) -16 (int (*)(...))QPicture::~QPicture -24 (int (*)(...))QPicture::~QPicture -32 (int (*)(...))QPicture::devType -40 (int (*)(...))QPicture::paintEngine -48 (int (*)(...))QPicture::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter -80 (int (*)(...))QPicture::setData - -Class QPicture - size=32 align=8 - base size=32 base align=8 -QPicture (0x0x7f64e5abc270) 0 - vptr=((& QPicture::_ZTV8QPicture) + 16u) - QPaintDevice (0x0x7f64e5af6480) 0 - primary-for QPicture (0x0x7f64e5abc270) - -Class QPictureIO - size=8 align=8 - base size=8 base align=8 -QPictureIO (0x0x7f64e5af6780) 0 - -Class QPictureFormatPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPictureFormatPlugin::QPrivateSignal (0x0x7f64e5af6840) 0 empty - -Vtable for QPictureFormatPlugin -QPictureFormatPlugin::_ZTV20QPictureFormatPlugin: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QPictureFormatPlugin) -16 (int (*)(...))QPictureFormatPlugin::metaObject -24 (int (*)(...))QPictureFormatPlugin::qt_metacast -32 (int (*)(...))QPictureFormatPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QPictureFormatPlugin::loadPicture -120 (int (*)(...))QPictureFormatPlugin::savePicture -128 (int (*)(...))__cxa_pure_virtual - -Class QPictureFormatPlugin - size=16 align=8 - base size=16 base align=8 -QPictureFormatPlugin (0x0x7f64e5abc478) 0 - vptr=((& QPictureFormatPlugin::_ZTV20QPictureFormatPlugin) + 16u) - QObject (0x0x7f64e5af67e0) 0 - primary-for QPictureFormatPlugin (0x0x7f64e5abc478) - -Class QPixmapCache::Key - size=8 align=8 - base size=8 base align=8 -QPixmapCache::Key (0x0x7f64e5af6900) 0 - -Class QPixmapCache - size=1 align=1 - base size=0 base align=1 -QPixmapCache (0x0x7f64e5af68a0) 0 empty - -Class QRasterWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QRasterWindow::QPrivateSignal (0x0x7f64e583ca80) 0 empty - -Vtable for QRasterWindow -QRasterWindow::_ZTV13QRasterWindow: 59u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QRasterWindow) -16 (int (*)(...))QRasterWindow::metaObject -24 (int (*)(...))QRasterWindow::qt_metacast -32 (int (*)(...))QRasterWindow::qt_metacall -40 (int (*)(...))QRasterWindow::~QRasterWindow -48 (int (*)(...))QRasterWindow::~QRasterWindow -56 (int (*)(...))QPaintDeviceWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QPaintDeviceWindow::exposeEvent -160 (int (*)(...))QWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))QPaintDeviceWindow::paintEvent -304 (int (*)(...))QRasterWindow::metric -312 (int (*)(...))QPaintDeviceWindow::paintEngine -320 (int (*)(...))QRasterWindow::redirected -328 (int (*)(...))-16 -336 (int (*)(...))(& _ZTI13QRasterWindow) -344 (int (*)(...))QRasterWindow::_ZThn16_N13QRasterWindowD1Ev -352 (int (*)(...))QRasterWindow::_ZThn16_N13QRasterWindowD0Ev -360 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -368 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -376 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -384 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv -392 (int (*)(...))-40 -400 (int (*)(...))(& _ZTI13QRasterWindow) -408 (int (*)(...))QRasterWindow::_ZThn40_N13QRasterWindowD1Ev -416 (int (*)(...))QRasterWindow::_ZThn40_N13QRasterWindowD0Ev -424 (int (*)(...))QPaintDevice::devType -432 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow11paintEngineEv -440 (int (*)(...))QRasterWindow::_ZThn40_NK13QRasterWindow6metricEN12QPaintDevice17PaintDeviceMetricE -448 (int (*)(...))QPaintDevice::initPainter -456 (int (*)(...))QRasterWindow::_ZThn40_NK13QRasterWindow10redirectedEP6QPoint -464 (int (*)(...))QPaintDevice::sharedPainter - -Class QRasterWindow - size=64 align=8 - base size=64 base align=8 -QRasterWindow (0x0x7f64e583db60) 0 - vptr=((& QRasterWindow::_ZTV13QRasterWindow) + 16u) - QPaintDeviceWindow (0x0x7f64e584b2a0) 0 - primary-for QRasterWindow (0x0x7f64e583db60) - QWindow (0x0x7f64e584b310) 0 - primary-for QPaintDeviceWindow (0x0x7f64e584b2a0) - QObject (0x0x7f64e583c960) 0 - primary-for QWindow (0x0x7f64e584b310) - QSurface (0x0x7f64e583c9c0) 16 - vptr=((& QRasterWindow::_ZTV13QRasterWindow) + 344u) - QPaintDevice (0x0x7f64e583ca20) 40 - vptr=((& QRasterWindow::_ZTV13QRasterWindow) + 408u) - -Class QScreen::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QScreen::QPrivateSignal (0x0x7f64e583cb40) 0 empty - -Vtable for QScreen -QScreen::_ZTV7QScreen: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QScreen) -16 (int (*)(...))QScreen::metaObject -24 (int (*)(...))QScreen::qt_metacast -32 (int (*)(...))QScreen::qt_metacall -40 (int (*)(...))QScreen::~QScreen -48 (int (*)(...))QScreen::~QScreen -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QScreen - size=16 align=8 - base size=16 base align=8 -QScreen (0x0x7f64e583dc30) 0 - vptr=((& QScreen::_ZTV7QScreen) + 16u) - QObject (0x0x7f64e583cae0) 0 - primary-for QScreen (0x0x7f64e583dc30) - -Class QSessionManager::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSessionManager::QPrivateSignal (0x0x7f64e583cc00) 0 empty - -Vtable for QSessionManager -QSessionManager::_ZTV15QSessionManager: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QSessionManager) -16 (int (*)(...))QSessionManager::metaObject -24 (int (*)(...))QSessionManager::qt_metacast -32 (int (*)(...))QSessionManager::qt_metacall -40 (int (*)(...))QSessionManager::~QSessionManager -48 (int (*)(...))QSessionManager::~QSessionManager -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSessionManager - size=16 align=8 - base size=16 base align=8 -QSessionManager (0x0x7f64e583dc98) 0 - vptr=((& QSessionManager::_ZTV15QSessionManager) + 16u) - QObject (0x0x7f64e583cba0) 0 - primary-for QSessionManager (0x0x7f64e583dc98) - -Vtable for QStandardItem -QStandardItem::_ZTV13QStandardItem: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QStandardItem) -16 (int (*)(...))QStandardItem::~QStandardItem -24 (int (*)(...))QStandardItem::~QStandardItem -32 (int (*)(...))QStandardItem::data -40 (int (*)(...))QStandardItem::setData -48 (int (*)(...))QStandardItem::clone -56 (int (*)(...))QStandardItem::type -64 (int (*)(...))QStandardItem::read -72 (int (*)(...))QStandardItem::write -80 (int (*)(...))QStandardItem::operator< - -Class QStandardItem - size=16 align=8 - base size=16 base align=8 -QStandardItem (0x0x7f64e583cc60) 0 - vptr=((& QStandardItem::_ZTV13QStandardItem) + 16u) - -Class QStandardItemModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStandardItemModel::QPrivateSignal (0x0x7f64e58d63c0) 0 empty - -Vtable for QStandardItemModel -QStandardItemModel::_ZTV18QStandardItemModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QStandardItemModel) -16 (int (*)(...))QStandardItemModel::metaObject -24 (int (*)(...))QStandardItemModel::qt_metacast -32 (int (*)(...))QStandardItemModel::qt_metacall -40 (int (*)(...))QStandardItemModel::~QStandardItemModel -48 (int (*)(...))QStandardItemModel::~QStandardItemModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QStandardItemModel::index -120 (int (*)(...))QStandardItemModel::parent -128 (int (*)(...))QStandardItemModel::sibling -136 (int (*)(...))QStandardItemModel::rowCount -144 (int (*)(...))QStandardItemModel::columnCount -152 (int (*)(...))QStandardItemModel::hasChildren -160 (int (*)(...))QStandardItemModel::data -168 (int (*)(...))QStandardItemModel::setData -176 (int (*)(...))QStandardItemModel::headerData -184 (int (*)(...))QStandardItemModel::setHeaderData -192 (int (*)(...))QStandardItemModel::itemData -200 (int (*)(...))QStandardItemModel::setItemData -208 (int (*)(...))QStandardItemModel::mimeTypes -216 (int (*)(...))QStandardItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QStandardItemModel::dropMimeData -240 (int (*)(...))QStandardItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QStandardItemModel::insertRows -264 (int (*)(...))QStandardItemModel::insertColumns -272 (int (*)(...))QStandardItemModel::removeRows -280 (int (*)(...))QStandardItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QStandardItemModel::flags -328 (int (*)(...))QStandardItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QStandardItemModel - size=16 align=8 - base size=16 base align=8 -QStandardItemModel (0x0x7f64e58d8340) 0 - vptr=((& QStandardItemModel::_ZTV18QStandardItemModel) + 16u) - QAbstractItemModel (0x0x7f64e58d83a8) 0 - primary-for QStandardItemModel (0x0x7f64e58d8340) - QObject (0x0x7f64e58d6360) 0 - primary-for QAbstractItemModel (0x0x7f64e58d83a8) - -Class QStaticText - size=8 align=8 - base size=8 base align=8 -QStaticText (0x0x7f64e58d6420) 0 - -Class QStyleHints::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStyleHints::QPrivateSignal (0x0x7f64e58d68a0) 0 empty - -Vtable for QStyleHints -QStyleHints::_ZTV11QStyleHints: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QStyleHints) -16 (int (*)(...))QStyleHints::metaObject -24 (int (*)(...))QStyleHints::qt_metacast -32 (int (*)(...))QStyleHints::qt_metacall -40 (int (*)(...))QStyleHints::~QStyleHints -48 (int (*)(...))QStyleHints::~QStyleHints -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QStyleHints - size=16 align=8 - base size=16 base align=8 -QStyleHints (0x0x7f64e58d85b0) 0 - vptr=((& QStyleHints::_ZTV11QStyleHints) + 16u) - QObject (0x0x7f64e58d6840) 0 - primary-for QStyleHints (0x0x7f64e58d85b0) - -Class QTextObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextObject::QPrivateSignal (0x0x7f64e58d6960) 0 empty - -Vtable for QTextObject -QTextObject::_ZTV11QTextObject: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTextObject) -16 (int (*)(...))QTextObject::metaObject -24 (int (*)(...))QTextObject::qt_metacast -32 (int (*)(...))QTextObject::qt_metacall -40 (int (*)(...))QTextObject::~QTextObject -48 (int (*)(...))QTextObject::~QTextObject -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTextObject - size=16 align=8 - base size=16 base align=8 -QTextObject (0x0x7f64e58d8618) 0 - vptr=((& QTextObject::_ZTV11QTextObject) + 16u) - QObject (0x0x7f64e58d6900) 0 - primary-for QTextObject (0x0x7f64e58d8618) - -Class QTextBlockGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextBlockGroup::QPrivateSignal (0x0x7f64e58d6a20) 0 empty - -Vtable for QTextBlockGroup -QTextBlockGroup::_ZTV15QTextBlockGroup: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QTextBlockGroup) -16 (int (*)(...))QTextBlockGroup::metaObject -24 (int (*)(...))QTextBlockGroup::qt_metacast -32 (int (*)(...))QTextBlockGroup::qt_metacall -40 (int (*)(...))QTextBlockGroup::~QTextBlockGroup -48 (int (*)(...))QTextBlockGroup::~QTextBlockGroup -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTextBlockGroup::blockInserted -120 (int (*)(...))QTextBlockGroup::blockRemoved -128 (int (*)(...))QTextBlockGroup::blockFormatChanged - -Class QTextBlockGroup - size=16 align=8 - base size=16 base align=8 -QTextBlockGroup (0x0x7f64e58d8680) 0 - vptr=((& QTextBlockGroup::_ZTV15QTextBlockGroup) + 16u) - QTextObject (0x0x7f64e58d86e8) 0 - primary-for QTextBlockGroup (0x0x7f64e58d8680) - QObject (0x0x7f64e58d69c0) 0 - primary-for QTextObject (0x0x7f64e58d86e8) - -Vtable for QTextFrameLayoutData -QTextFrameLayoutData::_ZTV20QTextFrameLayoutData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QTextFrameLayoutData) -16 (int (*)(...))QTextFrameLayoutData::~QTextFrameLayoutData -24 (int (*)(...))QTextFrameLayoutData::~QTextFrameLayoutData - -Class QTextFrameLayoutData - size=8 align=8 - base size=8 base align=8 -QTextFrameLayoutData (0x0x7f64e58d6a80) 0 nearly-empty - vptr=((& QTextFrameLayoutData::_ZTV20QTextFrameLayoutData) + 16u) - -Class QTextFrame::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextFrame::QPrivateSignal (0x0x7f64e58d6b40) 0 empty - -Class QTextFrame::iterator - size=32 align=8 - base size=28 base align=8 -QTextFrame::iterator (0x0x7f64e58d6ba0) 0 - -Vtable for QTextFrame -QTextFrame::_ZTV10QTextFrame: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTextFrame) -16 (int (*)(...))QTextFrame::metaObject -24 (int (*)(...))QTextFrame::qt_metacast -32 (int (*)(...))QTextFrame::qt_metacall -40 (int (*)(...))QTextFrame::~QTextFrame -48 (int (*)(...))QTextFrame::~QTextFrame -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTextFrame - size=16 align=8 - base size=16 base align=8 -QTextFrame (0x0x7f64e58d8750) 0 - vptr=((& QTextFrame::_ZTV10QTextFrame) + 16u) - QTextObject (0x0x7f64e58d87b8) 0 - primary-for QTextFrame (0x0x7f64e58d8750) - QObject (0x0x7f64e58d6ae0) 0 - primary-for QTextObject (0x0x7f64e58d87b8) - -Vtable for QTextBlockUserData -QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QTextBlockUserData) -16 (int (*)(...))QTextBlockUserData::~QTextBlockUserData -24 (int (*)(...))QTextBlockUserData::~QTextBlockUserData - -Class QTextBlockUserData - size=8 align=8 - base size=8 base align=8 -QTextBlockUserData (0x0x7f64e58d6e40) 0 nearly-empty - vptr=((& QTextBlockUserData::_ZTV18QTextBlockUserData) + 16u) - -Class QTextBlock::iterator - size=24 align=8 - base size=20 base align=8 -QTextBlock::iterator (0x0x7f64e58d6f00) 0 - -Class QTextBlock - size=16 align=8 - base size=12 base align=8 -QTextBlock (0x0x7f64e58d6ea0) 0 - -Class QTextFragment - size=16 align=8 - base size=16 base align=8 -QTextFragment (0x0x7f64e5645420) 0 - -Class QSyntaxHighlighter::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSyntaxHighlighter::QPrivateSignal (0x0x7f64e5645720) 0 empty - -Vtable for QSyntaxHighlighter -QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QSyntaxHighlighter) -16 (int (*)(...))QSyntaxHighlighter::metaObject -24 (int (*)(...))QSyntaxHighlighter::qt_metacast -32 (int (*)(...))QSyntaxHighlighter::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QSyntaxHighlighter - size=16 align=8 - base size=16 base align=8 -QSyntaxHighlighter (0x0x7f64e58d8ea0) 0 - vptr=((& QSyntaxHighlighter::_ZTV18QSyntaxHighlighter) + 16u) - QObject (0x0x7f64e56456c0) 0 - primary-for QSyntaxHighlighter (0x0x7f64e58d8ea0) - -Class QTextDocumentFragment - size=8 align=8 - base size=8 base align=8 -QTextDocumentFragment (0x0x7f64e5645780) 0 - -Class QTextDocumentWriter - size=8 align=8 - base size=8 base align=8 -QTextDocumentWriter (0x0x7f64e56457e0) 0 - -Class QTextList::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextList::QPrivateSignal (0x0x7f64e56458a0) 0 empty - -Vtable for QTextList -QTextList::_ZTV9QTextList: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QTextList) -16 (int (*)(...))QTextList::metaObject -24 (int (*)(...))QTextList::qt_metacast -32 (int (*)(...))QTextList::qt_metacall -40 (int (*)(...))QTextList::~QTextList -48 (int (*)(...))QTextList::~QTextList -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTextBlockGroup::blockInserted -120 (int (*)(...))QTextBlockGroup::blockRemoved -128 (int (*)(...))QTextBlockGroup::blockFormatChanged - -Class QTextList - size=16 align=8 - base size=16 base align=8 -QTextList (0x0x7f64e58d8f08) 0 - vptr=((& QTextList::_ZTV9QTextList) + 16u) - QTextBlockGroup (0x0x7f64e58d8f70) 0 - primary-for QTextList (0x0x7f64e58d8f08) - QTextObject (0x0x7f64e5686000) 0 - primary-for QTextBlockGroup (0x0x7f64e58d8f70) - QObject (0x0x7f64e5645840) 0 - primary-for QTextObject (0x0x7f64e5686000) - -Class QTextTableCell - size=16 align=8 - base size=12 base align=8 -QTextTableCell (0x0x7f64e5645900) 0 - -Class QTextTable::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextTable::QPrivateSignal (0x0x7f64e56459c0) 0 empty - -Vtable for QTextTable -QTextTable::_ZTV10QTextTable: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTextTable) -16 (int (*)(...))QTextTable::metaObject -24 (int (*)(...))QTextTable::qt_metacast -32 (int (*)(...))QTextTable::qt_metacall -40 (int (*)(...))QTextTable::~QTextTable -48 (int (*)(...))QTextTable::~QTextTable -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTextTable - size=16 align=8 - base size=16 base align=8 -QTextTable (0x0x7f64e5686068) 0 - vptr=((& QTextTable::_ZTV10QTextTable) + 16u) - QTextFrame (0x0x7f64e56860d0) 0 - primary-for QTextTable (0x0x7f64e5686068) - QTextObject (0x0x7f64e5686138) 0 - primary-for QTextFrame (0x0x7f64e56860d0) - QObject (0x0x7f64e5645960) 0 - primary-for QTextObject (0x0x7f64e5686138) - -Class QValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QValidator::QPrivateSignal (0x0x7f64e5645a80) 0 empty - -Vtable for QValidator -QValidator::_ZTV10QValidator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QValidator) -16 (int (*)(...))QValidator::metaObject -24 (int (*)(...))QValidator::qt_metacast -32 (int (*)(...))QValidator::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QValidator::fixup - -Class QValidator - size=16 align=8 - base size=16 base align=8 -QValidator (0x0x7f64e56861a0) 0 - vptr=((& QValidator::_ZTV10QValidator) + 16u) - QObject (0x0x7f64e5645a20) 0 - primary-for QValidator (0x0x7f64e56861a0) - -Class QIntValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIntValidator::QPrivateSignal (0x0x7f64e5645b40) 0 empty - -Vtable for QIntValidator -QIntValidator::_ZTV13QIntValidator: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QIntValidator) -16 (int (*)(...))QIntValidator::metaObject -24 (int (*)(...))QIntValidator::qt_metacast -32 (int (*)(...))QIntValidator::qt_metacall -40 (int (*)(...))QIntValidator::~QIntValidator -48 (int (*)(...))QIntValidator::~QIntValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QIntValidator::validate -120 (int (*)(...))QIntValidator::fixup -128 (int (*)(...))QIntValidator::setRange - -Class QIntValidator - size=24 align=8 - base size=24 base align=8 -QIntValidator (0x0x7f64e5686208) 0 - vptr=((& QIntValidator::_ZTV13QIntValidator) + 16u) - QValidator (0x0x7f64e5686270) 0 - primary-for QIntValidator (0x0x7f64e5686208) - QObject (0x0x7f64e5645ae0) 0 - primary-for QValidator (0x0x7f64e5686270) - -Class QDoubleValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QDoubleValidator::QPrivateSignal (0x0x7f64e5645c00) 0 empty - -Vtable for QDoubleValidator -QDoubleValidator::_ZTV16QDoubleValidator: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QDoubleValidator) -16 (int (*)(...))QDoubleValidator::metaObject -24 (int (*)(...))QDoubleValidator::qt_metacast -32 (int (*)(...))QDoubleValidator::qt_metacall -40 (int (*)(...))QDoubleValidator::~QDoubleValidator -48 (int (*)(...))QDoubleValidator::~QDoubleValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QDoubleValidator::validate -120 (int (*)(...))QValidator::fixup -128 (int (*)(...))QDoubleValidator::setRange - -Class QDoubleValidator - size=40 align=8 - base size=36 base align=8 -QDoubleValidator (0x0x7f64e56862d8) 0 - vptr=((& QDoubleValidator::_ZTV16QDoubleValidator) + 16u) - QValidator (0x0x7f64e5686340) 0 - primary-for QDoubleValidator (0x0x7f64e56862d8) - QObject (0x0x7f64e5645ba0) 0 - primary-for QValidator (0x0x7f64e5686340) - -Class QRegExpValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QRegExpValidator::QPrivateSignal (0x0x7f64e5645d20) 0 empty - -Vtable for QRegExpValidator -QRegExpValidator::_ZTV16QRegExpValidator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QRegExpValidator) -16 (int (*)(...))QRegExpValidator::metaObject -24 (int (*)(...))QRegExpValidator::qt_metacast -32 (int (*)(...))QRegExpValidator::qt_metacall -40 (int (*)(...))QRegExpValidator::~QRegExpValidator -48 (int (*)(...))QRegExpValidator::~QRegExpValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QRegExpValidator::validate -120 (int (*)(...))QValidator::fixup - -Class QRegExpValidator - size=24 align=8 - base size=24 base align=8 -QRegExpValidator (0x0x7f64e56863a8) 0 - vptr=((& QRegExpValidator::_ZTV16QRegExpValidator) + 16u) - QValidator (0x0x7f64e5686410) 0 - primary-for QRegExpValidator (0x0x7f64e56863a8) - QObject (0x0x7f64e5645cc0) 0 - primary-for QValidator (0x0x7f64e5686410) - -Class QRegularExpressionValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QRegularExpressionValidator::QPrivateSignal (0x0x7f64e5645de0) 0 empty - -Vtable for QRegularExpressionValidator -QRegularExpressionValidator::_ZTV27QRegularExpressionValidator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QRegularExpressionValidator) -16 (int (*)(...))QRegularExpressionValidator::metaObject -24 (int (*)(...))QRegularExpressionValidator::qt_metacast -32 (int (*)(...))QRegularExpressionValidator::qt_metacall -40 (int (*)(...))QRegularExpressionValidator::~QRegularExpressionValidator -48 (int (*)(...))QRegularExpressionValidator::~QRegularExpressionValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QRegularExpressionValidator::validate -120 (int (*)(...))QValidator::fixup - -Class QRegularExpressionValidator - size=16 align=8 - base size=16 base align=8 -QRegularExpressionValidator (0x0x7f64e5686478) 0 - vptr=((& QRegularExpressionValidator::_ZTV27QRegularExpressionValidator) + 16u) - QValidator (0x0x7f64e56864e0) 0 - primary-for QRegularExpressionValidator (0x0x7f64e5686478) - QObject (0x0x7f64e5645d80) 0 - primary-for QValidator (0x0x7f64e56864e0) - -Class QNetworkRequest - size=8 align=8 - base size=8 base align=8 -QNetworkRequest (0x0x7f64e5645e40) 0 - -Class QNetworkCacheMetaData - size=8 align=8 - base size=8 base align=8 -QNetworkCacheMetaData (0x0x7f64e53393c0) 0 - -Class QAbstractNetworkCache::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractNetworkCache::QPrivateSignal (0x0x7f64e5339a80) 0 empty - -Vtable for QAbstractNetworkCache -QAbstractNetworkCache::_ZTV21QAbstractNetworkCache: 22u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QAbstractNetworkCache) -16 (int (*)(...))QAbstractNetworkCache::metaObject -24 (int (*)(...))QAbstractNetworkCache::qt_metacast -32 (int (*)(...))QAbstractNetworkCache::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))__cxa_pure_virtual - -Class QAbstractNetworkCache - size=16 align=8 - base size=16 base align=8 -QAbstractNetworkCache (0x0x7f64e5686d00) 0 - vptr=((& QAbstractNetworkCache::_ZTV21QAbstractNetworkCache) + 16u) - QObject (0x0x7f64e5339a20) 0 - primary-for QAbstractNetworkCache (0x0x7f64e5686d00) - -Class QAbstractSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractSocket::QPrivateSignal (0x0x7f64e5339b40) 0 empty - -Vtable for QAbstractSocket -QAbstractSocket::_ZTV15QAbstractSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QAbstractSocket) -16 (int (*)(...))QAbstractSocket::metaObject -24 (int (*)(...))QAbstractSocket::qt_metacast -32 (int (*)(...))QAbstractSocket::qt_metacall -40 (int (*)(...))QAbstractSocket::~QAbstractSocket -48 (int (*)(...))QAbstractSocket::~QAbstractSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QAbstractSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QAbstractSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QAbstractSocket::bytesAvailable -184 (int (*)(...))QAbstractSocket::bytesToWrite -192 (int (*)(...))QAbstractSocket::canReadLine -200 (int (*)(...))QAbstractSocket::waitForReadyRead -208 (int (*)(...))QAbstractSocket::waitForBytesWritten -216 (int (*)(...))QAbstractSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QAbstractSocket::writeData -240 (int (*)(...))QAbstractSocket::resume -248 (int (*)(...))QAbstractSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QAbstractSocket::disconnectFromHost -272 (int (*)(...))QAbstractSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QAbstractSocket::setSocketDescriptor -296 (int (*)(...))QAbstractSocket::setSocketOption -304 (int (*)(...))QAbstractSocket::socketOption -312 (int (*)(...))QAbstractSocket::waitForConnected -320 (int (*)(...))QAbstractSocket::waitForDisconnected - -Class QAbstractSocket - size=16 align=8 - base size=16 base align=8 -QAbstractSocket (0x0x7f64e5686d68) 0 - vptr=((& QAbstractSocket::_ZTV15QAbstractSocket) + 16u) - QIODevice (0x0x7f64e5686dd0) 0 - primary-for QAbstractSocket (0x0x7f64e5686d68) - QObject (0x0x7f64e5339ae0) 0 - primary-for QIODevice (0x0x7f64e5686dd0) - -Class QAuthenticator - size=8 align=8 - base size=8 base align=8 -QAuthenticator (0x0x7f64e542d120) 0 - -Class QDnsDomainNameRecord - size=8 align=8 - base size=8 base align=8 -QDnsDomainNameRecord (0x0x7f64e542d180) 0 - -Class QDnsHostAddressRecord - size=8 align=8 - base size=8 base align=8 -QDnsHostAddressRecord (0x0x7f64e542d480) 0 - -Class QDnsMailExchangeRecord - size=8 align=8 - base size=8 base align=8 -QDnsMailExchangeRecord (0x0x7f64e542d780) 0 - -Class QDnsServiceRecord - size=8 align=8 - base size=8 base align=8 -QDnsServiceRecord (0x0x7f64e542da80) 0 - -Class QDnsTextRecord - size=8 align=8 - base size=8 base align=8 -QDnsTextRecord (0x0x7f64e542dd80) 0 - -Class QDnsLookup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QDnsLookup::QPrivateSignal (0x0x7f64e54b8120) 0 empty - -Vtable for QDnsLookup -QDnsLookup::_ZTV10QDnsLookup: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QDnsLookup) -16 (int (*)(...))QDnsLookup::metaObject -24 (int (*)(...))QDnsLookup::qt_metacast -32 (int (*)(...))QDnsLookup::qt_metacall -40 (int (*)(...))QDnsLookup::~QDnsLookup -48 (int (*)(...))QDnsLookup::~QDnsLookup -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QDnsLookup - size=16 align=8 - base size=16 base align=8 -QDnsLookup (0x0x7f64e5452820) 0 - vptr=((& QDnsLookup::_ZTV10QDnsLookup) + 16u) - QObject (0x0x7f64e54b80c0) 0 - primary-for QDnsLookup (0x0x7f64e5452820) - -Class QIPv6Address - size=16 align=1 - base size=16 base align=1 -QIPv6Address (0x0x7f64e54b8180) 0 - -Class QHostAddress - size=8 align=8 - base size=8 base align=8 -QHostAddress (0x0x7f64e54b81e0) 0 - -Class QHostInfo - size=8 align=8 - base size=8 base align=8 -QHostInfo (0x0x7f64e54b89c0) 0 - -Class QHstsPolicy - size=8 align=8 - base size=8 base align=8 -QHstsPolicy (0x0x7f64e54b8ea0) 0 - -Class QHttpPart - size=8 align=8 - base size=8 base align=8 -QHttpPart (0x0x7f64e51976c0) 0 - -Class QHttpMultiPart::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QHttpMultiPart::QPrivateSignal (0x0x7f64e5197a20) 0 empty - -Vtable for QHttpMultiPart -QHttpMultiPart::_ZTV14QHttpMultiPart: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QHttpMultiPart) -16 (int (*)(...))QHttpMultiPart::metaObject -24 (int (*)(...))QHttpMultiPart::qt_metacast -32 (int (*)(...))QHttpMultiPart::qt_metacall -40 (int (*)(...))QHttpMultiPart::~QHttpMultiPart -48 (int (*)(...))QHttpMultiPart::~QHttpMultiPart -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QHttpMultiPart - size=16 align=8 - base size=16 base align=8 -QHttpMultiPart (0x0x7f64e516ca90) 0 - vptr=((& QHttpMultiPart::_ZTV14QHttpMultiPart) + 16u) - QObject (0x0x7f64e51979c0) 0 - primary-for QHttpMultiPart (0x0x7f64e516ca90) - -Class QLocalServer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QLocalServer::QPrivateSignal (0x0x7f64e5197ae0) 0 empty - -Vtable for QLocalServer -QLocalServer::_ZTV12QLocalServer: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QLocalServer) -16 (int (*)(...))QLocalServer::metaObject -24 (int (*)(...))QLocalServer::qt_metacast -32 (int (*)(...))QLocalServer::qt_metacall -40 (int (*)(...))QLocalServer::~QLocalServer -48 (int (*)(...))QLocalServer::~QLocalServer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QLocalServer::hasPendingConnections -120 (int (*)(...))QLocalServer::nextPendingConnection -128 (int (*)(...))QLocalServer::incomingConnection - -Class QLocalServer - size=16 align=8 - base size=16 base align=8 -QLocalServer (0x0x7f64e516caf8) 0 - vptr=((& QLocalServer::_ZTV12QLocalServer) + 16u) - QObject (0x0x7f64e5197a80) 0 - primary-for QLocalServer (0x0x7f64e516caf8) - -Class QLocalSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QLocalSocket::QPrivateSignal (0x0x7f64e5197d20) 0 empty - -Vtable for QLocalSocket -QLocalSocket::_ZTV12QLocalSocket: 30u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QLocalSocket) -16 (int (*)(...))QLocalSocket::metaObject -24 (int (*)(...))QLocalSocket::qt_metacast -32 (int (*)(...))QLocalSocket::qt_metacall -40 (int (*)(...))QLocalSocket::~QLocalSocket -48 (int (*)(...))QLocalSocket::~QLocalSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QLocalSocket::isSequential -120 (int (*)(...))QLocalSocket::open -128 (int (*)(...))QLocalSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QIODevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QLocalSocket::bytesAvailable -184 (int (*)(...))QLocalSocket::bytesToWrite -192 (int (*)(...))QLocalSocket::canReadLine -200 (int (*)(...))QLocalSocket::waitForReadyRead -208 (int (*)(...))QLocalSocket::waitForBytesWritten -216 (int (*)(...))QLocalSocket::readData -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QLocalSocket::writeData - -Class QLocalSocket - size=16 align=8 - base size=16 base align=8 -QLocalSocket (0x0x7f64e516cc98) 0 - vptr=((& QLocalSocket::_ZTV12QLocalSocket) + 16u) - QIODevice (0x0x7f64e516cd00) 0 - primary-for QLocalSocket (0x0x7f64e516cc98) - QObject (0x0x7f64e5197cc0) 0 - primary-for QIODevice (0x0x7f64e516cd00) - -Class QTcpSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTcpSocket::QPrivateSignal (0x0x7f64e5197de0) 0 empty - -Vtable for QTcpSocket -QTcpSocket::_ZTV10QTcpSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTcpSocket) -16 (int (*)(...))QTcpSocket::metaObject -24 (int (*)(...))QTcpSocket::qt_metacast -32 (int (*)(...))QTcpSocket::qt_metacall -40 (int (*)(...))QTcpSocket::~QTcpSocket -48 (int (*)(...))QTcpSocket::~QTcpSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QAbstractSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QAbstractSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QAbstractSocket::bytesAvailable -184 (int (*)(...))QAbstractSocket::bytesToWrite -192 (int (*)(...))QAbstractSocket::canReadLine -200 (int (*)(...))QAbstractSocket::waitForReadyRead -208 (int (*)(...))QAbstractSocket::waitForBytesWritten -216 (int (*)(...))QAbstractSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QAbstractSocket::writeData -240 (int (*)(...))QAbstractSocket::resume -248 (int (*)(...))QAbstractSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QAbstractSocket::disconnectFromHost -272 (int (*)(...))QAbstractSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QAbstractSocket::setSocketDescriptor -296 (int (*)(...))QAbstractSocket::setSocketOption -304 (int (*)(...))QAbstractSocket::socketOption -312 (int (*)(...))QAbstractSocket::waitForConnected -320 (int (*)(...))QAbstractSocket::waitForDisconnected - -Class QTcpSocket - size=16 align=8 - base size=16 base align=8 -QTcpSocket (0x0x7f64e516cd68) 0 - vptr=((& QTcpSocket::_ZTV10QTcpSocket) + 16u) - QAbstractSocket (0x0x7f64e516cdd0) 0 - primary-for QTcpSocket (0x0x7f64e516cd68) - QIODevice (0x0x7f64e516ce38) 0 - primary-for QAbstractSocket (0x0x7f64e516cdd0) - QObject (0x0x7f64e5197d80) 0 - primary-for QIODevice (0x0x7f64e516ce38) - -Class QSslCertificate - size=8 align=8 - base size=8 base align=8 -QSslCertificate (0x0x7f64e52ac000) 0 - -Class QSslError - size=8 align=8 - base size=8 base align=8 -QSslError (0x0x7f64e52ac420) 0 - -Class QSslSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSslSocket::QPrivateSignal (0x0x7f64e52acd80) 0 empty - -Vtable for QSslSocket -QSslSocket::_ZTV10QSslSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QSslSocket) -16 (int (*)(...))QSslSocket::metaObject -24 (int (*)(...))QSslSocket::qt_metacast -32 (int (*)(...))QSslSocket::qt_metacall -40 (int (*)(...))QSslSocket::~QSslSocket -48 (int (*)(...))QSslSocket::~QSslSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QSslSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QSslSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QSslSocket::bytesAvailable -184 (int (*)(...))QSslSocket::bytesToWrite -192 (int (*)(...))QSslSocket::canReadLine -200 (int (*)(...))QSslSocket::waitForReadyRead -208 (int (*)(...))QSslSocket::waitForBytesWritten -216 (int (*)(...))QSslSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QSslSocket::writeData -240 (int (*)(...))QSslSocket::resume -248 (int (*)(...))QSslSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QSslSocket::disconnectFromHost -272 (int (*)(...))QSslSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QSslSocket::setSocketDescriptor -296 (int (*)(...))QSslSocket::setSocketOption -304 (int (*)(...))QSslSocket::socketOption -312 (int (*)(...))QSslSocket::waitForConnected -320 (int (*)(...))QSslSocket::waitForDisconnected - -Class QSslSocket - size=16 align=8 - base size=16 base align=8 -QSslSocket (0x0x7f64e52d4820) 0 - vptr=((& QSslSocket::_ZTV10QSslSocket) + 16u) - QTcpSocket (0x0x7f64e52d4888) 0 - primary-for QSslSocket (0x0x7f64e52d4820) - QAbstractSocket (0x0x7f64e52d48f0) 0 - primary-for QTcpSocket (0x0x7f64e52d4888) - QIODevice (0x0x7f64e52d4958) 0 - primary-for QAbstractSocket (0x0x7f64e52d48f0) - QObject (0x0x7f64e52acd20) 0 - primary-for QIODevice (0x0x7f64e52d4958) - -Class QSslConfiguration - size=8 align=8 - base size=8 base align=8 -QSslConfiguration (0x0x7f64e52acde0) 0 - -Class QSslPreSharedKeyAuthenticator - size=8 align=8 - base size=8 base align=8 -QSslPreSharedKeyAuthenticator (0x0x7f64e4fab600) 0 - -Class QNetworkAccessManager::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkAccessManager::QPrivateSignal (0x0x7f64e4fabf00) 0 empty - -Vtable for QNetworkAccessManager -QNetworkAccessManager::_ZTV21QNetworkAccessManager: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QNetworkAccessManager) -16 (int (*)(...))QNetworkAccessManager::metaObject -24 (int (*)(...))QNetworkAccessManager::qt_metacast -32 (int (*)(...))QNetworkAccessManager::qt_metacall -40 (int (*)(...))QNetworkAccessManager::~QNetworkAccessManager -48 (int (*)(...))QNetworkAccessManager::~QNetworkAccessManager -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkAccessManager::createRequest - -Class QNetworkAccessManager - size=16 align=8 - base size=16 base align=8 -QNetworkAccessManager (0x0x7f64e4fdb618) 0 - vptr=((& QNetworkAccessManager::_ZTV21QNetworkAccessManager) + 16u) - QObject (0x0x7f64e4fabea0) 0 - primary-for QNetworkAccessManager (0x0x7f64e4fdb618) - -Class QNetworkConfiguration - size=8 align=8 - base size=8 base align=8 -QNetworkConfiguration (0x0x7f64e4fabf60) 0 - -Class QNetworkConfigurationManager::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkConfigurationManager::QPrivateSignal (0x0x7f64e5025420) 0 empty - -Vtable for QNetworkConfigurationManager -QNetworkConfigurationManager::_ZTV28QNetworkConfigurationManager: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI28QNetworkConfigurationManager) -16 (int (*)(...))QNetworkConfigurationManager::metaObject -24 (int (*)(...))QNetworkConfigurationManager::qt_metacast -32 (int (*)(...))QNetworkConfigurationManager::qt_metacall -40 (int (*)(...))QNetworkConfigurationManager::~QNetworkConfigurationManager -48 (int (*)(...))QNetworkConfigurationManager::~QNetworkConfigurationManager -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QNetworkConfigurationManager - size=16 align=8 - base size=16 base align=8 -QNetworkConfigurationManager (0x0x7f64e4fdb820) 0 - vptr=((& QNetworkConfigurationManager::_ZTV28QNetworkConfigurationManager) + 16u) - QObject (0x0x7f64e50253c0) 0 - primary-for QNetworkConfigurationManager (0x0x7f64e4fdb820) - -Class QNetworkCookie - size=8 align=8 - base size=8 base align=8 -QNetworkCookie (0x0x7f64e5025780) 0 - -Class QNetworkCookieJar::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkCookieJar::QPrivateSignal (0x0x7f64e5025f60) 0 empty - -Vtable for QNetworkCookieJar -QNetworkCookieJar::_ZTV17QNetworkCookieJar: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QNetworkCookieJar) -16 (int (*)(...))QNetworkCookieJar::metaObject -24 (int (*)(...))QNetworkCookieJar::qt_metacast -32 (int (*)(...))QNetworkCookieJar::qt_metacall -40 (int (*)(...))QNetworkCookieJar::~QNetworkCookieJar -48 (int (*)(...))QNetworkCookieJar::~QNetworkCookieJar -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkCookieJar::cookiesForUrl -120 (int (*)(...))QNetworkCookieJar::setCookiesFromUrl -128 (int (*)(...))QNetworkCookieJar::insertCookie -136 (int (*)(...))QNetworkCookieJar::updateCookie -144 (int (*)(...))QNetworkCookieJar::deleteCookie -152 (int (*)(...))QNetworkCookieJar::validateCookie - -Class QNetworkCookieJar - size=16 align=8 - base size=16 base align=8 -QNetworkCookieJar (0x0x7f64e50c7068) 0 - vptr=((& QNetworkCookieJar::_ZTV17QNetworkCookieJar) + 16u) - QObject (0x0x7f64e5025f00) 0 - primary-for QNetworkCookieJar (0x0x7f64e50c7068) - -Class QNetworkDatagram - size=8 align=8 - base size=8 base align=8 -QNetworkDatagram (0x0x7f64e50e1000) 0 - -Class QNetworkDiskCache::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkDiskCache::QPrivateSignal (0x0x7f64e4d7e000) 0 empty - -Vtable for QNetworkDiskCache -QNetworkDiskCache::_ZTV17QNetworkDiskCache: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QNetworkDiskCache) -16 (int (*)(...))QNetworkDiskCache::metaObject -24 (int (*)(...))QNetworkDiskCache::qt_metacast -32 (int (*)(...))QNetworkDiskCache::qt_metacall -40 (int (*)(...))QNetworkDiskCache::~QNetworkDiskCache -48 (int (*)(...))QNetworkDiskCache::~QNetworkDiskCache -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkDiskCache::metaData -120 (int (*)(...))QNetworkDiskCache::updateMetaData -128 (int (*)(...))QNetworkDiskCache::data -136 (int (*)(...))QNetworkDiskCache::remove -144 (int (*)(...))QNetworkDiskCache::cacheSize -152 (int (*)(...))QNetworkDiskCache::prepare -160 (int (*)(...))QNetworkDiskCache::insert -168 (int (*)(...))QNetworkDiskCache::clear -176 (int (*)(...))QNetworkDiskCache::expire - -Class QNetworkDiskCache - size=16 align=8 - base size=16 base align=8 -QNetworkDiskCache (0x0x7f64e4d5fa90) 0 - vptr=((& QNetworkDiskCache::_ZTV17QNetworkDiskCache) + 16u) - QAbstractNetworkCache (0x0x7f64e4d5faf8) 0 - primary-for QNetworkDiskCache (0x0x7f64e4d5fa90) - QObject (0x0x7f64e4d46f60) 0 - primary-for QAbstractNetworkCache (0x0x7f64e4d5faf8) - -Class QNetworkAddressEntry - size=8 align=8 - base size=8 base align=8 -QNetworkAddressEntry (0x0x7f64e4d7e060) 0 - -Class QNetworkInterface - size=8 align=8 - base size=8 base align=8 -QNetworkInterface (0x0x7f64e4d7e720) 0 - -Class QNetworkProxyQuery - size=8 align=8 - base size=8 base align=8 -QNetworkProxyQuery (0x0x7f64e4d7ede0) 0 - -Class QNetworkProxy - size=8 align=8 - base size=8 base align=8 -QNetworkProxy (0x0x7f64e4e4a480) 0 - -Vtable for QNetworkProxyFactory -QNetworkProxyFactory::_ZTV20QNetworkProxyFactory: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QNetworkProxyFactory) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QNetworkProxyFactory - size=8 align=8 - base size=8 base align=8 -QNetworkProxyFactory (0x0x7f64e4e4ac60) 0 nearly-empty - vptr=((& QNetworkProxyFactory::_ZTV20QNetworkProxyFactory) + 16u) - -Class QNetworkReply::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkReply::QPrivateSignal (0x0x7f64e4e4ae40) 0 empty - -Vtable for QNetworkReply -QNetworkReply::_ZTV13QNetworkReply: 36u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QNetworkReply) -16 (int (*)(...))QNetworkReply::metaObject -24 (int (*)(...))QNetworkReply::qt_metacast -32 (int (*)(...))QNetworkReply::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkReply::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QNetworkReply::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QIODevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))__cxa_pure_virtual -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QNetworkReply::writeData -240 (int (*)(...))QNetworkReply::setReadBufferSize -248 (int (*)(...))__cxa_pure_virtual -256 (int (*)(...))QNetworkReply::ignoreSslErrors -264 (int (*)(...))QNetworkReply::sslConfigurationImplementation -272 (int (*)(...))QNetworkReply::setSslConfigurationImplementation -280 (int (*)(...))QNetworkReply::ignoreSslErrorsImplementation - -Class QNetworkReply - size=16 align=8 - base size=16 base align=8 -QNetworkReply (0x0x7f64e4e841a0) 0 - vptr=((& QNetworkReply::_ZTV13QNetworkReply) + 16u) - QIODevice (0x0x7f64e4e84208) 0 - primary-for QNetworkReply (0x0x7f64e4e841a0) - QObject (0x0x7f64e4e4ade0) 0 - primary-for QIODevice (0x0x7f64e4e84208) - -Class QNetworkSession::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkSession::QPrivateSignal (0x0x7f64e4eee060) 0 empty - -Vtable for QNetworkSession -QNetworkSession::_ZTV15QNetworkSession: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QNetworkSession) -16 (int (*)(...))QNetworkSession::metaObject -24 (int (*)(...))QNetworkSession::qt_metacast -32 (int (*)(...))QNetworkSession::qt_metacall -40 (int (*)(...))QNetworkSession::~QNetworkSession -48 (int (*)(...))QNetworkSession::~QNetworkSession -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QNetworkSession::connectNotify -104 (int (*)(...))QNetworkSession::disconnectNotify - -Class QNetworkSession - size=24 align=8 - base size=24 base align=8 -QNetworkSession (0x0x7f64e4e84270) 0 - vptr=((& QNetworkSession::_ZTV15QNetworkSession) + 16u) - QObject (0x0x7f64e4eee000) 0 - primary-for QNetworkSession (0x0x7f64e4e84270) - -Class QTcpServer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTcpServer::QPrivateSignal (0x0x7f64e4eee600) 0 empty - -Vtable for QTcpServer -QTcpServer::_ZTV10QTcpServer: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTcpServer) -16 (int (*)(...))QTcpServer::metaObject -24 (int (*)(...))QTcpServer::qt_metacast -32 (int (*)(...))QTcpServer::qt_metacall -40 (int (*)(...))QTcpServer::~QTcpServer -48 (int (*)(...))QTcpServer::~QTcpServer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTcpServer::hasPendingConnections -120 (int (*)(...))QTcpServer::nextPendingConnection -128 (int (*)(...))QTcpServer::incomingConnection - -Class QTcpServer - size=16 align=8 - base size=16 base align=8 -QTcpServer (0x0x7f64e4e843a8) 0 - vptr=((& QTcpServer::_ZTV10QTcpServer) + 16u) - QObject (0x0x7f64e4eee5a0) 0 - primary-for QTcpServer (0x0x7f64e4e843a8) - -Class QSslCertificateExtension - size=8 align=8 - base size=8 base align=8 -QSslCertificateExtension (0x0x7f64e4eee660) 0 - -Class QSslCipher - size=8 align=8 - base size=8 base align=8 -QSslCipher (0x0x7f64e4eee960) 0 - -Class QSslDiffieHellmanParameters - size=8 align=8 - base size=8 base align=8 -QSslDiffieHellmanParameters (0x0x7f64e4b8b180) 0 - -Class QSslEllipticCurve - size=4 align=4 - base size=4 base align=4 -QSslEllipticCurve (0x0x7f64e4bf9c60) 0 - -Class QSslKey - size=8 align=8 - base size=8 base align=8 -QSslKey (0x0x7f64e4c323c0) 0 - -Class QUdpSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QUdpSocket::QPrivateSignal (0x0x7f64e4c32720) 0 empty - -Vtable for QUdpSocket -QUdpSocket::_ZTV10QUdpSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QUdpSocket) -16 (int (*)(...))QUdpSocket::metaObject -24 (int (*)(...))QUdpSocket::qt_metacast -32 (int (*)(...))QUdpSocket::qt_metacall -40 (int (*)(...))QUdpSocket::~QUdpSocket -48 (int (*)(...))QUdpSocket::~QUdpSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QAbstractSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QAbstractSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QAbstractSocket::bytesAvailable -184 (int (*)(...))QAbstractSocket::bytesToWrite -192 (int (*)(...))QAbstractSocket::canReadLine -200 (int (*)(...))QAbstractSocket::waitForReadyRead -208 (int (*)(...))QAbstractSocket::waitForBytesWritten -216 (int (*)(...))QAbstractSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QAbstractSocket::writeData -240 (int (*)(...))QAbstractSocket::resume -248 (int (*)(...))QAbstractSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QAbstractSocket::disconnectFromHost -272 (int (*)(...))QAbstractSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QAbstractSocket::setSocketDescriptor -296 (int (*)(...))QAbstractSocket::setSocketOption -304 (int (*)(...))QAbstractSocket::socketOption -312 (int (*)(...))QAbstractSocket::waitForConnected -320 (int (*)(...))QAbstractSocket::waitForDisconnected - -Class QUdpSocket - size=16 align=8 - base size=16 base align=8 -QUdpSocket (0x0x7f64e4c19958) 0 - vptr=((& QUdpSocket::_ZTV10QUdpSocket) + 16u) - QAbstractSocket (0x0x7f64e4c199c0) 0 - primary-for QUdpSocket (0x0x7f64e4c19958) - QIODevice (0x0x7f64e4c19a28) 0 - primary-for QAbstractSocket (0x0x7f64e4c199c0) - QObject (0x0x7f64e4c326c0) 0 - primary-for QIODevice (0x0x7f64e4c19a28) - -Class QJSValue - size=8 align=8 - base size=8 base align=8 -QJSValue (0x0x7f64e4c32780) 0 - -Class QQmlDebuggingEnabler - size=1 align=1 - base size=0 base align=1 -QQmlDebuggingEnabler (0x0x7f64e4c32a20) 0 empty - -Class QJSEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QJSEngine::QPrivateSignal (0x0x7f64e4c32ae0) 0 empty - -Vtable for QJSEngine -QJSEngine::_ZTV9QJSEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QJSEngine) -16 (int (*)(...))QJSEngine::metaObject -24 (int (*)(...))QJSEngine::qt_metacast -32 (int (*)(...))QJSEngine::qt_metacall -40 (int (*)(...))QJSEngine::~QJSEngine -48 (int (*)(...))QJSEngine::~QJSEngine -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QJSEngine - size=24 align=8 - base size=24 base align=8 -QJSEngine (0x0x7f64e4c19b60) 0 - vptr=((& QJSEngine::_ZTV9QJSEngine) + 16u) - QObject (0x0x7f64e4c32a80) 0 - primary-for QJSEngine (0x0x7f64e4c19b60) - -Class QJSValueIterator - size=8 align=8 - base size=8 base align=8 -QJSValueIterator (0x0x7f64e4c32cc0) 0 - -Class QQmlPrivate::RegisterType - size=128 align=8 - base size=124 base align=8 -QQmlPrivate::RegisterType (0x0x7f64e49311e0) 0 - -Class QQmlPrivate::RegisterInterface - size=24 align=8 - base size=24 base align=8 -QQmlPrivate::RegisterInterface (0x0x7f64e4931240) 0 - -Class QQmlPrivate::RegisterAutoParent - size=16 align=8 - base size=16 base align=8 -QQmlPrivate::RegisterAutoParent (0x0x7f64e49312a0) 0 - -Class QQmlPrivate::RegisterSingletonType - size=64 align=8 - base size=64 base align=8 -QQmlPrivate::RegisterSingletonType (0x0x7f64e4931300) 0 - -Class QQmlPrivate::RegisterCompositeType - size=32 align=8 - base size=32 base align=8 -QQmlPrivate::RegisterCompositeType (0x0x7f64e4931360) 0 - -Class QQmlPrivate::RegisterCompositeSingletonType - size=32 align=8 - base size=32 base align=8 -QQmlPrivate::RegisterCompositeSingletonType (0x0x7f64e49313c0) 0 - -Class QQmlPrivate::CachedQmlUnit - size=24 align=8 - base size=24 base align=8 -QQmlPrivate::CachedQmlUnit (0x0x7f64e4931420) 0 - -Class QQmlPrivate::RegisterQmlUnitCacheHook - size=16 align=8 - base size=16 base align=8 -QQmlPrivate::RegisterQmlUnitCacheHook (0x0x7f64e4931480) 0 - -Vtable for QQmlParserStatus -QQmlParserStatus::_ZTV16QQmlParserStatus: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QQmlParserStatus) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QQmlParserStatus - size=16 align=8 - base size=16 base align=8 -QQmlParserStatus (0x0x7f64e49314e0) 0 - vptr=((& QQmlParserStatus::_ZTV16QQmlParserStatus) + 16u) - -Vtable for QQmlPropertyValueSource -QQmlPropertyValueSource::_ZTV23QQmlPropertyValueSource: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QQmlPropertyValueSource) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlPropertyValueSource - size=8 align=8 - base size=8 base align=8 -QQmlPropertyValueSource (0x0x7f64e49315a0) 0 nearly-empty - vptr=((& QQmlPropertyValueSource::_ZTV23QQmlPropertyValueSource) + 16u) - -Class QQmlListReference - size=8 align=8 - base size=8 base align=8 -QQmlListReference (0x0x7f64e49316c0) 0 - -Vtable for QQmlAbstractUrlInterceptor -QQmlAbstractUrlInterceptor::_ZTV26QQmlAbstractUrlInterceptor: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QQmlAbstractUrlInterceptor) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlAbstractUrlInterceptor - size=8 align=8 - base size=8 base align=8 -QQmlAbstractUrlInterceptor (0x0x7f64e4931d20) 0 nearly-empty - vptr=((& QQmlAbstractUrlInterceptor::_ZTV26QQmlAbstractUrlInterceptor) + 16u) - -Class QQmlError - size=8 align=8 - base size=8 base align=8 -QQmlError (0x0x7f64e4931d80) 0 - -Vtable for QQmlImageProviderBase -QQmlImageProviderBase::_ZTV21QQmlImageProviderBase: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QQmlImageProviderBase) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QQmlImageProviderBase - size=8 align=8 - base size=8 base align=8 -QQmlImageProviderBase (0x0x7f64e4a4a060) 0 nearly-empty - vptr=((& QQmlImageProviderBase::_ZTV21QQmlImageProviderBase) + 16u) - -Class QQmlEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlEngine::QPrivateSignal (0x0x7f64e4a4a2a0) 0 empty - -Vtable for QQmlEngine -QQmlEngine::_ZTV10QQmlEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QQmlEngine) -16 (int (*)(...))QQmlEngine::metaObject -24 (int (*)(...))QQmlEngine::qt_metacast -32 (int (*)(...))QQmlEngine::qt_metacall -40 (int (*)(...))QQmlEngine::~QQmlEngine -48 (int (*)(...))QQmlEngine::~QQmlEngine -56 (int (*)(...))QQmlEngine::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlEngine - size=24 align=8 - base size=24 base align=8 -QQmlEngine (0x0x7f64e4a4c1a0) 0 - vptr=((& QQmlEngine::_ZTV10QQmlEngine) + 16u) - QJSEngine (0x0x7f64e4a4c208) 0 - primary-for QQmlEngine (0x0x7f64e4a4c1a0) - QObject (0x0x7f64e4a4a240) 0 - primary-for QJSEngine (0x0x7f64e4a4c208) - -Class QQmlApplicationEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlApplicationEngine::QPrivateSignal (0x0x7f64e4a4a360) 0 empty - -Vtable for QQmlApplicationEngine -QQmlApplicationEngine::_ZTV21QQmlApplicationEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QQmlApplicationEngine) -16 (int (*)(...))QQmlApplicationEngine::metaObject -24 (int (*)(...))QQmlApplicationEngine::qt_metacast -32 (int (*)(...))QQmlApplicationEngine::qt_metacall -40 (int (*)(...))QQmlApplicationEngine::~QQmlApplicationEngine -48 (int (*)(...))QQmlApplicationEngine::~QQmlApplicationEngine -56 (int (*)(...))QQmlEngine::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlApplicationEngine - size=24 align=8 - base size=24 base align=8 -QQmlApplicationEngine (0x0x7f64e4a4c270) 0 - vptr=((& QQmlApplicationEngine::_ZTV21QQmlApplicationEngine) + 16u) - QQmlEngine (0x0x7f64e4a4c2d8) 0 - primary-for QQmlApplicationEngine (0x0x7f64e4a4c270) - QJSEngine (0x0x7f64e4a4c340) 0 - primary-for QQmlEngine (0x0x7f64e4a4c2d8) - QObject (0x0x7f64e4a4a300) 0 - primary-for QJSEngine (0x0x7f64e4a4c340) - -Class QQmlComponent::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlComponent::QPrivateSignal (0x0x7f64e4a4a420) 0 empty - -Vtable for QQmlComponent -QQmlComponent::_ZTV13QQmlComponent: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QQmlComponent) -16 (int (*)(...))QQmlComponent::metaObject -24 (int (*)(...))QQmlComponent::qt_metacast -32 (int (*)(...))QQmlComponent::qt_metacall -40 (int (*)(...))QQmlComponent::~QQmlComponent -48 (int (*)(...))QQmlComponent::~QQmlComponent -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQmlComponent::create -120 (int (*)(...))QQmlComponent::beginCreate -128 (int (*)(...))QQmlComponent::completeCreate - -Class QQmlComponent - size=16 align=8 - base size=16 base align=8 -QQmlComponent (0x0x7f64e4a4c3a8) 0 - vptr=((& QQmlComponent::_ZTV13QQmlComponent) + 16u) - QObject (0x0x7f64e4a4a3c0) 0 - primary-for QQmlComponent (0x0x7f64e4a4c3a8) - -Class QQmlContext::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlContext::QPrivateSignal (0x0x7f64e4a4ac60) 0 empty - -Class QQmlContext::PropertyPair - size=24 align=8 - base size=24 base align=8 -QQmlContext::PropertyPair (0x0x7f64e4a4acc0) 0 - -Vtable for QQmlContext -QQmlContext::_ZTV11QQmlContext: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QQmlContext) -16 (int (*)(...))QQmlContext::metaObject -24 (int (*)(...))QQmlContext::qt_metacast -32 (int (*)(...))QQmlContext::qt_metacall -40 (int (*)(...))QQmlContext::~QQmlContext -48 (int (*)(...))QQmlContext::~QQmlContext -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlContext - size=16 align=8 - base size=16 base align=8 -QQmlContext (0x0x7f64e4a4c8f0) 0 - vptr=((& QQmlContext::_ZTV11QQmlContext) + 16u) - QObject (0x0x7f64e4a4ac00) 0 - primary-for QQmlContext (0x0x7f64e4a4c8f0) - -Class QQmlScriptString - size=8 align=8 - base size=8 base align=8 -QQmlScriptString (0x0x7f64e4a4ae40) 0 - -Class QQmlExpression::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlExpression::QPrivateSignal (0x0x7f64e472a0c0) 0 empty - -Vtable for QQmlExpression -QQmlExpression::_ZTV14QQmlExpression: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QQmlExpression) -16 (int (*)(...))QQmlExpression::metaObject -24 (int (*)(...))QQmlExpression::qt_metacast -32 (int (*)(...))QQmlExpression::qt_metacall -40 (int (*)(...))QQmlExpression::~QQmlExpression -48 (int (*)(...))QQmlExpression::~QQmlExpression -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlExpression - size=16 align=8 - base size=16 base align=8 -QQmlExpression (0x0x7f64e4a4c958) 0 - vptr=((& QQmlExpression::_ZTV14QQmlExpression) + 16u) - QObject (0x0x7f64e472a060) 0 - primary-for QQmlExpression (0x0x7f64e4a4c958) - -Vtable for QQmlTypesExtensionInterface -QQmlTypesExtensionInterface::_ZTV27QQmlTypesExtensionInterface: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QQmlTypesExtensionInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlTypesExtensionInterface - size=8 align=8 - base size=8 base align=8 -QQmlTypesExtensionInterface (0x0x7f64e472a120) 0 nearly-empty - vptr=((& QQmlTypesExtensionInterface::_ZTV27QQmlTypesExtensionInterface) + 16u) - -Vtable for QQmlExtensionInterface -QQmlExtensionInterface::_ZTV22QQmlExtensionInterface: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QQmlExtensionInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QQmlExtensionInterface - size=8 align=8 - base size=8 base align=8 -QQmlExtensionInterface (0x0x7f64e4a4c9c0) 0 nearly-empty - vptr=((& QQmlExtensionInterface::_ZTV22QQmlExtensionInterface) + 16u) - QQmlTypesExtensionInterface (0x0x7f64e472a180) 0 nearly-empty - primary-for QQmlExtensionInterface (0x0x7f64e4a4c9c0) - -Class QQmlExtensionPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlExtensionPlugin::QPrivateSignal (0x0x7f64e472a360) 0 empty - -Vtable for QQmlExtensionPlugin -QQmlExtensionPlugin::_ZTV19QQmlExtensionPlugin: 22u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQmlExtensionPlugin) -16 (int (*)(...))QQmlExtensionPlugin::metaObject -24 (int (*)(...))QQmlExtensionPlugin::qt_metacast -32 (int (*)(...))QQmlExtensionPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QQmlExtensionPlugin::initializeEngine -128 (int (*)(...))-16 -136 (int (*)(...))(& _ZTI19QQmlExtensionPlugin) -144 0u -152 0u -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QQmlExtensionPlugin::_ZThn16_N19QQmlExtensionPlugin16initializeEngineEP10QQmlEnginePKc - -Class QQmlExtensionPlugin - size=24 align=8 - base size=24 base align=8 -QQmlExtensionPlugin (0x0x7f64e4754150) 0 - vptr=((& QQmlExtensionPlugin::_ZTV19QQmlExtensionPlugin) + 16u) - QObject (0x0x7f64e472a2a0) 0 - primary-for QQmlExtensionPlugin (0x0x7f64e4754150) - QQmlExtensionInterface (0x0x7f64e4a4ca28) 16 nearly-empty - vptr=((& QQmlExtensionPlugin::_ZTV19QQmlExtensionPlugin) + 144u) - QQmlTypesExtensionInterface (0x0x7f64e472a300) 16 nearly-empty - primary-for QQmlExtensionInterface (0x0x7f64e4a4ca28) - -Class QQmlFile - size=8 align=8 - base size=8 base align=8 -QQmlFile (0x0x7f64e472a3c0) 0 - -Class QQmlFileSelector::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlFileSelector::QPrivateSignal (0x0x7f64e472a480) 0 empty - -Vtable for QQmlFileSelector -QQmlFileSelector::_ZTV16QQmlFileSelector: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QQmlFileSelector) -16 (int (*)(...))QQmlFileSelector::metaObject -24 (int (*)(...))QQmlFileSelector::qt_metacast -32 (int (*)(...))QQmlFileSelector::qt_metacall -40 (int (*)(...))QQmlFileSelector::~QQmlFileSelector -48 (int (*)(...))QQmlFileSelector::~QQmlFileSelector -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlFileSelector - size=16 align=8 - base size=16 base align=8 -QQmlFileSelector (0x0x7f64e4a4caf8) 0 - vptr=((& QQmlFileSelector::_ZTV16QQmlFileSelector) + 16u) - QObject (0x0x7f64e472a420) 0 - primary-for QQmlFileSelector (0x0x7f64e4a4caf8) - -Vtable for QQmlIncubator -QQmlIncubator::_ZTV13QQmlIncubator: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QQmlIncubator) -16 (int (*)(...))QQmlIncubator::~QQmlIncubator -24 (int (*)(...))QQmlIncubator::~QQmlIncubator -32 (int (*)(...))QQmlIncubator::statusChanged -40 (int (*)(...))QQmlIncubator::setInitialState - -Class QQmlIncubator - size=16 align=8 - base size=16 base align=8 -QQmlIncubator (0x0x7f64e472a4e0) 0 - vptr=((& QQmlIncubator::_ZTV13QQmlIncubator) + 16u) - -Vtable for QQmlIncubationController -QQmlIncubationController::_ZTV24QQmlIncubationController: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QQmlIncubationController) -16 (int (*)(...))QQmlIncubationController::~QQmlIncubationController -24 (int (*)(...))QQmlIncubationController::~QQmlIncubationController -32 (int (*)(...))QQmlIncubationController::incubatingObjectCountChanged - -Class QQmlIncubationController - size=16 align=8 - base size=16 base align=8 -QQmlIncubationController (0x0x7f64e472a540) 0 - vptr=((& QQmlIncubationController::_ZTV24QQmlIncubationController) + 16u) - -Class QQmlInfo - size=16 align=8 - base size=16 base align=8 -QQmlInfo (0x0x7f64e4a4cb60) 0 - QDebug (0x0x7f64e472a5a0) 0 - -Vtable for QQmlNetworkAccessManagerFactory -QQmlNetworkAccessManagerFactory::_ZTV31QQmlNetworkAccessManagerFactory: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI31QQmlNetworkAccessManagerFactory) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlNetworkAccessManagerFactory - size=8 align=8 - base size=8 base align=8 -QQmlNetworkAccessManagerFactory (0x0x7f64e480b480) 0 nearly-empty - vptr=((& QQmlNetworkAccessManagerFactory::_ZTV31QQmlNetworkAccessManagerFactory) + 16u) - -Class QQmlProperty - size=8 align=8 - base size=8 base align=8 -QQmlProperty (0x0x7f64e480b4e0) 0 - -Class QQmlPropertyMap::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlPropertyMap::QPrivateSignal (0x0x7f64e4848060) 0 empty - -Vtable for QQmlPropertyMap -QQmlPropertyMap::_ZTV15QQmlPropertyMap: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QQmlPropertyMap) -16 (int (*)(...))QQmlPropertyMap::metaObject -24 (int (*)(...))QQmlPropertyMap::qt_metacast -32 (int (*)(...))QQmlPropertyMap::qt_metacall -40 (int (*)(...))QQmlPropertyMap::~QQmlPropertyMap -48 (int (*)(...))QQmlPropertyMap::~QQmlPropertyMap -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQmlPropertyMap::updateValue - -Class QQmlPropertyMap - size=16 align=8 - base size=16 base align=8 -QQmlPropertyMap (0x0x7f64e48393a8) 0 - vptr=((& QQmlPropertyMap::_ZTV15QQmlPropertyMap) + 16u) - QObject (0x0x7f64e4848000) 0 - primary-for QQmlPropertyMap (0x0x7f64e48393a8) - -Class QQuickTransform::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickTransform::QPrivateSignal (0x0x7f64e4848120) 0 empty - -Vtable for QQuickTransform -QQuickTransform::_ZTV15QQuickTransform: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QQuickTransform) -16 (int (*)(...))QQuickTransform::metaObject -24 (int (*)(...))QQuickTransform::qt_metacast -32 (int (*)(...))QQuickTransform::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QQuickTransform - size=16 align=8 - base size=16 base align=8 -QQuickTransform (0x0x7f64e4839410) 0 - vptr=((& QQuickTransform::_ZTV15QQuickTransform) + 16u) - QObject (0x0x7f64e48480c0) 0 - primary-for QQuickTransform (0x0x7f64e4839410) - -Class QQuickItem::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickItem::QPrivateSignal (0x0x7f64e4848240) 0 empty - -Class QQuickItem::ItemChangeData - size=8 align=8 - base size=8 base align=8 -QQuickItem::ItemChangeData (0x0x7f64e48482a0) 0 - -Class QQuickItem::UpdatePaintNodeData - size=8 align=8 - base size=8 base align=8 -QQuickItem::UpdatePaintNodeData (0x0x7f64e4848300) 0 - -Vtable for QQuickItem -QQuickItem::_ZTV10QQuickItem: 55u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QQuickItem) -16 (int (*)(...))QQuickItem::metaObject -24 (int (*)(...))QQuickItem::qt_metacast -32 (int (*)(...))QQuickItem::qt_metacall -40 (int (*)(...))QQuickItem::~QQuickItem -48 (int (*)(...))QQuickItem::~QQuickItem -56 (int (*)(...))QQuickItem::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickItem::boundingRect -120 (int (*)(...))QQuickItem::clipRect -128 (int (*)(...))QQuickItem::contains -136 (int (*)(...))QQuickItem::inputMethodQuery -144 (int (*)(...))QQuickItem::isTextureProvider -152 (int (*)(...))QQuickItem::textureProvider -160 (int (*)(...))QQuickItem::itemChange -168 (int (*)(...))QQuickItem::classBegin -176 (int (*)(...))QQuickItem::componentComplete -184 (int (*)(...))QQuickItem::keyPressEvent -192 (int (*)(...))QQuickItem::keyReleaseEvent -200 (int (*)(...))QQuickItem::inputMethodEvent -208 (int (*)(...))QQuickItem::focusInEvent -216 (int (*)(...))QQuickItem::focusOutEvent -224 (int (*)(...))QQuickItem::mousePressEvent -232 (int (*)(...))QQuickItem::mouseMoveEvent -240 (int (*)(...))QQuickItem::mouseReleaseEvent -248 (int (*)(...))QQuickItem::mouseDoubleClickEvent -256 (int (*)(...))QQuickItem::mouseUngrabEvent -264 (int (*)(...))QQuickItem::touchUngrabEvent -272 (int (*)(...))QQuickItem::wheelEvent -280 (int (*)(...))QQuickItem::touchEvent -288 (int (*)(...))QQuickItem::hoverEnterEvent -296 (int (*)(...))QQuickItem::hoverMoveEvent -304 (int (*)(...))QQuickItem::hoverLeaveEvent -312 (int (*)(...))QQuickItem::dragEnterEvent -320 (int (*)(...))QQuickItem::dragMoveEvent -328 (int (*)(...))QQuickItem::dragLeaveEvent -336 (int (*)(...))QQuickItem::dropEvent -344 (int (*)(...))QQuickItem::childMouseEventFilter -352 (int (*)(...))QQuickItem::windowDeactivateEvent -360 (int (*)(...))QQuickItem::geometryChanged -368 (int (*)(...))QQuickItem::updatePaintNode -376 (int (*)(...))QQuickItem::releaseResources -384 (int (*)(...))QQuickItem::updatePolish -392 (int (*)(...))-16 -400 (int (*)(...))(& _ZTI10QQuickItem) -408 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItemD1Ev -416 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItemD0Ev -424 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem10classBeginEv -432 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem17componentCompleteEv - -Class QQuickItem - size=32 align=8 - base size=32 base align=8 -QQuickItem (0x0x7f64e4842cb0) 0 - vptr=((& QQuickItem::_ZTV10QQuickItem) + 16u) - QObject (0x0x7f64e4848180) 0 - primary-for QQuickItem (0x0x7f64e4842cb0) - QQmlParserStatus (0x0x7f64e48481e0) 16 - vptr=((& QQuickItem::_ZTV10QQuickItem) + 408u) - -Class QQuickFramebufferObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickFramebufferObject::QPrivateSignal (0x0x7f64e4848ae0) 0 empty - -Vtable for QQuickFramebufferObject::Renderer -QQuickFramebufferObject::Renderer::_ZTVN23QQuickFramebufferObject8RendererE: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN23QQuickFramebufferObject8RendererE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QQuickFramebufferObject::Renderer::createFramebufferObject -48 (int (*)(...))QQuickFramebufferObject::Renderer::synchronize - -Class QQuickFramebufferObject::Renderer - size=16 align=8 - base size=16 base align=8 -QQuickFramebufferObject::Renderer (0x0x7f64e4848b40) 0 - vptr=((& QQuickFramebufferObject::Renderer::_ZTVN23QQuickFramebufferObject8RendererE) + 16u) - -Vtable for QQuickFramebufferObject -QQuickFramebufferObject::_ZTV23QQuickFramebufferObject: 56u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QQuickFramebufferObject) -16 (int (*)(...))QQuickFramebufferObject::metaObject -24 (int (*)(...))QQuickFramebufferObject::qt_metacast -32 (int (*)(...))QQuickFramebufferObject::qt_metacall -40 0u -48 0u -56 (int (*)(...))QQuickItem::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickItem::boundingRect -120 (int (*)(...))QQuickItem::clipRect -128 (int (*)(...))QQuickItem::contains -136 (int (*)(...))QQuickItem::inputMethodQuery -144 (int (*)(...))QQuickFramebufferObject::isTextureProvider -152 (int (*)(...))QQuickFramebufferObject::textureProvider -160 (int (*)(...))QQuickItem::itemChange -168 (int (*)(...))QQuickItem::classBegin -176 (int (*)(...))QQuickItem::componentComplete -184 (int (*)(...))QQuickItem::keyPressEvent -192 (int (*)(...))QQuickItem::keyReleaseEvent -200 (int (*)(...))QQuickItem::inputMethodEvent -208 (int (*)(...))QQuickItem::focusInEvent -216 (int (*)(...))QQuickItem::focusOutEvent -224 (int (*)(...))QQuickItem::mousePressEvent -232 (int (*)(...))QQuickItem::mouseMoveEvent -240 (int (*)(...))QQuickItem::mouseReleaseEvent -248 (int (*)(...))QQuickItem::mouseDoubleClickEvent -256 (int (*)(...))QQuickItem::mouseUngrabEvent -264 (int (*)(...))QQuickItem::touchUngrabEvent -272 (int (*)(...))QQuickItem::wheelEvent -280 (int (*)(...))QQuickItem::touchEvent -288 (int (*)(...))QQuickItem::hoverEnterEvent -296 (int (*)(...))QQuickItem::hoverMoveEvent -304 (int (*)(...))QQuickItem::hoverLeaveEvent -312 (int (*)(...))QQuickItem::dragEnterEvent -320 (int (*)(...))QQuickItem::dragMoveEvent -328 (int (*)(...))QQuickItem::dragLeaveEvent -336 (int (*)(...))QQuickItem::dropEvent -344 (int (*)(...))QQuickItem::childMouseEventFilter -352 (int (*)(...))QQuickItem::windowDeactivateEvent -360 (int (*)(...))QQuickFramebufferObject::geometryChanged -368 (int (*)(...))QQuickFramebufferObject::updatePaintNode -376 (int (*)(...))QQuickFramebufferObject::releaseResources -384 (int (*)(...))QQuickItem::updatePolish -392 (int (*)(...))__cxa_pure_virtual -400 (int (*)(...))-16 -408 (int (*)(...))(& _ZTI23QQuickFramebufferObject) -416 0u -424 0u -432 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem10classBeginEv -440 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem17componentCompleteEv - -Class QQuickFramebufferObject - size=32 align=8 - base size=32 base align=8 -QQuickFramebufferObject (0x0x7f64e4839548) 0 - vptr=((& QQuickFramebufferObject::_ZTV23QQuickFramebufferObject) + 16u) - QQuickItem (0x0x7f64e49134d0) 0 - primary-for QQuickFramebufferObject (0x0x7f64e4839548) - QObject (0x0x7f64e4848a20) 0 - primary-for QQuickItem (0x0x7f64e49134d0) - QQmlParserStatus (0x0x7f64e4848a80) 16 - vptr=((& QQuickFramebufferObject::_ZTV23QQuickFramebufferObject) + 416u) - -Class QQuickTextureFactory::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickTextureFactory::QPrivateSignal (0x0x7f64e4848c00) 0 empty - -Vtable for QQuickTextureFactory -QQuickTextureFactory::_ZTV20QQuickTextureFactory: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QQuickTextureFactory) -16 (int (*)(...))QQuickTextureFactory::metaObject -24 (int (*)(...))QQuickTextureFactory::qt_metacast -32 (int (*)(...))QQuickTextureFactory::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))QQuickTextureFactory::image - -Class QQuickTextureFactory - size=16 align=8 - base size=16 base align=8 -QQuickTextureFactory (0x0x7f64e48395b0) 0 - vptr=((& QQuickTextureFactory::_ZTV20QQuickTextureFactory) + 16u) - QObject (0x0x7f64e4848ba0) 0 - primary-for QQuickTextureFactory (0x0x7f64e48395b0) - -Class QQuickImageResponse::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickImageResponse::QPrivateSignal (0x0x7f64e4848cc0) 0 empty - -Vtable for QQuickImageResponse -QQuickImageResponse::_ZTV19QQuickImageResponse: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQuickImageResponse) -16 (int (*)(...))QQuickImageResponse::metaObject -24 (int (*)(...))QQuickImageResponse::qt_metacast -32 (int (*)(...))QQuickImageResponse::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QQuickImageResponse::errorString -128 (int (*)(...))QQuickImageResponse::cancel - -Class QQuickImageResponse - size=16 align=8 - base size=16 base align=8 -QQuickImageResponse (0x0x7f64e4839618) 0 - vptr=((& QQuickImageResponse::_ZTV19QQuickImageResponse) + 16u) - QObject (0x0x7f64e4848c60) 0 - primary-for QQuickImageResponse (0x0x7f64e4839618) - -Vtable for QQuickImageProvider -QQuickImageProvider::_ZTV19QQuickImageProvider: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQuickImageProvider) -16 (int (*)(...))QQuickImageProvider::~QQuickImageProvider -24 (int (*)(...))QQuickImageProvider::~QQuickImageProvider -32 (int (*)(...))QQuickImageProvider::imageType -40 (int (*)(...))QQuickImageProvider::flags -48 (int (*)(...))QQuickImageProvider::requestImage -56 (int (*)(...))QQuickImageProvider::requestPixmap -64 (int (*)(...))QQuickImageProvider::requestTexture - -Class QQuickImageProvider - size=16 align=8 - base size=16 base align=8 -QQuickImageProvider (0x0x7f64e4839680) 0 - vptr=((& QQuickImageProvider::_ZTV19QQuickImageProvider) + 16u) - QQmlImageProviderBase (0x0x7f64e4848d20) 0 nearly-empty - primary-for QQuickImageProvider (0x0x7f64e4839680) - -Vtable for QQuickAsyncImageProvider -QQuickAsyncImageProvider::_ZTV24QQuickAsyncImageProvider: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QQuickAsyncImageProvider) -16 0u -24 0u -32 (int (*)(...))QQuickImageProvider::imageType -40 (int (*)(...))QQuickImageProvider::flags -48 (int (*)(...))QQuickImageProvider::requestImage -56 (int (*)(...))QQuickImageProvider::requestPixmap -64 (int (*)(...))QQuickImageProvider::requestTexture -72 (int (*)(...))__cxa_pure_virtual - -Class QQuickAsyncImageProvider - size=24 align=8 - base size=24 base align=8 -QQuickAsyncImageProvider (0x0x7f64e48396e8) 0 - vptr=((& QQuickAsyncImageProvider::_ZTV24QQuickAsyncImageProvider) + 16u) - QQuickImageProvider (0x0x7f64e4839750) 0 - primary-for QQuickAsyncImageProvider (0x0x7f64e48396e8) - QQmlImageProviderBase (0x0x7f64e4848d80) 0 nearly-empty - primary-for QQuickImageProvider (0x0x7f64e4839750) - -Class QQuickItemGrabResult::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickItemGrabResult::QPrivateSignal (0x0x7f64e4848e40) 0 empty - -Vtable for QQuickItemGrabResult -QQuickItemGrabResult::_ZTV20QQuickItemGrabResult: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QQuickItemGrabResult) -16 (int (*)(...))QQuickItemGrabResult::metaObject -24 (int (*)(...))QQuickItemGrabResult::qt_metacast -32 (int (*)(...))QQuickItemGrabResult::qt_metacall -40 (int (*)(...))QQuickItemGrabResult::~QQuickItemGrabResult -48 (int (*)(...))QQuickItemGrabResult::~QQuickItemGrabResult -56 (int (*)(...))QQuickItemGrabResult::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQuickItemGrabResult - size=16 align=8 - base size=16 base align=8 -QQuickItemGrabResult (0x0x7f64e48397b8) 0 - vptr=((& QQuickItemGrabResult::_ZTV20QQuickItemGrabResult) + 16u) - QObject (0x0x7f64e4848de0) 0 - primary-for QQuickItemGrabResult (0x0x7f64e48397b8) - -Class QQuickPaintedItem::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickPaintedItem::QPrivateSignal (0x0x7f64e4848f60) 0 empty - -Vtable for QQuickPaintedItem -QQuickPaintedItem::_ZTV17QQuickPaintedItem: 56u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QQuickPaintedItem) -16 (int (*)(...))QQuickPaintedItem::metaObject -24 (int (*)(...))QQuickPaintedItem::qt_metacast -32 (int (*)(...))QQuickPaintedItem::qt_metacall -40 0u -48 0u -56 (int (*)(...))QQuickItem::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickItem::boundingRect -120 (int (*)(...))QQuickItem::clipRect -128 (int (*)(...))QQuickItem::contains -136 (int (*)(...))QQuickItem::inputMethodQuery -144 (int (*)(...))QQuickPaintedItem::isTextureProvider -152 (int (*)(...))QQuickPaintedItem::textureProvider -160 (int (*)(...))QQuickPaintedItem::itemChange -168 (int (*)(...))QQuickItem::classBegin -176 (int (*)(...))QQuickItem::componentComplete -184 (int (*)(...))QQuickItem::keyPressEvent -192 (int (*)(...))QQuickItem::keyReleaseEvent -200 (int (*)(...))QQuickItem::inputMethodEvent -208 (int (*)(...))QQuickItem::focusInEvent -216 (int (*)(...))QQuickItem::focusOutEvent -224 (int (*)(...))QQuickItem::mousePressEvent -232 (int (*)(...))QQuickItem::mouseMoveEvent -240 (int (*)(...))QQuickItem::mouseReleaseEvent -248 (int (*)(...))QQuickItem::mouseDoubleClickEvent -256 (int (*)(...))QQuickItem::mouseUngrabEvent -264 (int (*)(...))QQuickItem::touchUngrabEvent -272 (int (*)(...))QQuickItem::wheelEvent -280 (int (*)(...))QQuickItem::touchEvent -288 (int (*)(...))QQuickItem::hoverEnterEvent -296 (int (*)(...))QQuickItem::hoverMoveEvent -304 (int (*)(...))QQuickItem::hoverLeaveEvent -312 (int (*)(...))QQuickItem::dragEnterEvent -320 (int (*)(...))QQuickItem::dragMoveEvent -328 (int (*)(...))QQuickItem::dragLeaveEvent -336 (int (*)(...))QQuickItem::dropEvent -344 (int (*)(...))QQuickItem::childMouseEventFilter -352 (int (*)(...))QQuickItem::windowDeactivateEvent -360 (int (*)(...))QQuickItem::geometryChanged -368 (int (*)(...))QQuickPaintedItem::updatePaintNode -376 (int (*)(...))QQuickPaintedItem::releaseResources -384 (int (*)(...))QQuickItem::updatePolish -392 (int (*)(...))__cxa_pure_virtual -400 (int (*)(...))-16 -408 (int (*)(...))(& _ZTI17QQuickPaintedItem) -416 0u -424 0u -432 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem10classBeginEv -440 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem17componentCompleteEv - -Class QQuickPaintedItem - size=32 align=8 - base size=32 base align=8 -QQuickPaintedItem (0x0x7f64e4839820) 0 - vptr=((& QQuickPaintedItem::_ZTV17QQuickPaintedItem) + 16u) - QQuickItem (0x0x7f64e455a2a0) 0 - primary-for QQuickPaintedItem (0x0x7f64e4839820) - QObject (0x0x7f64e4848ea0) 0 - primary-for QQuickItem (0x0x7f64e455a2a0) - QQmlParserStatus (0x0x7f64e4848f00) 16 - vptr=((& QQuickPaintedItem::_ZTV17QQuickPaintedItem) + 416u) - -Class QQuickRenderControl::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickRenderControl::QPrivateSignal (0x0x7f64e45861e0) 0 empty - -Vtable for QQuickRenderControl -QQuickRenderControl::_ZTV19QQuickRenderControl: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQuickRenderControl) -16 (int (*)(...))QQuickRenderControl::metaObject -24 (int (*)(...))QQuickRenderControl::qt_metacast -32 (int (*)(...))QQuickRenderControl::qt_metacall -40 (int (*)(...))QQuickRenderControl::~QQuickRenderControl -48 (int (*)(...))QQuickRenderControl::~QQuickRenderControl -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickRenderControl::renderWindow - -Class QQuickRenderControl - size=16 align=8 - base size=16 base align=8 -QQuickRenderControl (0x0x7f64e48399c0) 0 - vptr=((& QQuickRenderControl::_ZTV19QQuickRenderControl) + 16u) - QObject (0x0x7f64e4586180) 0 - primary-for QQuickRenderControl (0x0x7f64e48399c0) - -Class QQuickTextDocument::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickTextDocument::QPrivateSignal (0x0x7f64e45862a0) 0 empty - -Vtable for QQuickTextDocument -QQuickTextDocument::_ZTV18QQuickTextDocument: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QQuickTextDocument) -16 (int (*)(...))QQuickTextDocument::metaObject -24 (int (*)(...))QQuickTextDocument::qt_metacast -32 (int (*)(...))QQuickTextDocument::qt_metacall -40 (int (*)(...))QQuickTextDocument::~QQuickTextDocument -48 (int (*)(...))QQuickTextDocument::~QQuickTextDocument -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQuickTextDocument - size=16 align=8 - base size=16 base align=8 -QQuickTextDocument (0x0x7f64e4839a28) 0 - vptr=((& QQuickTextDocument::_ZTV18QQuickTextDocument) + 16u) - QObject (0x0x7f64e4586240) 0 - primary-for QQuickTextDocument (0x0x7f64e4839a28) - -Class QSGGeometry::Attribute - size=16 align=4 - base size=16 base align=4 -QSGGeometry::Attribute (0x0x7f64e4586600) 0 - -Class QSGGeometry::AttributeSet - size=16 align=8 - base size=16 base align=8 -QSGGeometry::AttributeSet (0x0x7f64e4586660) 0 - -Class QSGGeometry::Point2D - size=8 align=4 - base size=8 base align=4 -QSGGeometry::Point2D (0x0x7f64e45866c0) 0 - -Class QSGGeometry::TexturedPoint2D - size=16 align=4 - base size=16 base align=4 -QSGGeometry::TexturedPoint2D (0x0x7f64e4586720) 0 - -Class QSGGeometry::ColoredPoint2D - size=12 align=4 - base size=12 base align=4 -QSGGeometry::ColoredPoint2D (0x0x7f64e4586780) 0 - -Vtable for QSGGeometry -QSGGeometry::_ZTV11QSGGeometry: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGGeometry) -16 (int (*)(...))QSGGeometry::~QSGGeometry -24 (int (*)(...))QSGGeometry::~QSGGeometry - -Class QSGGeometry - size=128 align=8 - base size=128 base align=8 -QSGGeometry (0x0x7f64e45865a0) 0 - vptr=((& QSGGeometry::_ZTV11QSGGeometry) + 16u) - -Vtable for QSGNode -QSGNode::_ZTV7QSGNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QSGNode) -16 (int (*)(...))QSGNode::~QSGNode -24 (int (*)(...))QSGNode::~QSGNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGNode - size=80 align=8 - base size=80 base align=8 -QSGNode (0x0x7f64e4586c60) 0 - vptr=((& QSGNode::_ZTV7QSGNode) + 16u) - -Vtable for QSGBasicGeometryNode -QSGBasicGeometryNode::_ZTV20QSGBasicGeometryNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGBasicGeometryNode) -16 (int (*)(...))QSGBasicGeometryNode::~QSGBasicGeometryNode -24 (int (*)(...))QSGBasicGeometryNode::~QSGBasicGeometryNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGBasicGeometryNode - size=112 align=8 - base size=112 base align=8 -QSGBasicGeometryNode (0x0x7f64e4692138) 0 - vptr=((& QSGBasicGeometryNode::_ZTV20QSGBasicGeometryNode) + 16u) - QSGNode (0x0x7f64e46b7060) 0 - primary-for QSGBasicGeometryNode (0x0x7f64e4692138) - -Vtable for QSGGeometryNode -QSGGeometryNode::_ZTV15QSGGeometryNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QSGGeometryNode) -16 (int (*)(...))QSGGeometryNode::~QSGGeometryNode -24 (int (*)(...))QSGGeometryNode::~QSGGeometryNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGGeometryNode - size=144 align=8 - base size=144 base align=8 -QSGGeometryNode (0x0x7f64e46921a0) 0 - vptr=((& QSGGeometryNode::_ZTV15QSGGeometryNode) + 16u) - QSGBasicGeometryNode (0x0x7f64e4692208) 0 - primary-for QSGGeometryNode (0x0x7f64e46921a0) - QSGNode (0x0x7f64e46b70c0) 0 - primary-for QSGBasicGeometryNode (0x0x7f64e4692208) - -Vtable for QSGClipNode -QSGClipNode::_ZTV11QSGClipNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGClipNode) -16 (int (*)(...))QSGClipNode::~QSGClipNode -24 (int (*)(...))QSGClipNode::~QSGClipNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGClipNode - size=152 align=8 - base size=152 base align=8 -QSGClipNode (0x0x7f64e4692270) 0 - vptr=((& QSGClipNode::_ZTV11QSGClipNode) + 16u) - QSGBasicGeometryNode (0x0x7f64e46922d8) 0 - primary-for QSGClipNode (0x0x7f64e4692270) - QSGNode (0x0x7f64e46b7120) 0 - primary-for QSGBasicGeometryNode (0x0x7f64e46922d8) - -Vtable for QSGTransformNode -QSGTransformNode::_ZTV16QSGTransformNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QSGTransformNode) -16 (int (*)(...))QSGTransformNode::~QSGTransformNode -24 (int (*)(...))QSGTransformNode::~QSGTransformNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGTransformNode - size=216 align=8 - base size=216 base align=8 -QSGTransformNode (0x0x7f64e4692340) 0 - vptr=((& QSGTransformNode::_ZTV16QSGTransformNode) + 16u) - QSGNode (0x0x7f64e46b7180) 0 - primary-for QSGTransformNode (0x0x7f64e4692340) - -Vtable for QSGRootNode -QSGRootNode::_ZTV11QSGRootNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGRootNode) -16 (int (*)(...))QSGRootNode::~QSGRootNode -24 (int (*)(...))QSGRootNode::~QSGRootNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGRootNode - size=88 align=8 - base size=88 base align=8 -QSGRootNode (0x0x7f64e46923a8) 0 - vptr=((& QSGRootNode::_ZTV11QSGRootNode) + 16u) - QSGNode (0x0x7f64e46b71e0) 0 - primary-for QSGRootNode (0x0x7f64e46923a8) - -Vtable for QSGOpacityNode -QSGOpacityNode::_ZTV14QSGOpacityNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QSGOpacityNode) -16 (int (*)(...))QSGOpacityNode::~QSGOpacityNode -24 (int (*)(...))QSGOpacityNode::~QSGOpacityNode -32 (int (*)(...))QSGOpacityNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGOpacityNode - size=96 align=8 - base size=96 base align=8 -QSGOpacityNode (0x0x7f64e4692548) 0 - vptr=((& QSGOpacityNode::_ZTV14QSGOpacityNode) + 16u) - QSGNode (0x0x7f64e46b7360) 0 - primary-for QSGOpacityNode (0x0x7f64e4692548) - -Vtable for QSGNodeVisitor -QSGNodeVisitor::_ZTV14QSGNodeVisitor: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QSGNodeVisitor) -16 (int (*)(...))QSGNodeVisitor::~QSGNodeVisitor -24 (int (*)(...))QSGNodeVisitor::~QSGNodeVisitor -32 (int (*)(...))QSGNodeVisitor::enterTransformNode -40 (int (*)(...))QSGNodeVisitor::leaveTransformNode -48 (int (*)(...))QSGNodeVisitor::enterClipNode -56 (int (*)(...))QSGNodeVisitor::leaveClipNode -64 (int (*)(...))QSGNodeVisitor::enterGeometryNode -72 (int (*)(...))QSGNodeVisitor::leaveGeometryNode -80 (int (*)(...))QSGNodeVisitor::enterOpacityNode -88 (int (*)(...))QSGNodeVisitor::leaveOpacityNode -96 (int (*)(...))QSGNodeVisitor::visitNode -104 (int (*)(...))QSGNodeVisitor::visitChildren - -Class QSGNodeVisitor - size=8 align=8 - base size=8 base align=8 -QSGNodeVisitor (0x0x7f64e46b73c0) 0 nearly-empty - vptr=((& QSGNodeVisitor::_ZTV14QSGNodeVisitor) + 16u) - -Vtable for QSGRendererInterface -QSGRendererInterface::_ZTV20QSGRendererInterface: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGRendererInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QSGRendererInterface::getResource -48 (int (*)(...))QSGRendererInterface::getResource -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual - -Class QSGRendererInterface - size=8 align=8 - base size=8 base align=8 -QSGRendererInterface (0x0x7f64e46b7420) 0 nearly-empty - vptr=((& QSGRendererInterface::_ZTV20QSGRendererInterface) + 16u) - -Class QQuickWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickWindow::QPrivateSignal (0x0x7f64e46b7840) 0 empty - -Vtable for QQuickWindow -QQuickWindow::_ZTV12QQuickWindow: 45u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QQuickWindow) -16 (int (*)(...))QQuickWindow::metaObject -24 (int (*)(...))QQuickWindow::qt_metacast -32 (int (*)(...))QQuickWindow::qt_metacall -40 (int (*)(...))QQuickWindow::~QQuickWindow -48 (int (*)(...))QQuickWindow::~QQuickWindow -56 (int (*)(...))QQuickWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QQuickWindow::accessibleRoot -144 (int (*)(...))QQuickWindow::focusObject -152 (int (*)(...))QQuickWindow::exposeEvent -160 (int (*)(...))QQuickWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QQuickWindow::focusInEvent -184 (int (*)(...))QQuickWindow::focusOutEvent -192 (int (*)(...))QQuickWindow::showEvent -200 (int (*)(...))QQuickWindow::hideEvent -208 (int (*)(...))QQuickWindow::keyPressEvent -216 (int (*)(...))QQuickWindow::keyReleaseEvent -224 (int (*)(...))QQuickWindow::mousePressEvent -232 (int (*)(...))QQuickWindow::mouseReleaseEvent -240 (int (*)(...))QQuickWindow::mouseDoubleClickEvent -248 (int (*)(...))QQuickWindow::mouseMoveEvent -256 (int (*)(...))QQuickWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))-16 -304 (int (*)(...))(& _ZTI12QQuickWindow) -312 (int (*)(...))QQuickWindow::_ZThn16_N12QQuickWindowD1Ev -320 (int (*)(...))QQuickWindow::_ZThn16_N12QQuickWindowD0Ev -328 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -336 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -344 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv - -Class QQuickWindow - size=40 align=8 - base size=40 base align=8 -QQuickWindow (0x0x7f64e4692750) 0 - vptr=((& QQuickWindow::_ZTV12QQuickWindow) + 16u) - QWindow (0x0x7f64e43a7930) 0 - primary-for QQuickWindow (0x0x7f64e4692750) - QObject (0x0x7f64e46b7780) 0 - primary-for QWindow (0x0x7f64e43a7930) - QSurface (0x0x7f64e46b77e0) 16 - vptr=((& QQuickWindow::_ZTV12QQuickWindow) + 312u) - -Class QQuickView::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickView::QPrivateSignal (0x0x7f64e46b7c00) 0 empty - -Vtable for QQuickView -QQuickView::_ZTV10QQuickView: 45u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QQuickView) -16 (int (*)(...))QQuickView::metaObject -24 (int (*)(...))QQuickView::qt_metacast -32 (int (*)(...))QQuickView::qt_metacall -40 (int (*)(...))QQuickView::~QQuickView -48 (int (*)(...))QQuickView::~QQuickView -56 (int (*)(...))QQuickWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QQuickView::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QQuickWindow::accessibleRoot -144 (int (*)(...))QQuickWindow::focusObject -152 (int (*)(...))QQuickWindow::exposeEvent -160 (int (*)(...))QQuickView::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QQuickWindow::focusInEvent -184 (int (*)(...))QQuickWindow::focusOutEvent -192 (int (*)(...))QQuickWindow::showEvent -200 (int (*)(...))QQuickWindow::hideEvent -208 (int (*)(...))QQuickView::keyPressEvent -216 (int (*)(...))QQuickView::keyReleaseEvent -224 (int (*)(...))QQuickView::mousePressEvent -232 (int (*)(...))QQuickView::mouseReleaseEvent -240 (int (*)(...))QQuickWindow::mouseDoubleClickEvent -248 (int (*)(...))QQuickView::mouseMoveEvent -256 (int (*)(...))QQuickWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))-16 -304 (int (*)(...))(& _ZTI10QQuickView) -312 (int (*)(...))QQuickView::_ZThn16_N10QQuickViewD1Ev -320 (int (*)(...))QQuickView::_ZThn16_N10QQuickViewD0Ev -328 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -336 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -344 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv - -Class QQuickView - size=40 align=8 - base size=40 base align=8 -QQuickView (0x0x7f64e4692888) 0 - vptr=((& QQuickView::_ZTV10QQuickView) + 16u) - QQuickWindow (0x0x7f64e46928f0) 0 - primary-for QQuickView (0x0x7f64e4692888) - QWindow (0x0x7f64e43e1bd0) 0 - primary-for QQuickWindow (0x0x7f64e46928f0) - QObject (0x0x7f64e46b7b40) 0 - primary-for QWindow (0x0x7f64e43e1bd0) - QSurface (0x0x7f64e46b7ba0) 16 - vptr=((& QQuickView::_ZTV10QQuickView) + 312u) - -Class QSGAbstractRenderer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGAbstractRenderer::QPrivateSignal (0x0x7f64e46b7cc0) 0 empty - -Vtable for QSGAbstractRenderer -QSGAbstractRenderer::_ZTV19QSGAbstractRenderer: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QSGAbstractRenderer) -16 (int (*)(...))QSGAbstractRenderer::metaObject -24 (int (*)(...))QSGAbstractRenderer::qt_metacast -32 (int (*)(...))QSGAbstractRenderer::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QSGAbstractRenderer - size=16 align=8 - base size=16 base align=8 -QSGAbstractRenderer (0x0x7f64e4692958) 0 - vptr=((& QSGAbstractRenderer::_ZTV19QSGAbstractRenderer) + 16u) - QObject (0x0x7f64e46b7c60) 0 - primary-for QSGAbstractRenderer (0x0x7f64e4692958) - -Class QSGEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGEngine::QPrivateSignal (0x0x7f64e46b7f00) 0 empty - -Vtable for QSGEngine -QSGEngine::_ZTV9QSGEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QSGEngine) -16 (int (*)(...))QSGEngine::metaObject -24 (int (*)(...))QSGEngine::qt_metacast -32 (int (*)(...))QSGEngine::qt_metacall -40 (int (*)(...))QSGEngine::~QSGEngine -48 (int (*)(...))QSGEngine::~QSGEngine -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSGEngine - size=16 align=8 - base size=16 base align=8 -QSGEngine (0x0x7f64e4692a90) 0 - vptr=((& QSGEngine::_ZTV9QSGEngine) + 16u) - QObject (0x0x7f64e46b7ea0) 0 - primary-for QSGEngine (0x0x7f64e4692a90) - -Class QSGMaterialShader::RenderState - size=16 align=8 - base size=16 base align=8 -QSGMaterialShader::RenderState (0x0x7f64e44911e0) 0 - -Vtable for QSGMaterialShader -QSGMaterialShader::_ZTV17QSGMaterialShader: 12u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSGMaterialShader) -16 0u -24 0u -32 (int (*)(...))QSGMaterialShader::activate -40 (int (*)(...))QSGMaterialShader::deactivate -48 (int (*)(...))QSGMaterialShader::updateState -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))QSGMaterialShader::compile -72 (int (*)(...))QSGMaterialShader::initialize -80 (int (*)(...))QSGMaterialShader::vertexShader -88 (int (*)(...))QSGMaterialShader::fragmentShader - -Class QSGMaterialShader - size=32 align=8 - base size=32 base align=8 -QSGMaterialShader (0x0x7f64e4491180) 0 - vptr=((& QSGMaterialShader::_ZTV17QSGMaterialShader) + 16u) - -Class QSGMaterialType - size=1 align=1 - base size=0 base align=1 -QSGMaterialType (0x0x7f64e4491480) 0 empty - -Vtable for QSGMaterial -QSGMaterial::_ZTV11QSGMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGMaterial) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QSGMaterial::compare - -Class QSGMaterial - size=24 align=8 - base size=24 base align=8 -QSGMaterial (0x0x7f64e44914e0) 0 - vptr=((& QSGMaterial::_ZTV11QSGMaterial) + 16u) - -Vtable for QSGFlatColorMaterial -QSGFlatColorMaterial::_ZTV20QSGFlatColorMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGFlatColorMaterial) -16 (int (*)(...))QSGFlatColorMaterial::~QSGFlatColorMaterial -24 (int (*)(...))QSGFlatColorMaterial::~QSGFlatColorMaterial -32 (int (*)(...))QSGFlatColorMaterial::type -40 (int (*)(...))QSGFlatColorMaterial::createShader -48 (int (*)(...))QSGFlatColorMaterial::compare - -Class QSGFlatColorMaterial - size=40 align=8 - base size=40 base align=8 -QSGFlatColorMaterial (0x0x7f64e4692dd0) 0 - vptr=((& QSGFlatColorMaterial::_ZTV20QSGFlatColorMaterial) + 16u) - QSGMaterial (0x0x7f64e44916c0) 0 - primary-for QSGFlatColorMaterial (0x0x7f64e4692dd0) - -Class QSGTexture::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGTexture::QPrivateSignal (0x0x7f64e4491780) 0 empty - -Vtable for QSGTexture -QSGTexture::_ZTV10QSGTexture: 22u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QSGTexture) -16 (int (*)(...))QSGTexture::metaObject -24 (int (*)(...))QSGTexture::qt_metacast -32 (int (*)(...))QSGTexture::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))QSGTexture::normalizedTextureSubRect -152 (int (*)(...))QSGTexture::isAtlasTexture -160 (int (*)(...))QSGTexture::removedFromAtlas -168 (int (*)(...))__cxa_pure_virtual - -Class QSGTexture - size=16 align=8 - base size=16 base align=8 -QSGTexture (0x0x7f64e4692e38) 0 - vptr=((& QSGTexture::_ZTV10QSGTexture) + 16u) - QObject (0x0x7f64e4491720) 0 - primary-for QSGTexture (0x0x7f64e4692e38) - -Class QSGDynamicTexture::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGDynamicTexture::QPrivateSignal (0x0x7f64e4491840) 0 empty - -Vtable for QSGDynamicTexture -QSGDynamicTexture::_ZTV17QSGDynamicTexture: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSGDynamicTexture) -16 (int (*)(...))QSGDynamicTexture::metaObject -24 (int (*)(...))QSGDynamicTexture::qt_metacast -32 (int (*)(...))QSGDynamicTexture::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))QSGTexture::normalizedTextureSubRect -152 (int (*)(...))QSGTexture::isAtlasTexture -160 (int (*)(...))QSGTexture::removedFromAtlas -168 (int (*)(...))__cxa_pure_virtual -176 (int (*)(...))__cxa_pure_virtual - -Class QSGDynamicTexture - size=16 align=8 - base size=16 base align=8 -QSGDynamicTexture (0x0x7f64e4692ea0) 0 - vptr=((& QSGDynamicTexture::_ZTV17QSGDynamicTexture) + 16u) - QSGTexture (0x0x7f64e4692f08) 0 - primary-for QSGDynamicTexture (0x0x7f64e4692ea0) - QObject (0x0x7f64e44917e0) 0 - primary-for QSGTexture (0x0x7f64e4692f08) - -Vtable for QSGImageNode -QSGImageNode::_ZTV12QSGImageNode: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QSGImageNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual - -Class QSGImageNode - size=144 align=8 - base size=144 base align=8 -QSGImageNode (0x0x7f64e4692f70) 0 - vptr=((& QSGImageNode::_ZTV12QSGImageNode) + 16u) - QSGGeometryNode (0x0x7f64e4168000) 0 - primary-for QSGImageNode (0x0x7f64e4692f70) - QSGBasicGeometryNode (0x0x7f64e4168068) 0 - primary-for QSGGeometryNode (0x0x7f64e4168000) - QSGNode (0x0x7f64e44918a0) 0 - primary-for QSGBasicGeometryNode (0x0x7f64e4168068) - -Vtable for QSGNinePatchNode -QSGNinePatchNode::_ZTV16QSGNinePatchNode: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QSGNinePatchNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual - -Class QSGNinePatchNode - size=144 align=8 - base size=144 base align=8 -QSGNinePatchNode (0x0x7f64e41681a0) 0 - vptr=((& QSGNinePatchNode::_ZTV16QSGNinePatchNode) + 16u) - QSGGeometryNode (0x0x7f64e4168208) 0 - primary-for QSGNinePatchNode (0x0x7f64e41681a0) - QSGBasicGeometryNode (0x0x7f64e4168270) 0 - primary-for QSGGeometryNode (0x0x7f64e4168208) - QSGNode (0x0x7f64e4491a80) 0 - primary-for QSGBasicGeometryNode (0x0x7f64e4168270) - -Vtable for QSGRectangleNode -QSGRectangleNode::_ZTV16QSGRectangleNode: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QSGRectangleNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual - -Class QSGRectangleNode - size=144 align=8 - base size=144 base align=8 -QSGRectangleNode (0x0x7f64e41682d8) 0 - vptr=((& QSGRectangleNode::_ZTV16QSGRectangleNode) + 16u) - QSGGeometryNode (0x0x7f64e4168340) 0 - primary-for QSGRectangleNode (0x0x7f64e41682d8) - QSGBasicGeometryNode (0x0x7f64e41683a8) 0 - primary-for QSGGeometryNode (0x0x7f64e4168340) - QSGNode (0x0x7f64e4491ae0) 0 - primary-for QSGBasicGeometryNode (0x0x7f64e41683a8) - -Vtable for QSGRenderNode::RenderState -QSGRenderNode::RenderState::_ZTVN13QSGRenderNode11RenderStateE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN13QSGRenderNode11RenderStateE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))QSGRenderNode::RenderState::get - -Class QSGRenderNode::RenderState - size=8 align=8 - base size=8 base align=8 -QSGRenderNode::RenderState (0x0x7f64e4491ba0) 0 nearly-empty - vptr=((& QSGRenderNode::RenderState::_ZTVN13QSGRenderNode11RenderStateE) + 16u) - -Vtable for QSGRenderNode -QSGRenderNode::_ZTV13QSGRenderNode: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QSGRenderNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))QSGRenderNode::changedStates -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))QSGRenderNode::releaseResources -72 (int (*)(...))QSGRenderNode::flags -80 (int (*)(...))QSGRenderNode::rect - -Class QSGRenderNode - size=88 align=8 - base size=88 base align=8 -QSGRenderNode (0x0x7f64e4168410) 0 - vptr=((& QSGRenderNode::_ZTV13QSGRenderNode) + 16u) - QSGNode (0x0x7f64e4491b40) 0 - primary-for QSGRenderNode (0x0x7f64e4168410) - -Vtable for QSGSimpleRectNode -QSGSimpleRectNode::_ZTV17QSGSimpleRectNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSGSimpleRectNode) -16 (int (*)(...))QSGSimpleRectNode::~QSGSimpleRectNode -24 (int (*)(...))QSGSimpleRectNode::~QSGSimpleRectNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGSimpleRectNode - size=320 align=8 - base size=320 base align=8 -QSGSimpleRectNode (0x0x7f64e4168888) 0 - vptr=((& QSGSimpleRectNode::_ZTV17QSGSimpleRectNode) + 16u) - QSGGeometryNode (0x0x7f64e41688f0) 0 - primary-for QSGSimpleRectNode (0x0x7f64e4168888) - QSGBasicGeometryNode (0x0x7f64e4168958) 0 - primary-for QSGGeometryNode (0x0x7f64e41688f0) - QSGNode (0x0x7f64e424b1e0) 0 - primary-for QSGBasicGeometryNode (0x0x7f64e4168958) - -Vtable for QSGOpaqueTextureMaterial -QSGOpaqueTextureMaterial::_ZTV24QSGOpaqueTextureMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QSGOpaqueTextureMaterial) -16 (int (*)(...))QSGOpaqueTextureMaterial::~QSGOpaqueTextureMaterial -24 (int (*)(...))QSGOpaqueTextureMaterial::~QSGOpaqueTextureMaterial -32 (int (*)(...))QSGOpaqueTextureMaterial::type -40 (int (*)(...))QSGOpaqueTextureMaterial::createShader -48 (int (*)(...))QSGOpaqueTextureMaterial::compare - -Class QSGOpaqueTextureMaterial - size=40 align=8 - base size=36 base align=8 -QSGOpaqueTextureMaterial (0x0x7f64e41689c0) 0 - vptr=((& QSGOpaqueTextureMaterial::_ZTV24QSGOpaqueTextureMaterial) + 16u) - QSGMaterial (0x0x7f64e424b240) 0 - primary-for QSGOpaqueTextureMaterial (0x0x7f64e41689c0) - -Vtable for QSGTextureMaterial -QSGTextureMaterial::_ZTV18QSGTextureMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QSGTextureMaterial) -16 (int (*)(...))QSGTextureMaterial::~QSGTextureMaterial -24 (int (*)(...))QSGTextureMaterial::~QSGTextureMaterial -32 (int (*)(...))QSGTextureMaterial::type -40 (int (*)(...))QSGTextureMaterial::createShader -48 (int (*)(...))QSGOpaqueTextureMaterial::compare - -Class QSGTextureMaterial - size=40 align=8 - base size=36 base align=8 -QSGTextureMaterial (0x0x7f64e4168a28) 0 - vptr=((& QSGTextureMaterial::_ZTV18QSGTextureMaterial) + 16u) - QSGOpaqueTextureMaterial (0x0x7f64e4168a90) 0 - primary-for QSGTextureMaterial (0x0x7f64e4168a28) - QSGMaterial (0x0x7f64e424b2a0) 0 - primary-for QSGOpaqueTextureMaterial (0x0x7f64e4168a90) - -Vtable for QSGSimpleTextureNode -QSGSimpleTextureNode::_ZTV20QSGSimpleTextureNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGSimpleTextureNode) -16 (int (*)(...))QSGSimpleTextureNode::~QSGSimpleTextureNode -24 (int (*)(...))QSGSimpleTextureNode::~QSGSimpleTextureNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGSimpleTextureNode - size=384 align=8 - base size=384 base align=8 -QSGSimpleTextureNode (0x0x7f64e4168af8) 0 - vptr=((& QSGSimpleTextureNode::_ZTV20QSGSimpleTextureNode) + 16u) - QSGGeometryNode (0x0x7f64e4168b60) 0 - primary-for QSGSimpleTextureNode (0x0x7f64e4168af8) - QSGBasicGeometryNode (0x0x7f64e4168bc8) 0 - primary-for QSGGeometryNode (0x0x7f64e4168b60) - QSGNode (0x0x7f64e424b300) 0 - primary-for QSGBasicGeometryNode (0x0x7f64e4168bc8) - -Class QSGTextureProvider::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGTextureProvider::QPrivateSignal (0x0x7f64e424b5a0) 0 empty - -Vtable for QSGTextureProvider -QSGTextureProvider::_ZTV18QSGTextureProvider: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QSGTextureProvider) -16 (int (*)(...))QSGTextureProvider::metaObject -24 (int (*)(...))QSGTextureProvider::qt_metacast -32 (int (*)(...))QSGTextureProvider::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QSGTextureProvider - size=16 align=8 - base size=16 base align=8 -QSGTextureProvider (0x0x7f64e4168d68) 0 - vptr=((& QSGTextureProvider::_ZTV18QSGTextureProvider) + 16u) - QObject (0x0x7f64e424b540) 0 - primary-for QSGTextureProvider (0x0x7f64e4168d68) - -Vtable for QSGVertexColorMaterial -QSGVertexColorMaterial::_ZTV22QSGVertexColorMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QSGVertexColorMaterial) -16 (int (*)(...))QSGVertexColorMaterial::~QSGVertexColorMaterial -24 (int (*)(...))QSGVertexColorMaterial::~QSGVertexColorMaterial -32 (int (*)(...))QSGVertexColorMaterial::type -40 (int (*)(...))QSGVertexColorMaterial::createShader -48 (int (*)(...))QSGVertexColorMaterial::compare - -Class QSGVertexColorMaterial - size=24 align=8 - base size=24 base align=8 -QSGVertexColorMaterial (0x0x7f64e4168dd0) 0 - vptr=((& QSGVertexColorMaterial::_ZTV22QSGVertexColorMaterial) + 16u) - QSGMaterial (0x0x7f64e424b600) 0 - primary-for QSGVertexColorMaterial (0x0x7f64e4168dd0) - -Class QQuickStyle - size=1 align=1 - base size=0 base align=1 -QQuickStyle (0x0x7f64e424b660) 0 empty - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt qtquickcontrols2-opensource-src-5.9.5/tests/auto/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,11123 +0,0 @@ -Class std::__failure_type - size=1 align=1 - base size=0 base align=1 -std::__failure_type (0x0x7f5a2fe2c660) 0 empty - -Class std::__do_is_destructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_destructible_impl (0x0x7f5a2fa18de0) 0 empty - -Class std::__do_is_nt_destructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_nt_destructible_impl (0x0x7f5a2fa43060) 0 empty - -Class std::__do_is_default_constructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_default_constructible_impl (0x0x7f5a2fa432a0) 0 empty - -Class std::__do_is_static_castable_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_static_castable_impl (0x0x7f5a2fa434e0) 0 empty - -Class std::__do_is_direct_constructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_direct_constructible_impl (0x0x7f5a2fa43660) 0 empty - -Class std::__do_is_nary_constructible_impl - size=1 align=1 - base size=0 base align=1 -std::__do_is_nary_constructible_impl (0x0x7f5a2fa43a20) 0 empty - -Class std::__do_common_type_impl - size=1 align=1 - base size=0 base align=1 -std::__do_common_type_impl (0x0x7f5a2fafd1e0) 0 empty - -Class std::__do_member_type_wrapper - size=1 align=1 - base size=0 base align=1 -std::__do_member_type_wrapper (0x0x7f5a2fafd2a0) 0 empty - -Class std::__result_of_memfun_ref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memfun_ref_impl (0x0x7f5a2fafd600) 0 empty - -Class std::__result_of_memfun_deref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memfun_deref_impl (0x0x7f5a2fafd6c0) 0 empty - -Class std::__result_of_memobj_ref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memobj_ref_impl (0x0x7f5a2fafd780) 0 empty - -Class std::__result_of_memobj_deref_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_memobj_deref_impl (0x0x7f5a2fafd840) 0 empty - -Class std::__result_of_other_impl - size=1 align=1 - base size=0 base align=1 -std::__result_of_other_impl (0x0x7f5a2fafdae0) 0 empty - -Class std::piecewise_construct_t - size=1 align=1 - base size=0 base align=1 -std::piecewise_construct_t (0x0x7f5a2fafdcc0) 0 empty - -Class std::__true_type - size=1 align=1 - base size=0 base align=1 -std::__true_type (0x0x7f5a2fb7d180) 0 empty - -Class std::__false_type - size=1 align=1 - base size=0 base align=1 -std::__false_type (0x0x7f5a2fb7d1e0) 0 empty - -Class std::input_iterator_tag - size=1 align=1 - base size=0 base align=1 -std::input_iterator_tag (0x0x7f5a2fbb7e40) 0 empty - -Class std::output_iterator_tag - size=1 align=1 - base size=0 base align=1 -std::output_iterator_tag (0x0x7f5a2fbb7ea0) 0 empty - -Class std::forward_iterator_tag - size=1 align=1 - base size=1 base align=1 -std::forward_iterator_tag (0x0x7f5a2fb06680) 0 empty - std::input_iterator_tag (0x0x7f5a2fbb7f00) 0 empty - -Class std::bidirectional_iterator_tag - size=1 align=1 - base size=1 base align=1 -std::bidirectional_iterator_tag (0x0x7f5a2fb066e8) 0 empty - std::forward_iterator_tag (0x0x7f5a2fb06750) 0 empty - std::input_iterator_tag (0x0x7f5a2fbb7f60) 0 empty - -Class std::random_access_iterator_tag - size=1 align=1 - base size=1 base align=1 -std::random_access_iterator_tag (0x0x7f5a2fb067b8) 0 empty - std::bidirectional_iterator_tag (0x0x7f5a2fb06820) 0 empty - std::forward_iterator_tag (0x0x7f5a2fb06888) 0 empty - std::input_iterator_tag (0x0x7f5a2fbe3000) 0 empty - -Class __gnu_cxx::__ops::_Iter_less_iter - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_less_iter (0x0x7f5a2fbe3c60) 0 empty - -Class __gnu_cxx::__ops::_Iter_less_val - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_less_val (0x0x7f5a2fbe3cc0) 0 empty - -Class __gnu_cxx::__ops::_Val_less_iter - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Val_less_iter (0x0x7f5a2fbe3d20) 0 empty - -Class __gnu_cxx::__ops::_Iter_equal_to_iter - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_equal_to_iter (0x0x7f5a2fbe3d80) 0 empty - -Class __gnu_cxx::__ops::_Iter_equal_to_val - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__ops::_Iter_equal_to_val (0x0x7f5a2fbe3de0) 0 empty - -Class wait - size=4 align=4 - base size=4 base align=4 -wait (0x0x7f5a2f8b4900) 0 - -Class __locale_struct - size=232 align=8 - base size=232 base align=8 -__locale_struct (0x0x7f5a2f8b4b40) 0 - -Class timespec - size=16 align=8 - base size=16 base align=8 -timespec (0x0x7f5a2f8b4c00) 0 - -Class timeval - size=16 align=8 - base size=16 base align=8 -timeval (0x0x7f5a2f8b4c60) 0 - -Class pthread_attr_t - size=56 align=8 - base size=56 base align=8 -pthread_attr_t (0x0x7f5a2f8b4d20) 0 - -Class __pthread_internal_list - size=16 align=8 - base size=16 base align=8 -__pthread_internal_list (0x0x7f5a2f8b4d80) 0 - -Class random_data - size=48 align=8 - base size=48 base align=8 -random_data (0x0x7f5a2f958240) 0 - -Class drand48_data - size=24 align=8 - base size=24 base align=8 -drand48_data (0x0x7f5a2f9582a0) 0 - -Vtable for std::exception -std::exception::_ZTVSt9exception: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt9exception) -16 (int (*)(...))std::exception::~exception -24 (int (*)(...))std::exception::~exception -32 (int (*)(...))std::exception::what - -Class std::exception - size=8 align=8 - base size=8 base align=8 -std::exception (0x0x7f5a2f958300) 0 nearly-empty - vptr=((& std::exception::_ZTVSt9exception) + 16u) - -Vtable for std::bad_exception -std::bad_exception::_ZTVSt13bad_exception: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13bad_exception) -16 (int (*)(...))std::bad_exception::~bad_exception -24 (int (*)(...))std::bad_exception::~bad_exception -32 (int (*)(...))std::bad_exception::what - -Class std::bad_exception - size=8 align=8 - base size=8 base align=8 -std::bad_exception (0x0x7f5a2fb06dd0) 0 nearly-empty - vptr=((& std::bad_exception::_ZTVSt13bad_exception) + 16u) - std::exception (0x0x7f5a2f958360) 0 nearly-empty - primary-for std::bad_exception (0x0x7f5a2fb06dd0) - -Class std::__exception_ptr::exception_ptr - size=8 align=8 - base size=8 base align=8 -std::__exception_ptr::exception_ptr (0x0x7f5a2f9583c0) 0 - -Vtable for std::nested_exception -std::nested_exception::_ZTVSt16nested_exception: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt16nested_exception) -16 (int (*)(...))std::nested_exception::~nested_exception -24 (int (*)(...))std::nested_exception::~nested_exception - -Class std::nested_exception - size=16 align=8 - base size=16 base align=8 -std::nested_exception (0x0x7f5a2f958420) 0 - vptr=((& std::nested_exception::_ZTVSt16nested_exception) + 16u) - -Vtable for std::bad_alloc -std::bad_alloc::_ZTVSt9bad_alloc: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt9bad_alloc) -16 (int (*)(...))std::bad_alloc::~bad_alloc -24 (int (*)(...))std::bad_alloc::~bad_alloc -32 (int (*)(...))std::bad_alloc::what - -Class std::bad_alloc - size=8 align=8 - base size=8 base align=8 -std::bad_alloc (0x0x7f5a2f645000) 0 nearly-empty - vptr=((& std::bad_alloc::_ZTVSt9bad_alloc) + 16u) - std::exception (0x0x7f5a2f958840) 0 nearly-empty - primary-for std::bad_alloc (0x0x7f5a2f645000) - -Vtable for std::bad_array_new_length -std::bad_array_new_length::_ZTVSt20bad_array_new_length: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt20bad_array_new_length) -16 (int (*)(...))std::bad_array_new_length::~bad_array_new_length -24 (int (*)(...))std::bad_array_new_length::~bad_array_new_length -32 (int (*)(...))std::bad_array_new_length::what - -Class std::bad_array_new_length - size=8 align=8 - base size=8 base align=8 -std::bad_array_new_length (0x0x7f5a2f645068) 0 nearly-empty - vptr=((& std::bad_array_new_length::_ZTVSt20bad_array_new_length) + 16u) - std::bad_alloc (0x0x7f5a2f6450d0) 0 nearly-empty - primary-for std::bad_array_new_length (0x0x7f5a2f645068) - std::exception (0x0x7f5a2f9588a0) 0 nearly-empty - primary-for std::bad_alloc (0x0x7f5a2f6450d0) - -Class std::nothrow_t - size=1 align=1 - base size=0 base align=1 -std::nothrow_t (0x0x7f5a2f958900) 0 empty - -Class __exception - size=40 align=8 - base size=40 base align=8 -__exception (0x0x7f5a2f6cc540) 0 - -Class lconv - size=96 align=8 - base size=96 base align=8 -lconv (0x0x7f5a2f4ec240) 0 - -Vtable for __cxxabiv1::__forced_unwind -__cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN10__cxxabiv115__forced_unwindE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class __cxxabiv1::__forced_unwind - size=8 align=8 - base size=8 base align=8 -__cxxabiv1::__forced_unwind (0x0x7f5a2f4ec2a0) 0 nearly-empty - vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 16u) - -Class sched_param - size=4 align=4 - base size=4 base align=4 -sched_param (0x0x7f5a2f58f180) 0 - -Class __sched_param - size=4 align=4 - base size=4 base align=4 -__sched_param (0x0x7f5a2f58f1e0) 0 - -Class timex - size=208 align=8 - base size=208 base align=8 -timex (0x0x7f5a2f58f2a0) 0 - -Class tm - size=56 align=8 - base size=56 base align=8 -tm (0x0x7f5a2f58f300) 0 - -Class itimerspec - size=32 align=8 - base size=32 base align=8 -itimerspec (0x0x7f5a2f58f360) 0 - -Class _pthread_cleanup_buffer - size=32 align=8 - base size=32 base align=8 -_pthread_cleanup_buffer (0x0x7f5a2f58f3c0) 0 - -Class __pthread_cleanup_frame - size=24 align=8 - base size=24 base align=8 -__pthread_cleanup_frame (0x0x7f5a2f58f4e0) 0 - -Class __pthread_cleanup_class - size=24 align=8 - base size=24 base align=8 -__pthread_cleanup_class (0x0x7f5a2f58f540) 0 - -Class _IO_marker - size=24 align=8 - base size=24 base align=8 -_IO_marker (0x0x7f5a2f58f960) 0 - -Class _IO_FILE - size=216 align=8 - base size=216 base align=8 -_IO_FILE (0x0x7f5a2f58f9c0) 0 - -Class std::_Hash_impl - size=1 align=1 - base size=0 base align=1 -std::_Hash_impl (0x0x7f5a2f0b01e0) 0 empty - -Class std::_Fnv_hash_impl - size=1 align=1 - base size=0 base align=1 -std::_Fnv_hash_impl (0x0x7f5a2f0b0240) 0 empty - -Class std::__numeric_limits_base - size=1 align=1 - base size=0 base align=1 -std::__numeric_limits_base (0x0x7f5a2f18d1e0) 0 empty - -Class std::_Bit_reference - size=16 align=8 - base size=16 base align=8 -std::_Bit_reference (0x0x7f5a2efa3000) 0 - -Class std::_Bit_iterator_base - size=16 align=8 - base size=12 base align=8 -std::_Bit_iterator_base (0x0x7f5a2f0aee38) 0 - std::iterator (0x0x7f5a2efa30c0) 0 empty - -Class std::_Bit_iterator - size=16 align=8 - base size=12 base align=8 -std::_Bit_iterator (0x0x7f5a2f0aeea0) 0 - std::_Bit_iterator_base (0x0x7f5a2f0aef08) 0 - std::iterator (0x0x7f5a2efa3120) 0 empty - -Class std::_Bit_const_iterator - size=16 align=8 - base size=12 base align=8 -std::_Bit_const_iterator (0x0x7f5a2f0aef70) 0 - std::_Bit_iterator_base (0x0x7f5a2f0ae618) 0 - std::iterator (0x0x7f5a2efa3180) 0 empty - -Class std::random_device - size=5000 align=8 - base size=5000 base align=8 -std::random_device (0x0x7f5a2efa3f60) 0 - -Class std::bernoulli_distribution::param_type - size=8 align=8 - base size=8 base align=8 -std::bernoulli_distribution::param_type (0x0x7f5a2ed85d20) 0 - -Class std::bernoulli_distribution - size=8 align=8 - base size=8 base align=8 -std::bernoulli_distribution (0x0x7f5a2ed85cc0) 0 - -Class std::seed_seq - size=24 align=8 - base size=24 base align=8 -std::seed_seq (0x0x7f5a2eabacc0) 0 - -Class qIsNull(double)::U - size=8 align=8 - base size=8 base align=8 -qIsNull(double)::U (0x0x7f5a2d7187e0) 0 - -Class qIsNull(float)::U - size=4 align=4 - base size=4 base align=4 -qIsNull(float)::U (0x0x7f5a2d718840) 0 - -Class QSysInfo - size=1 align=1 - base size=0 base align=1 -QSysInfo (0x0x7f5a2d3fb300) 0 empty - -Class QMessageLogContext - size=32 align=8 - base size=32 base align=8 -QMessageLogContext (0x0x7f5a2d3fb360) 0 - -Class QMessageLogger - size=32 align=8 - base size=32 base align=8 -QMessageLogger (0x0x7f5a2d3fb3c0) 0 - -Class QFlag - size=4 align=4 - base size=4 base align=4 -QFlag (0x0x7f5a2d3fb420) 0 - -Class QIncompatibleFlag - size=4 align=4 - base size=4 base align=4 -QIncompatibleFlag (0x0x7f5a2d3fb6c0) 0 - -Class std::__atomic_flag_base - size=1 align=1 - base size=1 base align=1 -std::__atomic_flag_base (0x0x7f5a2d3fbc00) 0 - -Class std::atomic_flag - size=1 align=1 - base size=1 base align=1 -std::atomic_flag (0x0x7f5a2d3e0d00) 0 - std::__atomic_flag_base (0x0x7f5a2d3fbc60) 0 - -Class QAtomicInt - size=4 align=4 - base size=4 base align=4 -QAtomicInt (0x0x7f5a2d277478) 0 - QAtomicInteger (0x0x7f5a2d2774e0) 0 - QBasicAtomicInteger (0x0x7f5a2cfb33c0) 0 - -Class QInternal - size=1 align=1 - base size=0 base align=1 -QInternal (0x0x7f5a2cede960) 0 empty - -Class QtPrivate::QSlotObjectBase - size=16 align=8 - base size=16 base align=8 -QtPrivate::QSlotObjectBase (0x0x7f5a2cc82b40) 0 - -Class QGenericArgument - size=16 align=8 - base size=16 base align=8 -QGenericArgument (0x0x7f5a2cc82c60) 0 - -Class QGenericReturnArgument - size=16 align=8 - base size=16 base align=8 -QGenericReturnArgument (0x0x7f5a2ccd70d0) 0 - QGenericArgument (0x0x7f5a2cc82cc0) 0 - -Class QMetaObject - size=48 align=8 - base size=48 base align=8 -QMetaObject (0x0x7f5a2cc82e40) 0 - -Class QMetaObject::Connection - size=8 align=8 - base size=8 base align=8 -QMetaObject::Connection (0x0x7f5a2cc82f00) 0 - -Class QLatin1Char - size=1 align=1 - base size=1 base align=1 -QLatin1Char (0x0x7f5a2cd7bf60) 0 - -Class QChar - size=2 align=2 - base size=2 base align=2 -QChar (0x0x7f5a2c96a000) 0 - -Class QtPrivate::RefCount - size=4 align=4 - base size=4 base align=4 -QtPrivate::RefCount (0x0x7f5a2c96a2a0) 0 - -Class QArrayData - size=24 align=8 - base size=24 base align=8 -QArrayData (0x0x7f5a2c96a300) 0 - -Class QtPrivate::QContainerImplHelper - size=1 align=1 - base size=0 base align=1 -QtPrivate::QContainerImplHelper (0x0x7f5a2c96a660) 0 empty - -Class std::locale - size=8 align=8 - base size=8 base align=8 -std::locale (0x0x7f5a2c96a6c0) 0 - -Vtable for std::locale::facet -std::locale::facet::_ZTVNSt6locale5facetE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt6locale5facetE) -16 (int (*)(...))std::locale::facet::~facet -24 (int (*)(...))std::locale::facet::~facet - -Class std::locale::facet - size=16 align=8 - base size=12 base align=8 -std::locale::facet (0x0x7f5a2c96a720) 0 - vptr=((& std::locale::facet::_ZTVNSt6locale5facetE) + 16u) - -Class std::locale::id - size=8 align=8 - base size=8 base align=8 -std::locale::id (0x0x7f5a2c96a780) 0 - -Class std::locale::_Impl - size=40 align=8 - base size=40 base align=8 -std::locale::_Impl (0x0x7f5a2c96a7e0) 0 - -Class std::__cow_string - size=8 align=8 - base size=8 base align=8 -std::__cow_string (0x0x7f5a2c96aba0) 0 - -Vtable for std::logic_error -std::logic_error::_ZTVSt11logic_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt11logic_error) -16 (int (*)(...))std::logic_error::~logic_error -24 (int (*)(...))std::logic_error::~logic_error -32 (int (*)(...))std::logic_error::what - -Class std::logic_error - size=16 align=8 - base size=16 base align=8 -std::logic_error (0x0x7f5a2ca756e8) 0 - vptr=((& std::logic_error::_ZTVSt11logic_error) + 16u) - std::exception (0x0x7f5a2c96ac60) 0 nearly-empty - primary-for std::logic_error (0x0x7f5a2ca756e8) - -Vtable for std::domain_error -std::domain_error::_ZTVSt12domain_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12domain_error) -16 (int (*)(...))std::domain_error::~domain_error -24 (int (*)(...))std::domain_error::~domain_error -32 (int (*)(...))std::logic_error::what - -Class std::domain_error - size=16 align=8 - base size=16 base align=8 -std::domain_error (0x0x7f5a2ca75750) 0 - vptr=((& std::domain_error::_ZTVSt12domain_error) + 16u) - std::logic_error (0x0x7f5a2ca757b8) 0 - primary-for std::domain_error (0x0x7f5a2ca75750) - std::exception (0x0x7f5a2c96acc0) 0 nearly-empty - primary-for std::logic_error (0x0x7f5a2ca757b8) - -Vtable for std::invalid_argument -std::invalid_argument::_ZTVSt16invalid_argument: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt16invalid_argument) -16 (int (*)(...))std::invalid_argument::~invalid_argument -24 (int (*)(...))std::invalid_argument::~invalid_argument -32 (int (*)(...))std::logic_error::what - -Class std::invalid_argument - size=16 align=8 - base size=16 base align=8 -std::invalid_argument (0x0x7f5a2ca75820) 0 - vptr=((& std::invalid_argument::_ZTVSt16invalid_argument) + 16u) - std::logic_error (0x0x7f5a2ca75888) 0 - primary-for std::invalid_argument (0x0x7f5a2ca75820) - std::exception (0x0x7f5a2c96ad20) 0 nearly-empty - primary-for std::logic_error (0x0x7f5a2ca75888) - -Vtable for std::length_error -std::length_error::_ZTVSt12length_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12length_error) -16 (int (*)(...))std::length_error::~length_error -24 (int (*)(...))std::length_error::~length_error -32 (int (*)(...))std::logic_error::what - -Class std::length_error - size=16 align=8 - base size=16 base align=8 -std::length_error (0x0x7f5a2ca758f0) 0 - vptr=((& std::length_error::_ZTVSt12length_error) + 16u) - std::logic_error (0x0x7f5a2ca75958) 0 - primary-for std::length_error (0x0x7f5a2ca758f0) - std::exception (0x0x7f5a2c96ad80) 0 nearly-empty - primary-for std::logic_error (0x0x7f5a2ca75958) - -Vtable for std::out_of_range -std::out_of_range::_ZTVSt12out_of_range: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12out_of_range) -16 (int (*)(...))std::out_of_range::~out_of_range -24 (int (*)(...))std::out_of_range::~out_of_range -32 (int (*)(...))std::logic_error::what - -Class std::out_of_range - size=16 align=8 - base size=16 base align=8 -std::out_of_range (0x0x7f5a2ca759c0) 0 - vptr=((& std::out_of_range::_ZTVSt12out_of_range) + 16u) - std::logic_error (0x0x7f5a2ca75a28) 0 - primary-for std::out_of_range (0x0x7f5a2ca759c0) - std::exception (0x0x7f5a2c96ade0) 0 nearly-empty - primary-for std::logic_error (0x0x7f5a2ca75a28) - -Vtable for std::runtime_error -std::runtime_error::_ZTVSt13runtime_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13runtime_error) -16 (int (*)(...))std::runtime_error::~runtime_error -24 (int (*)(...))std::runtime_error::~runtime_error -32 (int (*)(...))std::runtime_error::what - -Class std::runtime_error - size=16 align=8 - base size=16 base align=8 -std::runtime_error (0x0x7f5a2ca75a90) 0 - vptr=((& std::runtime_error::_ZTVSt13runtime_error) + 16u) - std::exception (0x0x7f5a2c96ae40) 0 nearly-empty - primary-for std::runtime_error (0x0x7f5a2ca75a90) - -Vtable for std::range_error -std::range_error::_ZTVSt11range_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt11range_error) -16 (int (*)(...))std::range_error::~range_error -24 (int (*)(...))std::range_error::~range_error -32 (int (*)(...))std::runtime_error::what - -Class std::range_error - size=16 align=8 - base size=16 base align=8 -std::range_error (0x0x7f5a2ca75af8) 0 - vptr=((& std::range_error::_ZTVSt11range_error) + 16u) - std::runtime_error (0x0x7f5a2ca75b60) 0 - primary-for std::range_error (0x0x7f5a2ca75af8) - std::exception (0x0x7f5a2c96aea0) 0 nearly-empty - primary-for std::runtime_error (0x0x7f5a2ca75b60) - -Vtable for std::overflow_error -std::overflow_error::_ZTVSt14overflow_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14overflow_error) -16 (int (*)(...))std::overflow_error::~overflow_error -24 (int (*)(...))std::overflow_error::~overflow_error -32 (int (*)(...))std::runtime_error::what - -Class std::overflow_error - size=16 align=8 - base size=16 base align=8 -std::overflow_error (0x0x7f5a2ca75bc8) 0 - vptr=((& std::overflow_error::_ZTVSt14overflow_error) + 16u) - std::runtime_error (0x0x7f5a2ca75c30) 0 - primary-for std::overflow_error (0x0x7f5a2ca75bc8) - std::exception (0x0x7f5a2c96af00) 0 nearly-empty - primary-for std::runtime_error (0x0x7f5a2ca75c30) - -Vtable for std::underflow_error -std::underflow_error::_ZTVSt15underflow_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt15underflow_error) -16 (int (*)(...))std::underflow_error::~underflow_error -24 (int (*)(...))std::underflow_error::~underflow_error -32 (int (*)(...))std::runtime_error::what - -Class std::underflow_error - size=16 align=8 - base size=16 base align=8 -std::underflow_error (0x0x7f5a2ca75c98) 0 - vptr=((& std::underflow_error::_ZTVSt15underflow_error) + 16u) - std::runtime_error (0x0x7f5a2ca75d00) 0 - primary-for std::underflow_error (0x0x7f5a2ca75c98) - std::exception (0x0x7f5a2c96af60) 0 nearly-empty - primary-for std::runtime_error (0x0x7f5a2ca75d00) - -Vtable for std::_V2::error_category -std::_V2::error_category::_ZTVNSt3_V214error_categoryE: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt3_V214error_categoryE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))std::_V2::error_category::_M_message -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))std::_V2::error_category::default_error_condition -64 (int (*)(...))std::_V2::error_category::equivalent -72 (int (*)(...))std::_V2::error_category::equivalent - -Class std::_V2::error_category - size=8 align=8 - base size=8 base align=8 -std::_V2::error_category (0x0x7f5a2cb2e120) 0 nearly-empty - vptr=((& std::_V2::error_category::_ZTVNSt3_V214error_categoryE) + 16u) - -Class std::error_code - size=16 align=8 - base size=16 base align=8 -std::error_code (0x0x7f5a2cb2e360) 0 - -Class std::error_condition - size=16 align=8 - base size=16 base align=8 -std::error_condition (0x0x7f5a2cb2e4e0) 0 - -Vtable for std::system_error -std::system_error::_ZTVSt12system_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12system_error) -16 (int (*)(...))std::system_error::~system_error -24 (int (*)(...))std::system_error::~system_error -32 (int (*)(...))std::runtime_error::what - -Class std::system_error - size=32 align=8 - base size=32 base align=8 -std::system_error (0x0x7f5a2c76e138) 0 - vptr=((& std::system_error::_ZTVSt12system_error) + 16u) - std::runtime_error (0x0x7f5a2c76e1a0) 0 - primary-for std::system_error (0x0x7f5a2c76e138) - std::exception (0x0x7f5a2cb2e720) 0 nearly-empty - primary-for std::runtime_error (0x0x7f5a2c76e1a0) - -Vtable for std::ios_base::failure -std::ios_base::failure::_ZTVNSt8ios_base7failureB5cxx11E: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt8ios_base7failureB5cxx11E) -16 (int (*)(...))std::ios_base::failure::~failure -24 (int (*)(...))std::ios_base::failure::~failure -32 (int (*)(...))std::ios_base::failure::what - -Class std::ios_base::failure - size=32 align=8 - base size=32 base align=8 -std::ios_base::failure (0x0x7f5a2c76ed68) 0 - vptr=((& std::ios_base::failure::_ZTVNSt8ios_base7failureB5cxx11E) + 16u) - std::system_error (0x0x7f5a2c76edd0) 0 - primary-for std::ios_base::failure (0x0x7f5a2c76ed68) - std::runtime_error (0x0x7f5a2c76ee38) 0 - primary-for std::system_error (0x0x7f5a2c76edd0) - std::exception (0x0x7f5a2cb2ea20) 0 nearly-empty - primary-for std::runtime_error (0x0x7f5a2c76ee38) - -Class std::ios_base::_Callback_list - size=24 align=8 - base size=24 base align=8 -std::ios_base::_Callback_list (0x0x7f5a2cb2ea80) 0 - -Class std::ios_base::_Words - size=16 align=8 - base size=16 base align=8 -std::ios_base::_Words (0x0x7f5a2cb2eae0) 0 - -Class std::ios_base::Init - size=1 align=1 - base size=0 base align=1 -std::ios_base::Init (0x0x7f5a2cb2eb40) 0 empty - -Vtable for std::ios_base -std::ios_base::_ZTVSt8ios_base: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt8ios_base) -16 (int (*)(...))std::ios_base::~ios_base -24 (int (*)(...))std::ios_base::~ios_base - -Class std::ios_base - size=216 align=8 - base size=216 base align=8 -std::ios_base (0x0x7f5a2cb2e9c0) 0 - vptr=((& std::ios_base::_ZTVSt8ios_base) + 16u) - -Class std::ctype_base - size=1 align=1 - base size=0 base align=1 -std::ctype_base (0x0x7f5a2c864300) 0 empty - -Class std::__num_base - size=1 align=1 - base size=0 base align=1 -std::__num_base (0x0x7f5a2c8649c0) 0 empty - -VTT for std::basic_ostream -std::basic_ostream::_ZTTSo: 2u entries -0 ((& std::basic_ostream::_ZTVSo) + 24u) -8 ((& std::basic_ostream::_ZTVSo) + 64u) - -VTT for std::basic_ostream -std::basic_ostream::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries -0 ((& std::basic_ostream::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 24u) -8 ((& std::basic_ostream::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 64u) - -VTT for std::basic_istream -std::basic_istream::_ZTTSi: 2u entries -0 ((& std::basic_istream::_ZTVSi) + 24u) -8 ((& std::basic_istream::_ZTVSi) + 64u) - -VTT for std::basic_istream -std::basic_istream::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries -0 ((& std::basic_istream::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 24u) -8 ((& std::basic_istream::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 64u) - -Construction vtable for std::basic_istream (0x0x7f5a2c429750 instance) in std::basic_iostream -std::basic_iostream::_ZTCSd0_Si: 10u entries -0 24u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISi) -24 0u -32 0u -40 18446744073709551592u -48 (int (*)(...))-24 -56 (int (*)(...))(& _ZTISi) -64 0u -72 0u - -Construction vtable for std::basic_ostream (0x0x7f5a2c429820 instance) in std::basic_iostream -std::basic_iostream::_ZTCSd16_So: 10u entries -0 8u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISo) -24 0u -32 0u -40 18446744073709551608u -48 (int (*)(...))-8 -56 (int (*)(...))(& _ZTISo) -64 0u -72 0u - -VTT for std::basic_iostream -std::basic_iostream::_ZTTSd: 7u entries -0 ((& std::basic_iostream::_ZTVSd) + 24u) -8 ((& std::basic_iostream::_ZTCSd0_Si) + 24u) -16 ((& std::basic_iostream::_ZTCSd0_Si) + 64u) -24 ((& std::basic_iostream::_ZTCSd16_So) + 24u) -32 ((& std::basic_iostream::_ZTCSd16_So) + 64u) -40 ((& std::basic_iostream::_ZTVSd) + 104u) -48 ((& std::basic_iostream::_ZTVSd) + 64u) - -Construction vtable for std::basic_istream (0x0x7f5a2c429bc8 instance) in std::basic_iostream -std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries -0 24u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -24 0u -32 0u -40 18446744073709551592u -48 (int (*)(...))-24 -56 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -64 0u -72 0u - -Construction vtable for std::basic_ostream (0x0x7f5a2c429c98 instance) in std::basic_iostream -std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE16_St13basic_ostreamIwS1_E: 10u entries -0 8u -8 (int (*)(...))0 -16 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -24 0u -32 0u -40 18446744073709551608u -48 (int (*)(...))-8 -56 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -64 0u -72 0u - -VTT for std::basic_iostream -std::basic_iostream::_ZTTSt14basic_iostreamIwSt11char_traitsIwEE: 7u entries -0 ((& std::basic_iostream::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 24u) -8 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E) + 24u) -16 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E) + 64u) -24 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE16_St13basic_ostreamIwS1_E) + 24u) -32 ((& std::basic_iostream::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE16_St13basic_ostreamIwS1_E) + 64u) -40 ((& std::basic_iostream::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 104u) -48 ((& std::basic_iostream::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 64u) - -Class QByteArrayDataPtr - size=8 align=8 - base size=8 base align=8 -QByteArrayDataPtr (0x0x7f5a2c486240) 0 - -Class QByteArray - size=8 align=8 - base size=8 base align=8 -QByteArray (0x0x7f5a2c4862a0) 0 - -Class QByteRef - size=16 align=8 - base size=12 base align=8 -QByteRef (0x0x7f5a2c1a9600) 0 - -Class QStringDataPtr - size=8 align=8 - base size=8 base align=8 -QStringDataPtr (0x0x7f5a2c1a9960) 0 - -Class QStringView - size=16 align=8 - base size=16 base align=8 -QStringView (0x0x7f5a2c1a9de0) 0 - -Class QLatin1String - size=16 align=8 - base size=16 base align=8 -QLatin1String (0x0x7f5a2c2dcc60) 0 - -Class QString::Null - size=1 align=1 - base size=0 base align=1 -QString::Null (0x0x7f5a2bf6d300) 0 empty - -Class QString - size=8 align=8 - base size=8 base align=8 -QString (0x0x7f5a2bf6d2a0) 0 - -Class QCharRef - size=16 align=8 - base size=12 base align=8 -QCharRef (0x0x7f5a2c1163c0) 0 - -Class QStringRef - size=16 align=8 - base size=16 base align=8 -QStringRef (0x0x7f5a2bedf000) 0 - -Class QtPrivate::QHashCombine - size=1 align=1 - base size=0 base align=1 -QtPrivate::QHashCombine (0x0x7f5a2bedfc60) 0 empty - -Class QtPrivate::QHashCombineCommutative - size=1 align=1 - base size=0 base align=1 -QtPrivate::QHashCombineCommutative (0x0x7f5a2bedfcc0) 0 empty - -Class std::__detail::_List_node_base - size=16 align=8 - base size=16 base align=8 -std::__detail::_List_node_base (0x0x7f5a2bedfd20) 0 - -Class QListData::NotArrayCompatibleLayout - size=1 align=1 - base size=0 base align=1 -QListData::NotArrayCompatibleLayout (0x0x7f5a2bcf6120) 0 empty - -Class QListData::NotIndirectLayout - size=1 align=1 - base size=0 base align=1 -QListData::NotIndirectLayout (0x0x7f5a2bcf6180) 0 empty - -Class QListData::ArrayCompatibleLayout - size=1 align=1 - base size=1 base align=1 -QListData::ArrayCompatibleLayout (0x0x7f5a2bc736e8) 0 empty - QListData::NotIndirectLayout (0x0x7f5a2bcf61e0) 0 empty - -Class QListData::InlineWithPaddingLayout - size=1 align=1 - base size=1 base align=1 -QListData::InlineWithPaddingLayout (0x0x7f5a2b973f50) 0 empty - QListData::NotArrayCompatibleLayout (0x0x7f5a2bcf6240) 0 empty - QListData::NotIndirectLayout (0x0x7f5a2bcf62a0) 0 empty - -Class QListData::IndirectLayout - size=1 align=1 - base size=1 base align=1 -QListData::IndirectLayout (0x0x7f5a2bc73750) 0 empty - QListData::NotArrayCompatibleLayout (0x0x7f5a2bcf6300) 0 empty - -Class QListData::Data - size=24 align=8 - base size=24 base align=8 -QListData::Data (0x0x7f5a2bcf6360) 0 - -Class QListData - size=8 align=8 - base size=8 base align=8 -QListData (0x0x7f5a2bcf60c0) 0 - -Class QRegExp - size=8 align=8 - base size=8 base align=8 -QRegExp (0x0x7f5a2bcf67e0) 0 - -Class QStringMatcher::Data - size=272 align=8 - base size=272 base align=8 -QStringMatcher::Data (0x0x7f5a2bb2ca20) 0 - -Class QStringMatcher - size=1048 align=8 - base size=1048 base align=8 -QStringMatcher (0x0x7f5a2bb2c9c0) 0 - -Class QStringList - size=8 align=8 - base size=8 base align=8 -QStringList (0x0x7f5a2bb3c1a0) 0 - QList (0x0x7f5a2bb3c208) 0 - QListSpecialMethods (0x0x7f5a2bb2cc00) 0 empty - -Class QScopedPointerPodDeleter - size=1 align=1 - base size=0 base align=1 -QScopedPointerPodDeleter (0x0x7f5a2b7cf060) 0 empty - -Class std::_Rb_tree_node_base - size=32 align=8 - base size=32 base align=8 -std::_Rb_tree_node_base (0x0x7f5a2b7cfc00) 0 - -Class std::allocator_arg_t - size=1 align=1 - base size=0 base align=1 -std::allocator_arg_t (0x0x7f5a2b5592a0) 0 empty - -Class std::__uses_alloc_base - size=1 align=1 - base size=0 base align=1 -std::__uses_alloc_base (0x0x7f5a2b559420) 0 empty - -Class std::__uses_alloc0::_Sink - size=1 align=1 - base size=0 base align=1 -std::__uses_alloc0::_Sink (0x0x7f5a2b5594e0) 0 empty - -Class std::__uses_alloc0 - size=1 align=1 - base size=1 base align=1 -std::__uses_alloc0 (0x0x7f5a2bb3caf8) 0 - std::__uses_alloc_base (0x0x7f5a2b559480) 0 empty - -Class std::_Swallow_assign - size=1 align=1 - base size=0 base align=1 -std::_Swallow_assign (0x0x7f5a2b6d9540) 0 empty - -Class QtPrivate::AbstractDebugStreamFunction - size=16 align=8 - base size=16 base align=8 -QtPrivate::AbstractDebugStreamFunction (0x0x7f5a2b6d9780) 0 - -Class QtPrivate::AbstractComparatorFunction - size=24 align=8 - base size=24 base align=8 -QtPrivate::AbstractComparatorFunction (0x0x7f5a2b6d9840) 0 - -Class QtPrivate::AbstractConverterFunction - size=8 align=8 - base size=8 base align=8 -QtPrivate::AbstractConverterFunction (0x0x7f5a2b6d9960) 0 - -Class QMetaType - size=80 align=8 - base size=80 base align=8 -QMetaType (0x0x7f5a2b6d9ae0) 0 - -Class QtMetaTypePrivate::VariantData - size=24 align=8 - base size=20 base align=8 -QtMetaTypePrivate::VariantData (0x0x7f5a2b6d9f00) 0 - -Class QtMetaTypePrivate::VectorBoolElements - size=1 align=1 - base size=0 base align=1 -QtMetaTypePrivate::VectorBoolElements (0x0x7f5a2b432060) 0 empty - -Class QtMetaTypePrivate::QSequentialIterableImpl - size=104 align=8 - base size=104 base align=8 -QtMetaTypePrivate::QSequentialIterableImpl (0x0x7f5a2b4329c0) 0 - -Class QtMetaTypePrivate::QAssociativeIterableImpl - size=112 align=8 - base size=112 base align=8 -QtMetaTypePrivate::QAssociativeIterableImpl (0x0x7f5a2b432de0) 0 - -Class QtMetaTypePrivate::QPairVariantInterfaceImpl - size=40 align=8 - base size=40 base align=8 -QtMetaTypePrivate::QPairVariantInterfaceImpl (0x0x7f5a2b525120) 0 - -Class std::chrono::_V2::system_clock - size=1 align=1 - base size=0 base align=1 -std::chrono::_V2::system_clock (0x0x7f5a2b334ae0) 0 empty - -Class std::chrono::_V2::steady_clock - size=1 align=1 - base size=0 base align=1 -std::chrono::_V2::steady_clock (0x0x7f5a2b090960) 0 empty - -Vtable for QObjectData -QObjectData::_ZTV11QObjectData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QObjectData) -16 (int (*)(...))__cxa_pure_virtual -24 (int (*)(...))__cxa_pure_virtual - -Class QObjectData - size=48 align=8 - base size=48 base align=8 -QObjectData (0x0x7f5a2b0909c0) 0 - vptr=((& QObjectData::_ZTV11QObjectData) + 16u) - -Class QObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QObject::QPrivateSignal (0x0x7f5a2b090ba0) 0 empty - -Vtable for QObject -QObject::_ZTV7QObject: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QObject) -16 (int (*)(...))QObject::metaObject -24 (int (*)(...))QObject::qt_metacast -32 (int (*)(...))QObject::qt_metacall -40 (int (*)(...))QObject::~QObject -48 (int (*)(...))QObject::~QObject -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QObject - size=16 align=8 - base size=16 base align=8 -QObject (0x0x7f5a2b090b40) 0 - vptr=((& QObject::_ZTV7QObject) + 16u) - -Vtable for QObjectUserData -QObjectUserData::_ZTV15QObjectUserData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QObjectUserData) -16 (int (*)(...))QObjectUserData::~QObjectUserData -24 (int (*)(...))QObjectUserData::~QObjectUserData - -Class QObjectUserData - size=8 align=8 - base size=8 base align=8 -QObjectUserData (0x0x7f5a2ad40e40) 0 nearly-empty - vptr=((& QObjectUserData::_ZTV15QObjectUserData) + 16u) - -Class QSignalBlocker - size=16 align=8 - base size=10 base align=8 -QSignalBlocker (0x0x7f5a2ad40ea0) 0 - -Class QAbstractAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractAnimation::QPrivateSignal (0x0x7f5a2ad40f60) 0 empty - -Vtable for QAbstractAnimation -QAbstractAnimation::_ZTV18QAbstractAnimation: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QAbstractAnimation) -16 (int (*)(...))QAbstractAnimation::metaObject -24 (int (*)(...))QAbstractAnimation::qt_metacast -32 (int (*)(...))QAbstractAnimation::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAbstractAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection - -Class QAbstractAnimation - size=16 align=8 - base size=16 base align=8 -QAbstractAnimation (0x0x7f5a2ad5eea0) 0 - vptr=((& QAbstractAnimation::_ZTV18QAbstractAnimation) + 16u) - QObject (0x0x7f5a2ad40f00) 0 - primary-for QAbstractAnimation (0x0x7f5a2ad5eea0) - -Class QAnimationDriver::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAnimationDriver::QPrivateSignal (0x0x7f5a2adcc060) 0 empty - -Vtable for QAnimationDriver -QAnimationDriver::_ZTV16QAnimationDriver: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QAnimationDriver) -16 (int (*)(...))QAnimationDriver::metaObject -24 (int (*)(...))QAnimationDriver::qt_metacast -32 (int (*)(...))QAnimationDriver::qt_metacall -40 (int (*)(...))QAnimationDriver::~QAnimationDriver -48 (int (*)(...))QAnimationDriver::~QAnimationDriver -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAnimationDriver::advance -120 (int (*)(...))QAnimationDriver::elapsed -128 (int (*)(...))QAnimationDriver::start -136 (int (*)(...))QAnimationDriver::stop - -Class QAnimationDriver - size=16 align=8 - base size=16 base align=8 -QAnimationDriver (0x0x7f5a2ad5ef08) 0 - vptr=((& QAnimationDriver::_ZTV16QAnimationDriver) + 16u) - QObject (0x0x7f5a2adcc000) 0 - primary-for QAnimationDriver (0x0x7f5a2ad5ef08) - -Class QEventLoop::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QEventLoop::QPrivateSignal (0x0x7f5a2adcc120) 0 empty - -Vtable for QEventLoop -QEventLoop::_ZTV10QEventLoop: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QEventLoop) -16 (int (*)(...))QEventLoop::metaObject -24 (int (*)(...))QEventLoop::qt_metacast -32 (int (*)(...))QEventLoop::qt_metacall -40 (int (*)(...))QEventLoop::~QEventLoop -48 (int (*)(...))QEventLoop::~QEventLoop -56 (int (*)(...))QEventLoop::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QEventLoop - size=16 align=8 - base size=16 base align=8 -QEventLoop (0x0x7f5a2ad5ef70) 0 - vptr=((& QEventLoop::_ZTV10QEventLoop) + 16u) - QObject (0x0x7f5a2adcc0c0) 0 - primary-for QEventLoop (0x0x7f5a2ad5ef70) - -Class QEventLoopLocker - size=8 align=8 - base size=8 base align=8 -QEventLoopLocker (0x0x7f5a2adcc300) 0 - -Class QAbstractEventDispatcher::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractEventDispatcher::QPrivateSignal (0x0x7f5a2adcc3c0) 0 empty - -Class QAbstractEventDispatcher::TimerInfo - size=12 align=4 - base size=12 base align=4 -QAbstractEventDispatcher::TimerInfo (0x0x7f5a2adcc420) 0 - -Vtable for QAbstractEventDispatcher -QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 28u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QAbstractEventDispatcher) -16 (int (*)(...))QAbstractEventDispatcher::metaObject -24 (int (*)(...))QAbstractEventDispatcher::qt_metacast -32 (int (*)(...))QAbstractEventDispatcher::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))__cxa_pure_virtual -176 (int (*)(...))__cxa_pure_virtual -184 (int (*)(...))__cxa_pure_virtual -192 (int (*)(...))__cxa_pure_virtual -200 (int (*)(...))__cxa_pure_virtual -208 (int (*)(...))QAbstractEventDispatcher::startingUp -216 (int (*)(...))QAbstractEventDispatcher::closingDown - -Class QAbstractEventDispatcher - size=16 align=8 - base size=16 base align=8 -QAbstractEventDispatcher (0x0x7f5a2ad5e2d8) 0 - vptr=((& QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher) + 16u) - QObject (0x0x7f5a2adcc360) 0 - primary-for QAbstractEventDispatcher (0x0x7f5a2ad5e2d8) - -Vtable for std::type_info -std::type_info::_ZTVSt9type_info: 8u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt9type_info) -16 (int (*)(...))std::type_info::~type_info -24 (int (*)(...))std::type_info::~type_info -32 (int (*)(...))std::type_info::__is_pointer_p -40 (int (*)(...))std::type_info::__is_function_p -48 (int (*)(...))std::type_info::__do_catch -56 (int (*)(...))std::type_info::__do_upcast - -Class std::type_info - size=16 align=8 - base size=16 base align=8 -std::type_info (0x0x7f5a2adcc6c0) 0 - vptr=((& std::type_info::_ZTVSt9type_info) + 16u) - -Vtable for std::bad_cast -std::bad_cast::_ZTVSt8bad_cast: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt8bad_cast) -16 (int (*)(...))std::bad_cast::~bad_cast -24 (int (*)(...))std::bad_cast::~bad_cast -32 (int (*)(...))std::bad_cast::what - -Class std::bad_cast - size=8 align=8 - base size=8 base align=8 -std::bad_cast (0x0x7f5a2ae2f138) 0 nearly-empty - vptr=((& std::bad_cast::_ZTVSt8bad_cast) + 16u) - std::exception (0x0x7f5a2adcc720) 0 nearly-empty - primary-for std::bad_cast (0x0x7f5a2ae2f138) - -Vtable for std::bad_typeid -std::bad_typeid::_ZTVSt10bad_typeid: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt10bad_typeid) -16 (int (*)(...))std::bad_typeid::~bad_typeid -24 (int (*)(...))std::bad_typeid::~bad_typeid -32 (int (*)(...))std::bad_typeid::what - -Class std::bad_typeid - size=8 align=8 - base size=8 base align=8 -std::bad_typeid (0x0x7f5a2ae2f1a0) 0 nearly-empty - vptr=((& std::bad_typeid::_ZTVSt10bad_typeid) + 16u) - std::exception (0x0x7f5a2adcc780) 0 nearly-empty - primary-for std::bad_typeid (0x0x7f5a2ae2f1a0) - -Vtable for std::bad_function_call -std::bad_function_call::_ZTVSt17bad_function_call: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt17bad_function_call) -16 (int (*)(...))std::bad_function_call::~bad_function_call -24 (int (*)(...))std::bad_function_call::~bad_function_call -32 (int (*)(...))std::bad_function_call::what - -Class std::bad_function_call - size=8 align=8 - base size=8 base align=8 -std::bad_function_call (0x0x7f5a2ab9d410) 0 nearly-empty - vptr=((& std::bad_function_call::_ZTVSt17bad_function_call) + 16u) - std::exception (0x0x7f5a2ab53840) 0 nearly-empty - primary-for std::bad_function_call (0x0x7f5a2ab9d410) - -Class std::_Nocopy_types - size=16 align=8 - base size=16 base align=8 -std::_Nocopy_types (0x0x7f5a2ab53900) 0 - -Class std::_Any_data - size=16 align=8 - base size=16 base align=8 -std::_Any_data (0x0x7f5a2ab53960) 0 - -Class std::_Function_base - size=24 align=8 - base size=24 base align=8 -std::_Function_base (0x0x7f5a2ab53a80) 0 - -Class QMapNodeBase - size=24 align=8 - base size=24 base align=8 -QMapNodeBase (0x0x7f5a2ab53f60) 0 - -Class QMapDataBase - size=40 align=8 - base size=40 base align=8 -QMapDataBase (0x0x7f5a2ac514e0) 0 - -Class QHashData::Node - size=16 align=8 - base size=16 base align=8 -QHashData::Node (0x0x7f5a2ac518a0) 0 - -Class QHashData - size=48 align=8 - base size=44 base align=8 -QHashData (0x0x7f5a2ac51840) 0 - -Class QHashDummyValue - size=1 align=1 - base size=0 base align=1 -QHashDummyValue (0x0x7f5a2ac51900) 0 empty - -Class QVariant::PrivateShared - size=16 align=8 - base size=12 base align=8 -QVariant::PrivateShared (0x0x7f5a2aa631e0) 0 - -Class QVariant::Private::Data - size=8 align=8 - base size=8 base align=8 -QVariant::Private::Data (0x0x7f5a2aa632a0) 0 - -Class QVariant::Private - size=16 align=8 - base size=12 base align=8 -QVariant::Private (0x0x7f5a2aa63240) 0 - -Class QVariant::Handler - size=72 align=8 - base size=72 base align=8 -QVariant::Handler (0x0x7f5a2aa63300) 0 - -Class QVariant - size=16 align=8 - base size=16 base align=8 -QVariant (0x0x7f5a2aa63180) 0 - -Class QVariantComparisonHelper - size=8 align=8 - base size=8 base align=8 -QVariantComparisonHelper (0x0x7f5a2a730de0) 0 - -Class QSequentialIterable::const_iterator - size=112 align=8 - base size=112 base align=8 -QSequentialIterable::const_iterator (0x0x7f5a2a7dd480) 0 - -Class QSequentialIterable - size=104 align=8 - base size=104 base align=8 -QSequentialIterable (0x0x7f5a2a7dd420) 0 - -Class QAssociativeIterable::const_iterator - size=120 align=8 - base size=120 base align=8 -QAssociativeIterable::const_iterator (0x0x7f5a2a7dd540) 0 - -Class QAssociativeIterable - size=112 align=8 - base size=112 base align=8 -QAssociativeIterable (0x0x7f5a2a7dd4e0) 0 - -Class QModelIndex - size=24 align=8 - base size=24 base align=8 -QModelIndex (0x0x7f5a2a901840) 0 - -Class QPersistentModelIndex - size=8 align=8 - base size=8 base align=8 -QPersistentModelIndex (0x0x7f5a2a901f00) 0 - -Class QAbstractItemModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractItemModel::QPrivateSignal (0x0x7f5a2a6ec660) 0 empty - -Vtable for QAbstractItemModel -QAbstractItemModel::_ZTV18QAbstractItemModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QAbstractItemModel) -16 (int (*)(...))QAbstractItemModel::metaObject -24 (int (*)(...))QAbstractItemModel::qt_metacast -32 (int (*)(...))QAbstractItemModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractItemModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAbstractItemModel::hasChildren -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractItemModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractItemModel::dropMimeData -240 (int (*)(...))QAbstractItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QAbstractItemModel::flags -328 (int (*)(...))QAbstractItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QAbstractItemModel - size=16 align=8 - base size=16 base align=8 -QAbstractItemModel (0x0x7f5a2a6f71a0) 0 - vptr=((& QAbstractItemModel::_ZTV18QAbstractItemModel) + 16u) - QObject (0x0x7f5a2a6ec600) 0 - primary-for QAbstractItemModel (0x0x7f5a2a6f71a0) - -Class QAbstractTableModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractTableModel::QPrivateSignal (0x0x7f5a2a6ecf00) 0 empty - -Vtable for QAbstractTableModel -QAbstractTableModel::_ZTV19QAbstractTableModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QAbstractTableModel) -16 (int (*)(...))QAbstractTableModel::metaObject -24 (int (*)(...))QAbstractTableModel::qt_metacast -32 (int (*)(...))QAbstractTableModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractTableModel::index -120 (int (*)(...))QAbstractTableModel::parent -128 (int (*)(...))QAbstractTableModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAbstractTableModel::hasChildren -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractItemModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractTableModel::dropMimeData -240 (int (*)(...))QAbstractItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QAbstractTableModel::flags -328 (int (*)(...))QAbstractItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QAbstractTableModel - size=16 align=8 - base size=16 base align=8 -QAbstractTableModel (0x0x7f5a2a6f7888) 0 - vptr=((& QAbstractTableModel::_ZTV19QAbstractTableModel) + 16u) - QAbstractItemModel (0x0x7f5a2a6f78f0) 0 - primary-for QAbstractTableModel (0x0x7f5a2a6f7888) - QObject (0x0x7f5a2a6ecea0) 0 - primary-for QAbstractItemModel (0x0x7f5a2a6f78f0) - -Class QAbstractListModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractListModel::QPrivateSignal (0x0x7f5a2a3de000) 0 empty - -Vtable for QAbstractListModel -QAbstractListModel::_ZTV18QAbstractListModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QAbstractListModel) -16 (int (*)(...))QAbstractListModel::metaObject -24 (int (*)(...))QAbstractListModel::qt_metacast -32 (int (*)(...))QAbstractListModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractListModel::index -120 (int (*)(...))QAbstractListModel::parent -128 (int (*)(...))QAbstractListModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))QAbstractListModel::columnCount -152 (int (*)(...))QAbstractListModel::hasChildren -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractItemModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractListModel::dropMimeData -240 (int (*)(...))QAbstractItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QAbstractListModel::flags -328 (int (*)(...))QAbstractItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QAbstractListModel - size=16 align=8 - base size=16 base align=8 -QAbstractListModel (0x0x7f5a2a6f7958) 0 - vptr=((& QAbstractListModel::_ZTV18QAbstractListModel) + 16u) - QAbstractItemModel (0x0x7f5a2a6f79c0) 0 - primary-for QAbstractListModel (0x0x7f5a2a6f7958) - QObject (0x0x7f5a2a6ecf60) 0 - primary-for QAbstractItemModel (0x0x7f5a2a6f79c0) - -Vtable for QAbstractNativeEventFilter -QAbstractNativeEventFilter::_ZTV26QAbstractNativeEventFilter: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAbstractNativeEventFilter) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QAbstractNativeEventFilter - size=16 align=8 - base size=16 base align=8 -QAbstractNativeEventFilter (0x0x7f5a2a3de2a0) 0 - vptr=((& QAbstractNativeEventFilter::_ZTV26QAbstractNativeEventFilter) + 16u) - -Class QAbstractProxyModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractProxyModel::QPrivateSignal (0x0x7f5a2a3de360) 0 empty - -Vtable for QAbstractProxyModel -QAbstractProxyModel::_ZTV19QAbstractProxyModel: 53u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QAbstractProxyModel) -16 (int (*)(...))QAbstractProxyModel::metaObject -24 (int (*)(...))QAbstractProxyModel::qt_metacast -32 (int (*)(...))QAbstractProxyModel::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractProxyModel::sibling -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAbstractProxyModel::hasChildren -160 (int (*)(...))QAbstractProxyModel::data -168 (int (*)(...))QAbstractProxyModel::setData -176 (int (*)(...))QAbstractProxyModel::headerData -184 (int (*)(...))QAbstractProxyModel::setHeaderData -192 (int (*)(...))QAbstractProxyModel::itemData -200 (int (*)(...))QAbstractProxyModel::setItemData -208 (int (*)(...))QAbstractProxyModel::mimeTypes -216 (int (*)(...))QAbstractProxyModel::mimeData -224 (int (*)(...))QAbstractProxyModel::canDropMimeData -232 (int (*)(...))QAbstractProxyModel::dropMimeData -240 (int (*)(...))QAbstractProxyModel::supportedDropActions -248 (int (*)(...))QAbstractProxyModel::supportedDragActions -256 (int (*)(...))QAbstractItemModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QAbstractItemModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractProxyModel::fetchMore -312 (int (*)(...))QAbstractProxyModel::canFetchMore -320 (int (*)(...))QAbstractProxyModel::flags -328 (int (*)(...))QAbstractProxyModel::sort -336 (int (*)(...))QAbstractProxyModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractProxyModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractProxyModel::submit -376 (int (*)(...))QAbstractProxyModel::revert -384 (int (*)(...))QAbstractProxyModel::setSourceModel -392 (int (*)(...))__cxa_pure_virtual -400 (int (*)(...))__cxa_pure_virtual -408 (int (*)(...))QAbstractProxyModel::mapSelectionToSource -416 (int (*)(...))QAbstractProxyModel::mapSelectionFromSource - -Class QAbstractProxyModel - size=16 align=8 - base size=16 base align=8 -QAbstractProxyModel (0x0x7f5a2a6f7af8) 0 - vptr=((& QAbstractProxyModel::_ZTV19QAbstractProxyModel) + 16u) - QAbstractItemModel (0x0x7f5a2a6f7b60) 0 - primary-for QAbstractProxyModel (0x0x7f5a2a6f7af8) - QObject (0x0x7f5a2a3de300) 0 - primary-for QAbstractItemModel (0x0x7f5a2a6f7b60) - -Class QAbstractState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractState::QPrivateSignal (0x0x7f5a2a3de420) 0 empty - -Vtable for QAbstractState -QAbstractState::_ZTV14QAbstractState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QAbstractState) -16 (int (*)(...))QAbstractState::metaObject -24 (int (*)(...))QAbstractState::qt_metacast -32 (int (*)(...))QAbstractState::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAbstractState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QAbstractState - size=16 align=8 - base size=16 base align=8 -QAbstractState (0x0x7f5a2a6f7bc8) 0 - vptr=((& QAbstractState::_ZTV14QAbstractState) + 16u) - QObject (0x0x7f5a2a3de3c0) 0 - primary-for QAbstractState (0x0x7f5a2a6f7bc8) - -Class QAbstractTransition::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractTransition::QPrivateSignal (0x0x7f5a2a3de4e0) 0 empty - -Vtable for QAbstractTransition -QAbstractTransition::_ZTV19QAbstractTransition: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QAbstractTransition) -16 (int (*)(...))QAbstractTransition::metaObject -24 (int (*)(...))QAbstractTransition::qt_metacast -32 (int (*)(...))QAbstractTransition::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAbstractTransition::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QAbstractTransition - size=16 align=8 - base size=16 base align=8 -QAbstractTransition (0x0x7f5a2a6f7c30) 0 - vptr=((& QAbstractTransition::_ZTV19QAbstractTransition) + 16u) - QObject (0x0x7f5a2a3de480) 0 - primary-for QAbstractTransition (0x0x7f5a2a6f7c30) - -Class QAnimationGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAnimationGroup::QPrivateSignal (0x0x7f5a2a3de5a0) 0 empty - -Vtable for QAnimationGroup -QAnimationGroup::_ZTV15QAnimationGroup: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QAnimationGroup) -16 (int (*)(...))QAnimationGroup::metaObject -24 (int (*)(...))QAnimationGroup::qt_metacast -32 (int (*)(...))QAnimationGroup::qt_metacall -40 0u -48 0u -56 (int (*)(...))QAnimationGroup::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))QAbstractAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection - -Class QAnimationGroup - size=16 align=8 - base size=16 base align=8 -QAnimationGroup (0x0x7f5a2a6f7c98) 0 - vptr=((& QAnimationGroup::_ZTV15QAnimationGroup) + 16u) - QAbstractAnimation (0x0x7f5a2a6f7d00) 0 - primary-for QAnimationGroup (0x0x7f5a2a6f7c98) - QObject (0x0x7f5a2a3de540) 0 - primary-for QAbstractAnimation (0x0x7f5a2a6f7d00) - -Class QBasicTimer - size=4 align=4 - base size=4 base align=4 -QBasicTimer (0x0x7f5a2a4b7300) 0 - -Class QBitArray - size=8 align=8 - base size=8 base align=8 -QBitArray (0x0x7f5a2a4b75a0) 0 - -Class QBitRef - size=16 align=8 - base size=12 base align=8 -QBitRef (0x0x7f5a2a4b7660) 0 - -Class QIODevice::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIODevice::QPrivateSignal (0x0x7f5a2a4b7960) 0 empty - -Vtable for QIODevice -QIODevice::_ZTV9QIODevice: 30u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QIODevice) -16 (int (*)(...))QIODevice::metaObject -24 (int (*)(...))QIODevice::qt_metacast -32 (int (*)(...))QIODevice::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QIODevice::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QIODevice::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QIODevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))__cxa_pure_virtual -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))__cxa_pure_virtual - -Class QIODevice - size=16 align=8 - base size=16 base align=8 -QIODevice (0x0x7f5a2a4e13a8) 0 - vptr=((& QIODevice::_ZTV9QIODevice) + 16u) - QObject (0x0x7f5a2a4b7900) 0 - primary-for QIODevice (0x0x7f5a2a4e13a8) - -Class QBuffer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QBuffer::QPrivateSignal (0x0x7f5a2a4b7ba0) 0 empty - -Vtable for QBuffer -QBuffer::_ZTV7QBuffer: 30u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QBuffer) -16 (int (*)(...))QBuffer::metaObject -24 (int (*)(...))QBuffer::qt_metacast -32 (int (*)(...))QBuffer::qt_metacall -40 (int (*)(...))QBuffer::~QBuffer -48 (int (*)(...))QBuffer::~QBuffer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QBuffer::connectNotify -104 (int (*)(...))QBuffer::disconnectNotify -112 (int (*)(...))QIODevice::isSequential -120 (int (*)(...))QBuffer::open -128 (int (*)(...))QBuffer::close -136 (int (*)(...))QBuffer::pos -144 (int (*)(...))QBuffer::size -152 (int (*)(...))QBuffer::seek -160 (int (*)(...))QBuffer::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QBuffer::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QBuffer::readData -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QBuffer::writeData - -Class QBuffer - size=16 align=8 - base size=16 base align=8 -QBuffer (0x0x7f5a2a4e14e0) 0 - vptr=((& QBuffer::_ZTV7QBuffer) + 16u) - QIODevice (0x0x7f5a2a4e1548) 0 - primary-for QBuffer (0x0x7f5a2a4e14e0) - QObject (0x0x7f5a2a4b7b40) 0 - primary-for QIODevice (0x0x7f5a2a4e1548) - -Class QByteArrayMatcher::Data - size=272 align=8 - base size=272 base align=8 -QByteArrayMatcher::Data (0x0x7f5a2a4b7c60) 0 - -Class QByteArrayMatcher - size=1040 align=8 - base size=1040 base align=8 -QByteArrayMatcher (0x0x7f5a2a4b7c00) 0 - -Class QStaticByteArrayMatcherBase::Skiptable - size=256 align=1 - base size=256 base align=1 -QStaticByteArrayMatcherBase::Skiptable (0x0x7f5a2a4b7d80) 0 - -Class QStaticByteArrayMatcherBase - size=256 align=16 - base size=256 base align=16 -QStaticByteArrayMatcherBase (0x0x7f5a2a4b7d20) 0 - -Class QSharedData - size=4 align=4 - base size=4 base align=4 -QSharedData (0x0x7f5a2a4b7f60) 0 - -Class QDate - size=8 align=8 - base size=8 base align=8 -QDate (0x0x7f5a2a1e9180) 0 - -Class QTime - size=4 align=4 - base size=4 base align=4 -QTime (0x0x7f5a2a1e9420) 0 - -Class QDateTime::ShortData - size=8 align=8 - base size=8 base align=8 -QDateTime::ShortData (0x0x7f5a2a1e9ba0) 0 - -Class QDateTime::Data - size=8 align=8 - base size=8 base align=8 -QDateTime::Data (0x0x7f5a2a1e9c00) 0 - -Class QDateTime - size=8 align=8 - base size=8 base align=8 -QDateTime (0x0x7f5a2a1e9b40) 0 - -Class QLocale - size=8 align=8 - base size=8 base align=8 -QLocale (0x0x7f5a2a30bd20) 0 - -Vtable for QTextStream -QTextStream::_ZTV11QTextStream: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTextStream) -16 (int (*)(...))QTextStream::~QTextStream -24 (int (*)(...))QTextStream::~QTextStream - -Class QTextStream - size=16 align=8 - base size=16 base align=8 -QTextStream (0x0x7f5a29fd4360) 0 - vptr=((& QTextStream::_ZTV11QTextStream) + 16u) - -Class QTextStreamManipulator - size=40 align=8 - base size=38 base align=8 -QTextStreamManipulator (0x0x7f5a29fd4600) 0 - -Class QContiguousCacheData - size=24 align=4 - base size=24 base align=4 -QContiguousCacheData (0x0x7f5a29fd4840) 0 - -Class QtSharedPointer::NormalDeleter - size=1 align=1 - base size=0 base align=1 -QtSharedPointer::NormalDeleter (0x0x7f5a29fd4f00) 0 empty - -Class QtSharedPointer::ExternalRefCountData - size=16 align=8 - base size=16 base align=8 -QtSharedPointer::ExternalRefCountData (0x0x7f5a29d060c0) 0 - -Class QDebug::Stream - size=80 align=8 - base size=76 base align=8 -QDebug::Stream (0x0x7f5a29d06600) 0 - -Class QDebug - size=8 align=8 - base size=8 base align=8 -QDebug (0x0x7f5a29d065a0) 0 - -Class QDebugStateSaver - size=8 align=8 - base size=8 base align=8 -QDebugStateSaver (0x0x7f5a29b15900) 0 - -Class QNoDebug - size=1 align=1 - base size=0 base align=1 -QNoDebug (0x0x7f5a29b159c0) 0 empty - -Class QCborError - size=4 align=4 - base size=4 base align=4 -QCborError (0x0x7f5a29b93d20) 0 - -Class QRegularExpression - size=8 align=8 - base size=8 base align=8 -QRegularExpression (0x0x7f5a29b93ea0) 0 - -Class QRegularExpressionMatch - size=8 align=8 - base size=8 base align=8 -QRegularExpressionMatch (0x0x7f5a29bf94e0) 0 - -Class QRegularExpressionMatchIterator - size=8 align=8 - base size=8 base align=8 -QRegularExpressionMatchIterator (0x0x7f5a29bf97e0) 0 - -Class QUrl - size=8 align=8 - base size=8 base align=8 -QUrl (0x0x7f5a29bf9ba0) 0 - -Class QUuid - size=16 align=4 - base size=16 base align=4 -QUuid (0x0x7f5a299952a0) 0 - -Class QCborParserError - size=16 align=8 - base size=12 base align=8 -QCborParserError (0x0x7f5a299958a0) 0 - -Class QCborValue - size=24 align=8 - base size=20 base align=8 -QCborValue (0x0x7f5a29995900) 0 - -Class QCborValueRef - size=16 align=8 - base size=16 base align=8 -QCborValueRef (0x0x7f5a29851900) 0 - -Class QCborArray::Iterator - size=16 align=8 - base size=16 base align=8 -QCborArray::Iterator (0x0x7f5a29851ea0) 0 - -Class QCborArray::ConstIterator - size=16 align=8 - base size=16 base align=8 -QCborArray::ConstIterator (0x0x7f5a29851f00) 0 - -Class QCborArray - size=8 align=8 - base size=8 base align=8 -QCborArray (0x0x7f5a29851e40) 0 - -Class QCborMap::Iterator - size=16 align=8 - base size=16 base align=8 -QCborMap::Iterator (0x0x7f5a29581f60) 0 - -Class QCborMap::ConstIterator - size=16 align=8 - base size=16 base align=8 -QCborMap::ConstIterator (0x0x7f5a29620000) 0 - -Class QCborMap - size=8 align=8 - base size=8 base align=8 -QCborMap (0x0x7f5a29581f00) 0 - -Class qfloat16 - size=2 align=2 - base size=2 base align=2 -qfloat16 (0x0x7f5a29333b40) 0 - -Class QCborStreamWriter - size=8 align=8 - base size=8 base align=8 -QCborStreamWriter (0x0x7f5a29333f00) 0 - -Class QCborStreamReader - size=24 align=8 - base size=20 base align=8 -QCborStreamReader (0x0x7f5a2949f900) 0 - -Class QCollatorSortKey - size=8 align=8 - base size=8 base align=8 -QCollatorSortKey (0x0x7f5a2949ff60) 0 - -Class QCollator - size=8 align=8 - base size=8 base align=8 -QCollator (0x0x7f5a29146060) 0 - -Class QCommandLineOption - size=8 align=8 - base size=8 base align=8 -QCommandLineOption (0x0x7f5a291df060) 0 - -Vtable for QEvent -QEvent::_ZTV6QEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QEvent) -16 (int (*)(...))QEvent::~QEvent -24 (int (*)(...))QEvent::~QEvent - -Class QEvent - size=24 align=8 - base size=20 base align=8 -QEvent (0x0x7f5a291df4e0) 0 - vptr=((& QEvent::_ZTV6QEvent) + 16u) - -Vtable for QTimerEvent -QTimerEvent::_ZTV11QTimerEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTimerEvent) -16 (int (*)(...))QTimerEvent::~QTimerEvent -24 (int (*)(...))QTimerEvent::~QTimerEvent - -Class QTimerEvent - size=24 align=8 - base size=24 base align=8 -QTimerEvent (0x0x7f5a291d0af8) 0 - vptr=((& QTimerEvent::_ZTV11QTimerEvent) + 16u) - QEvent (0x0x7f5a291df540) 0 - primary-for QTimerEvent (0x0x7f5a291d0af8) - -Vtable for QChildEvent -QChildEvent::_ZTV11QChildEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QChildEvent) -16 (int (*)(...))QChildEvent::~QChildEvent -24 (int (*)(...))QChildEvent::~QChildEvent - -Class QChildEvent - size=32 align=8 - base size=32 base align=8 -QChildEvent (0x0x7f5a291d0b60) 0 - vptr=((& QChildEvent::_ZTV11QChildEvent) + 16u) - QEvent (0x0x7f5a291df5a0) 0 - primary-for QChildEvent (0x0x7f5a291d0b60) - -Vtable for QDynamicPropertyChangeEvent -QDynamicPropertyChangeEvent::_ZTV27QDynamicPropertyChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QDynamicPropertyChangeEvent) -16 (int (*)(...))QDynamicPropertyChangeEvent::~QDynamicPropertyChangeEvent -24 (int (*)(...))QDynamicPropertyChangeEvent::~QDynamicPropertyChangeEvent - -Class QDynamicPropertyChangeEvent - size=32 align=8 - base size=32 base align=8 -QDynamicPropertyChangeEvent (0x0x7f5a292570d0) 0 - vptr=((& QDynamicPropertyChangeEvent::_ZTV27QDynamicPropertyChangeEvent) + 16u) - QEvent (0x0x7f5a291dfa80) 0 - primary-for QDynamicPropertyChangeEvent (0x0x7f5a292570d0) - -Vtable for QDeferredDeleteEvent -QDeferredDeleteEvent::_ZTV20QDeferredDeleteEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QDeferredDeleteEvent) -16 (int (*)(...))QDeferredDeleteEvent::~QDeferredDeleteEvent -24 (int (*)(...))QDeferredDeleteEvent::~QDeferredDeleteEvent - -Class QDeferredDeleteEvent - size=24 align=8 - base size=24 base align=8 -QDeferredDeleteEvent (0x0x7f5a29257138) 0 - vptr=((& QDeferredDeleteEvent::_ZTV20QDeferredDeleteEvent) + 16u) - QEvent (0x0x7f5a291dfae0) 0 - primary-for QDeferredDeleteEvent (0x0x7f5a29257138) - -Class QCoreApplication::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QCoreApplication::QPrivateSignal (0x0x7f5a291dfba0) 0 empty - -Vtable for QCoreApplication -QCoreApplication::_ZTV16QCoreApplication: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QCoreApplication) -16 (int (*)(...))QCoreApplication::metaObject -24 (int (*)(...))QCoreApplication::qt_metacast -32 (int (*)(...))QCoreApplication::qt_metacall -40 (int (*)(...))QCoreApplication::~QCoreApplication -48 (int (*)(...))QCoreApplication::~QCoreApplication -56 (int (*)(...))QCoreApplication::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QCoreApplication::notify -120 (int (*)(...))QCoreApplication::compressEvent - -Class QCoreApplication - size=16 align=8 - base size=16 base align=8 -QCoreApplication (0x0x7f5a292571a0) 0 - vptr=((& QCoreApplication::_ZTV16QCoreApplication) + 16u) - QObject (0x0x7f5a291dfb40) 0 - primary-for QCoreApplication (0x0x7f5a292571a0) - -Class QCommandLineParser - size=8 align=8 - base size=8 base align=8 -QCommandLineParser (0x0x7f5a291dfc00) 0 - -Class QCryptographicHash - size=8 align=8 - base size=8 base align=8 -QCryptographicHash (0x0x7f5a291dfc60) 0 - -Class QDataStream - size=32 align=8 - base size=32 base align=8 -QDataStream (0x0x7f5a291dfcc0) 0 - -Class QtPrivate::StreamStateSaver - size=16 align=8 - base size=12 base align=8 -QtPrivate::StreamStateSaver (0x0x7f5a291dfd80) 0 - -Class QElapsedTimer - size=16 align=8 - base size=16 base align=8 -QElapsedTimer (0x0x7f5a28eb02a0) 0 - -Class QDeadlineTimer - size=16 align=8 - base size=16 base align=8 -QDeadlineTimer (0x0x7f5a28eb0780) 0 - -Class QFileDevice::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFileDevice::QPrivateSignal (0x0x7f5a29019600) 0 empty - -Vtable for QFileDevice -QFileDevice::_ZTV11QFileDevice: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QFileDevice) -16 (int (*)(...))QFileDevice::metaObject -24 (int (*)(...))QFileDevice::qt_metacast -32 (int (*)(...))QFileDevice::qt_metacall -40 (int (*)(...))QFileDevice::~QFileDevice -48 (int (*)(...))QFileDevice::~QFileDevice -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QFileDevice::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFileDevice::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QFileDevice::writeData -240 (int (*)(...))QFileDevice::fileName -248 (int (*)(...))QFileDevice::resize -256 (int (*)(...))QFileDevice::permissions -264 (int (*)(...))QFileDevice::setPermissions - -Class QFileDevice - size=16 align=8 - base size=16 base align=8 -QFileDevice (0x0x7f5a2901a618) 0 - vptr=((& QFileDevice::_ZTV11QFileDevice) + 16u) - QIODevice (0x0x7f5a2901a680) 0 - primary-for QFileDevice (0x0x7f5a2901a618) - QObject (0x0x7f5a290195a0) 0 - primary-for QIODevice (0x0x7f5a2901a680) - -Class QFile::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFile::QPrivateSignal (0x0x7f5a29019840) 0 empty - -Vtable for QFile -QFile::_ZTV5QFile: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI5QFile) -16 (int (*)(...))QFile::metaObject -24 (int (*)(...))QFile::qt_metacast -32 (int (*)(...))QFile::qt_metacall -40 (int (*)(...))QFile::~QFile -48 (int (*)(...))QFile::~QFile -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QFile::open -128 (int (*)(...))QFileDevice::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFile::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QFileDevice::writeData -240 (int (*)(...))QFile::fileName -248 (int (*)(...))QFile::resize -256 (int (*)(...))QFile::permissions -264 (int (*)(...))QFile::setPermissions - -Class QFile - size=16 align=8 - base size=16 base align=8 -QFile (0x0x7f5a2901a7b8) 0 - vptr=((& QFile::_ZTV5QFile) + 16u) - QFileDevice (0x0x7f5a2901a820) 0 - primary-for QFile (0x0x7f5a2901a7b8) - QIODevice (0x0x7f5a2901a888) 0 - primary-for QFileDevice (0x0x7f5a2901a820) - QObject (0x0x7f5a290197e0) 0 - primary-for QIODevice (0x0x7f5a2901a888) - -Class QFileInfo - size=8 align=8 - base size=8 base align=8 -QFileInfo (0x0x7f5a29019a20) 0 - -Class QDir - size=8 align=8 - base size=8 base align=8 -QDir (0x0x7f5a29019e40) 0 - -Class QDirIterator - size=8 align=8 - base size=8 base align=8 -QDirIterator (0x0x7f5a28d09480) 0 - -Class QEasingCurve - size=8 align=8 - base size=8 base align=8 -QEasingCurve (0x0x7f5a28d096c0) 0 - -Class QEventTransition::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QEventTransition::QPrivateSignal (0x0x7f5a28e23ae0) 0 empty - -Vtable for QEventTransition -QEventTransition::_ZTV16QEventTransition: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QEventTransition) -16 (int (*)(...))QEventTransition::metaObject -24 (int (*)(...))QEventTransition::qt_metacast -32 (int (*)(...))QEventTransition::qt_metacall -40 (int (*)(...))QEventTransition::~QEventTransition -48 (int (*)(...))QEventTransition::~QEventTransition -56 (int (*)(...))QEventTransition::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QEventTransition::eventTest -120 (int (*)(...))QEventTransition::onTransition - -Class QEventTransition - size=16 align=8 - base size=16 base align=8 -QEventTransition (0x0x7f5a28e26888) 0 - vptr=((& QEventTransition::_ZTV16QEventTransition) + 16u) - QAbstractTransition (0x0x7f5a28e268f0) 0 - primary-for QEventTransition (0x0x7f5a28e26888) - QObject (0x0x7f5a28e23a80) 0 - primary-for QAbstractTransition (0x0x7f5a28e268f0) - -Vtable for QException -QException::_ZTV10QException: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QException) -16 (int (*)(...))QException::~QException -24 (int (*)(...))QException::~QException -32 (int (*)(...))std::exception::what -40 (int (*)(...))QException::raise -48 (int (*)(...))QException::clone - -Class QException - size=8 align=8 - base size=8 base align=8 -QException (0x0x7f5a28e26958) 0 nearly-empty - vptr=((& QException::_ZTV10QException) + 16u) - std::exception (0x0x7f5a28e23b40) 0 nearly-empty - primary-for QException (0x0x7f5a28e26958) - -Vtable for QUnhandledException -QUnhandledException::_ZTV19QUnhandledException: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QUnhandledException) -16 (int (*)(...))QUnhandledException::~QUnhandledException -24 (int (*)(...))QUnhandledException::~QUnhandledException -32 (int (*)(...))std::exception::what -40 (int (*)(...))QUnhandledException::raise -48 (int (*)(...))QUnhandledException::clone - -Class QUnhandledException - size=8 align=8 - base size=8 base align=8 -QUnhandledException (0x0x7f5a28e269c0) 0 nearly-empty - vptr=((& QUnhandledException::_ZTV19QUnhandledException) + 16u) - QException (0x0x7f5a28e26a28) 0 nearly-empty - primary-for QUnhandledException (0x0x7f5a28e269c0) - std::exception (0x0x7f5a28e23ba0) 0 nearly-empty - primary-for QException (0x0x7f5a28e26a28) - -Class QtPrivate::ExceptionHolder - size=8 align=8 - base size=8 base align=8 -QtPrivate::ExceptionHolder (0x0x7f5a28e23c00) 0 - -Class QtPrivate::ExceptionStore - size=8 align=8 - base size=8 base align=8 -QtPrivate::ExceptionStore (0x0x7f5a28e23cc0) 0 - -Vtable for QFactoryInterface -QFactoryInterface::_ZTV17QFactoryInterface: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QFactoryInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QFactoryInterface - size=8 align=8 - base size=8 base align=8 -QFactoryInterface (0x0x7f5a28e23d20) 0 nearly-empty - vptr=((& QFactoryInterface::_ZTV17QFactoryInterface) + 16u) - -Class QFileSelector::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFileSelector::QPrivateSignal (0x0x7f5a28e23e40) 0 empty - -Vtable for QFileSelector -QFileSelector::_ZTV13QFileSelector: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QFileSelector) -16 (int (*)(...))QFileSelector::metaObject -24 (int (*)(...))QFileSelector::qt_metacast -32 (int (*)(...))QFileSelector::qt_metacall -40 (int (*)(...))QFileSelector::~QFileSelector -48 (int (*)(...))QFileSelector::~QFileSelector -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QFileSelector - size=16 align=8 - base size=16 base align=8 -QFileSelector (0x0x7f5a28e26a90) 0 - vptr=((& QFileSelector::_ZTV13QFileSelector) + 16u) - QObject (0x0x7f5a28e23de0) 0 - primary-for QFileSelector (0x0x7f5a28e26a90) - -Class QFileSystemWatcher::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFileSystemWatcher::QPrivateSignal (0x0x7f5a28e23f00) 0 empty - -Vtable for QFileSystemWatcher -QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QFileSystemWatcher) -16 (int (*)(...))QFileSystemWatcher::metaObject -24 (int (*)(...))QFileSystemWatcher::qt_metacast -32 (int (*)(...))QFileSystemWatcher::qt_metacall -40 (int (*)(...))QFileSystemWatcher::~QFileSystemWatcher -48 (int (*)(...))QFileSystemWatcher::~QFileSystemWatcher -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QFileSystemWatcher - size=16 align=8 - base size=16 base align=8 -QFileSystemWatcher (0x0x7f5a28e26af8) 0 - vptr=((& QFileSystemWatcher::_ZTV18QFileSystemWatcher) + 16u) - QObject (0x0x7f5a28e23ea0) 0 - primary-for QFileSystemWatcher (0x0x7f5a28e26af8) - -Class QFinalState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFinalState::QPrivateSignal (0x0x7f5a28ad8000) 0 empty - -Vtable for QFinalState -QFinalState::_ZTV11QFinalState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QFinalState) -16 (int (*)(...))QFinalState::metaObject -24 (int (*)(...))QFinalState::qt_metacast -32 (int (*)(...))QFinalState::qt_metacall -40 (int (*)(...))QFinalState::~QFinalState -48 (int (*)(...))QFinalState::~QFinalState -56 (int (*)(...))QFinalState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFinalState::onEntry -120 (int (*)(...))QFinalState::onExit - -Class QFinalState - size=16 align=8 - base size=16 base align=8 -QFinalState (0x0x7f5a28e26b60) 0 - vptr=((& QFinalState::_ZTV11QFinalState) + 16u) - QAbstractState (0x0x7f5a28e26bc8) 0 - primary-for QFinalState (0x0x7f5a28e26b60) - QObject (0x0x7f5a28e23f60) 0 - primary-for QAbstractState (0x0x7f5a28e26bc8) - -Vtable for QRunnable -QRunnable::_ZTV9QRunnable: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QRunnable) -16 (int (*)(...))__cxa_pure_virtual -24 0u -32 0u - -Class QRunnable - size=16 align=8 - base size=12 base align=8 -QRunnable (0x0x7f5a28ad8060) 0 - vptr=((& QRunnable::_ZTV9QRunnable) + 16u) - -Class QBasicMutex - size=8 align=8 - base size=8 base align=8 -QBasicMutex (0x0x7f5a28ad80c0) 0 - -Class QMutex - size=8 align=8 - base size=8 base align=8 -QMutex (0x0x7f5a28e26d00) 0 - QBasicMutex (0x0x7f5a28ad82a0) 0 - -Class QMutexLocker - size=8 align=8 - base size=8 base align=8 -QMutexLocker (0x0x7f5a28ad8300) 0 - -Class QtPrivate::ResultItem - size=16 align=8 - base size=16 base align=8 -QtPrivate::ResultItem (0x0x7f5a28ad8360) 0 - -Class QtPrivate::ResultIteratorBase - size=16 align=8 - base size=12 base align=8 -QtPrivate::ResultIteratorBase (0x0x7f5a28ad83c0) 0 - -Vtable for QtPrivate::ResultStoreBase -QtPrivate::ResultStoreBase::_ZTVN9QtPrivate15ResultStoreBaseE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9QtPrivate15ResultStoreBaseE) -16 (int (*)(...))QtPrivate::ResultStoreBase::~ResultStoreBase -24 (int (*)(...))QtPrivate::ResultStoreBase::~ResultStoreBase - -Class QtPrivate::ResultStoreBase - size=48 align=8 - base size=44 base align=8 -QtPrivate::ResultStoreBase (0x0x7f5a28ad84e0) 0 - vptr=((& QtPrivate::ResultStoreBase::_ZTVN9QtPrivate15ResultStoreBaseE) + 16u) - -Vtable for QFutureInterfaceBase -QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QFutureInterfaceBase) -16 (int (*)(...))QFutureInterfaceBase::~QFutureInterfaceBase -24 (int (*)(...))QFutureInterfaceBase::~QFutureInterfaceBase - -Class QFutureInterfaceBase - size=16 align=8 - base size=16 base align=8 -QFutureInterfaceBase (0x0x7f5a28ad8d20) 0 - vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 16u) - -Class QFutureWatcherBase::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QFutureWatcherBase::QPrivateSignal (0x0x7f5a28c54540) 0 empty - -Vtable for QFutureWatcherBase -QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QFutureWatcherBase) -16 (int (*)(...))QFutureWatcherBase::metaObject -24 (int (*)(...))QFutureWatcherBase::qt_metacast -32 (int (*)(...))QFutureWatcherBase::qt_metacall -40 0u -48 0u -56 (int (*)(...))QFutureWatcherBase::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QFutureWatcherBase::connectNotify -104 (int (*)(...))QFutureWatcherBase::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QFutureWatcherBase - size=16 align=8 - base size=16 base align=8 -QFutureWatcherBase (0x0x7f5a28bcee38) 0 - vptr=((& QFutureWatcherBase::_ZTV18QFutureWatcherBase) + 16u) - QObject (0x0x7f5a28c544e0) 0 - primary-for QFutureWatcherBase (0x0x7f5a28bcee38) - -Class QHistoryState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QHistoryState::QPrivateSignal (0x0x7f5a28c54b40) 0 empty - -Vtable for QHistoryState -QHistoryState::_ZTV13QHistoryState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QHistoryState) -16 (int (*)(...))QHistoryState::metaObject -24 (int (*)(...))QHistoryState::qt_metacast -32 (int (*)(...))QHistoryState::qt_metacall -40 (int (*)(...))QHistoryState::~QHistoryState -48 (int (*)(...))QHistoryState::~QHistoryState -56 (int (*)(...))QHistoryState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QHistoryState::onEntry -120 (int (*)(...))QHistoryState::onExit - -Class QHistoryState - size=16 align=8 - base size=16 base align=8 -QHistoryState (0x0x7f5a28c98750) 0 - vptr=((& QHistoryState::_ZTV13QHistoryState) + 16u) - QAbstractState (0x0x7f5a28c987b8) 0 - primary-for QHistoryState (0x0x7f5a28c98750) - QObject (0x0x7f5a28c54ae0) 0 - primary-for QAbstractState (0x0x7f5a28c987b8) - -Class QIdentityProxyModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIdentityProxyModel::QPrivateSignal (0x0x7f5a28c54c00) 0 empty - -Vtable for QIdentityProxyModel -QIdentityProxyModel::_ZTV19QIdentityProxyModel: 53u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QIdentityProxyModel) -16 (int (*)(...))QIdentityProxyModel::metaObject -24 (int (*)(...))QIdentityProxyModel::qt_metacast -32 (int (*)(...))QIdentityProxyModel::qt_metacall -40 (int (*)(...))QIdentityProxyModel::~QIdentityProxyModel -48 (int (*)(...))QIdentityProxyModel::~QIdentityProxyModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QIdentityProxyModel::index -120 (int (*)(...))QIdentityProxyModel::parent -128 (int (*)(...))QIdentityProxyModel::sibling -136 (int (*)(...))QIdentityProxyModel::rowCount -144 (int (*)(...))QIdentityProxyModel::columnCount -152 (int (*)(...))QAbstractProxyModel::hasChildren -160 (int (*)(...))QAbstractProxyModel::data -168 (int (*)(...))QAbstractProxyModel::setData -176 (int (*)(...))QIdentityProxyModel::headerData -184 (int (*)(...))QAbstractProxyModel::setHeaderData -192 (int (*)(...))QAbstractProxyModel::itemData -200 (int (*)(...))QAbstractProxyModel::setItemData -208 (int (*)(...))QAbstractProxyModel::mimeTypes -216 (int (*)(...))QAbstractProxyModel::mimeData -224 (int (*)(...))QAbstractProxyModel::canDropMimeData -232 (int (*)(...))QIdentityProxyModel::dropMimeData -240 (int (*)(...))QAbstractProxyModel::supportedDropActions -248 (int (*)(...))QAbstractProxyModel::supportedDragActions -256 (int (*)(...))QIdentityProxyModel::insertRows -264 (int (*)(...))QIdentityProxyModel::insertColumns -272 (int (*)(...))QIdentityProxyModel::removeRows -280 (int (*)(...))QIdentityProxyModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractProxyModel::fetchMore -312 (int (*)(...))QAbstractProxyModel::canFetchMore -320 (int (*)(...))QAbstractProxyModel::flags -328 (int (*)(...))QAbstractProxyModel::sort -336 (int (*)(...))QAbstractProxyModel::buddy -344 (int (*)(...))QIdentityProxyModel::match -352 (int (*)(...))QAbstractProxyModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractProxyModel::submit -376 (int (*)(...))QAbstractProxyModel::revert -384 (int (*)(...))QIdentityProxyModel::setSourceModel -392 (int (*)(...))QIdentityProxyModel::mapToSource -400 (int (*)(...))QIdentityProxyModel::mapFromSource -408 (int (*)(...))QIdentityProxyModel::mapSelectionToSource -416 (int (*)(...))QIdentityProxyModel::mapSelectionFromSource - -Class QIdentityProxyModel - size=16 align=8 - base size=16 base align=8 -QIdentityProxyModel (0x0x7f5a28c98820) 0 - vptr=((& QIdentityProxyModel::_ZTV19QIdentityProxyModel) + 16u) - QAbstractProxyModel (0x0x7f5a28c98888) 0 - primary-for QIdentityProxyModel (0x0x7f5a28c98820) - QAbstractItemModel (0x0x7f5a28c988f0) 0 - primary-for QAbstractProxyModel (0x0x7f5a28c98888) - QObject (0x0x7f5a28c54ba0) 0 - primary-for QAbstractItemModel (0x0x7f5a28c988f0) - -Class QItemSelectionRange - size=16 align=8 - base size=16 base align=8 -QItemSelectionRange (0x0x7f5a28c54c60) 0 - -Class QItemSelectionModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QItemSelectionModel::QPrivateSignal (0x0x7f5a28925360) 0 empty - -Vtable for QItemSelectionModel -QItemSelectionModel::_ZTV19QItemSelectionModel: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QItemSelectionModel) -16 (int (*)(...))QItemSelectionModel::metaObject -24 (int (*)(...))QItemSelectionModel::qt_metacast -32 (int (*)(...))QItemSelectionModel::qt_metacall -40 (int (*)(...))QItemSelectionModel::~QItemSelectionModel -48 (int (*)(...))QItemSelectionModel::~QItemSelectionModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QItemSelectionModel::setCurrentIndex -120 (int (*)(...))QItemSelectionModel::select -128 (int (*)(...))QItemSelectionModel::select -136 (int (*)(...))QItemSelectionModel::clear -144 (int (*)(...))QItemSelectionModel::reset -152 (int (*)(...))QItemSelectionModel::clearCurrentIndex - -Class QItemSelectionModel - size=16 align=8 - base size=16 base align=8 -QItemSelectionModel (0x0x7f5a28938138) 0 - vptr=((& QItemSelectionModel::_ZTV19QItemSelectionModel) + 16u) - QObject (0x0x7f5a28925300) 0 - primary-for QItemSelectionModel (0x0x7f5a28938138) - -Class QItemSelection - size=8 align=8 - base size=8 base align=8 -QItemSelection (0x0x7f5a28938340) 0 - QList (0x0x7f5a289383a8) 0 - QListSpecialMethods (0x0x7f5a28925660) 0 empty - -Class QJsonValue - size=24 align=8 - base size=20 base align=8 -QJsonValue (0x0x7f5a28925b40) 0 - -Class QJsonValueRef - size=16 align=8 - base size=12 base align=8 -QJsonValueRef (0x0x7f5a287362a0) 0 - -Class QJsonValuePtr - size=24 align=8 - base size=24 base align=8 -QJsonValuePtr (0x0x7f5a287367e0) 0 - -Class QJsonValueRefPtr - size=16 align=8 - base size=16 base align=8 -QJsonValueRefPtr (0x0x7f5a28736840) 0 - -Class QJsonArray::iterator - size=16 align=8 - base size=12 base align=8 -QJsonArray::iterator (0x0x7f5a28736a20) 0 - -Class QJsonArray::const_iterator - size=16 align=8 - base size=12 base align=8 -QJsonArray::const_iterator (0x0x7f5a28736a80) 0 - -Class QJsonArray - size=16 align=8 - base size=16 base align=8 -QJsonArray (0x0x7f5a287369c0) 0 - -Class QJsonParseError - size=8 align=4 - base size=8 base align=4 -QJsonParseError (0x0x7f5a28846cc0) 0 - -Class QJsonDocument - size=8 align=8 - base size=8 base align=8 -QJsonDocument (0x0x7f5a28846d20) 0 - -Class QJsonObject::iterator - size=16 align=8 - base size=12 base align=8 -QJsonObject::iterator (0x0x7f5a284c13c0) 0 - -Class QJsonObject::const_iterator - size=16 align=8 - base size=12 base align=8 -QJsonObject::const_iterator (0x0x7f5a284c1420) 0 - -Class QJsonObject - size=16 align=8 - base size=16 base align=8 -QJsonObject (0x0x7f5a284c1360) 0 - -Class QLibrary::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QLibrary::QPrivateSignal (0x0x7f5a285786c0) 0 empty - -Vtable for QLibrary -QLibrary::_ZTV8QLibrary: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QLibrary) -16 (int (*)(...))QLibrary::metaObject -24 (int (*)(...))QLibrary::qt_metacast -32 (int (*)(...))QLibrary::qt_metacall -40 (int (*)(...))QLibrary::~QLibrary -48 (int (*)(...))QLibrary::~QLibrary -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QLibrary - size=32 align=8 - base size=25 base align=8 -QLibrary (0x0x7f5a285806e8) 0 - vptr=((& QLibrary::_ZTV8QLibrary) + 16u) - QObject (0x0x7f5a28578660) 0 - primary-for QLibrary (0x0x7f5a285806e8) - -Class QVersionNumber::SegmentStorage - size=8 align=8 - base size=8 base align=8 -QVersionNumber::SegmentStorage (0x0x7f5a28578d80) 0 - -Class QVersionNumber - size=8 align=8 - base size=8 base align=8 -QVersionNumber (0x0x7f5a285788a0) 0 - -Class QLibraryInfo - size=1 align=1 - base size=0 base align=1 -QLibraryInfo (0x0x7f5a286672a0) 0 empty - -Class QPoint - size=8 align=4 - base size=8 base align=4 -QPoint (0x0x7f5a28667300) 0 - -Class QPointF - size=16 align=8 - base size=16 base align=8 -QPointF (0x0x7f5a286675a0) 0 - -Class QLine - size=16 align=4 - base size=16 base align=4 -QLine (0x0x7f5a28667ba0) 0 - -Class QLineF - size=32 align=8 - base size=32 base align=8 -QLineF (0x0x7f5a2830c540) 0 - -Class QLinkedListData - size=32 align=8 - base size=25 base align=8 -QLinkedListData (0x0x7f5a2830cb40) 0 - -Class QLockFile - size=8 align=8 - base size=8 base align=8 -QLockFile (0x0x7f5a2830cea0) 0 - -Class QLoggingCategory::AtomicBools - size=4 align=1 - base size=4 base align=1 -QLoggingCategory::AtomicBools (0x0x7f5a28448060) 0 - -Class QLoggingCategory - size=24 align=8 - base size=24 base align=8 -QLoggingCategory (0x0x7f5a28448000) 0 - -Class QMargins - size=16 align=4 - base size=16 base align=4 -QMargins (0x0x7f5a284481e0) 0 - -Class QMarginsF - size=32 align=8 - base size=32 base align=8 -QMarginsF (0x0x7f5a28448480) 0 - -Class QMessageAuthenticationCode - size=8 align=8 - base size=8 base align=8 -QMessageAuthenticationCode (0x0x7f5a28448ae0) 0 - -Class QMetaMethod - size=16 align=8 - base size=12 base align=8 -QMetaMethod (0x0x7f5a28448b40) 0 - -Class QMetaEnum - size=16 align=8 - base size=12 base align=8 -QMetaEnum (0x0x7f5a2817f180) 0 - -Class QMetaProperty - size=32 align=8 - base size=32 base align=8 -QMetaProperty (0x0x7f5a2817f480) 0 - -Class QMetaClassInfo - size=16 align=8 - base size=12 base align=8 -QMetaClassInfo (0x0x7f5a2817f4e0) 0 - -Class QMimeData::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QMimeData::QPrivateSignal (0x0x7f5a2817f7e0) 0 empty - -Vtable for QMimeData -QMimeData::_ZTV9QMimeData: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QMimeData) -16 (int (*)(...))QMimeData::metaObject -24 (int (*)(...))QMimeData::qt_metacast -32 (int (*)(...))QMimeData::qt_metacall -40 (int (*)(...))QMimeData::~QMimeData -48 (int (*)(...))QMimeData::~QMimeData -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QMimeData::hasFormat -120 (int (*)(...))QMimeData::formats -128 (int (*)(...))QMimeData::retrieveData - -Class QMimeData - size=16 align=8 - base size=16 base align=8 -QMimeData (0x0x7f5a28176958) 0 - vptr=((& QMimeData::_ZTV9QMimeData) + 16u) - QObject (0x0x7f5a2817f780) 0 - primary-for QMimeData (0x0x7f5a28176958) - -Class QMimeType - size=8 align=8 - base size=8 base align=8 -QMimeType (0x0x7f5a2817f840) 0 - -Class QMimeDatabase - size=8 align=8 - base size=8 base align=8 -QMimeDatabase (0x0x7f5a2817fb40) 0 - -Class QObjectCleanupHandler::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QObjectCleanupHandler::QPrivateSignal (0x0x7f5a2817fc00) 0 empty - -Vtable for QObjectCleanupHandler -QObjectCleanupHandler::_ZTV21QObjectCleanupHandler: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QObjectCleanupHandler) -16 (int (*)(...))QObjectCleanupHandler::metaObject -24 (int (*)(...))QObjectCleanupHandler::qt_metacast -32 (int (*)(...))QObjectCleanupHandler::qt_metacall -40 (int (*)(...))QObjectCleanupHandler::~QObjectCleanupHandler -48 (int (*)(...))QObjectCleanupHandler::~QObjectCleanupHandler -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QObjectCleanupHandler - size=24 align=8 - base size=24 base align=8 -QObjectCleanupHandler (0x0x7f5a28176b60) 0 - vptr=((& QObjectCleanupHandler::_ZTV21QObjectCleanupHandler) + 16u) - QObject (0x0x7f5a2817fba0) 0 - primary-for QObjectCleanupHandler (0x0x7f5a28176b60) - -Class QOperatingSystemVersion - size=16 align=4 - base size=16 base align=4 -QOperatingSystemVersion (0x0x7f5a2817fc60) 0 - -Class QParallelAnimationGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QParallelAnimationGroup::QPrivateSignal (0x0x7f5a2820a420) 0 empty - -Vtable for QParallelAnimationGroup -QParallelAnimationGroup::_ZTV23QParallelAnimationGroup: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QParallelAnimationGroup) -16 (int (*)(...))QParallelAnimationGroup::metaObject -24 (int (*)(...))QParallelAnimationGroup::qt_metacast -32 (int (*)(...))QParallelAnimationGroup::qt_metacall -40 (int (*)(...))QParallelAnimationGroup::~QParallelAnimationGroup -48 (int (*)(...))QParallelAnimationGroup::~QParallelAnimationGroup -56 (int (*)(...))QParallelAnimationGroup::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QParallelAnimationGroup::duration -120 (int (*)(...))QParallelAnimationGroup::updateCurrentTime -128 (int (*)(...))QParallelAnimationGroup::updateState -136 (int (*)(...))QParallelAnimationGroup::updateDirection - -Class QParallelAnimationGroup - size=16 align=8 - base size=16 base align=8 -QParallelAnimationGroup (0x0x7f5a2820e270) 0 - vptr=((& QParallelAnimationGroup::_ZTV23QParallelAnimationGroup) + 16u) - QAnimationGroup (0x0x7f5a2820e2d8) 0 - primary-for QParallelAnimationGroup (0x0x7f5a2820e270) - QAbstractAnimation (0x0x7f5a2820e340) 0 - primary-for QAnimationGroup (0x0x7f5a2820e2d8) - QObject (0x0x7f5a2820a3c0) 0 - primary-for QAbstractAnimation (0x0x7f5a2820e340) - -Class QPauseAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPauseAnimation::QPrivateSignal (0x0x7f5a2820a4e0) 0 empty - -Vtable for QPauseAnimation -QPauseAnimation::_ZTV15QPauseAnimation: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QPauseAnimation) -16 (int (*)(...))QPauseAnimation::metaObject -24 (int (*)(...))QPauseAnimation::qt_metacast -32 (int (*)(...))QPauseAnimation::qt_metacall -40 (int (*)(...))QPauseAnimation::~QPauseAnimation -48 (int (*)(...))QPauseAnimation::~QPauseAnimation -56 (int (*)(...))QPauseAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QPauseAnimation::duration -120 (int (*)(...))QPauseAnimation::updateCurrentTime -128 (int (*)(...))QAbstractAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection - -Class QPauseAnimation - size=16 align=8 - base size=16 base align=8 -QPauseAnimation (0x0x7f5a2820e3a8) 0 - vptr=((& QPauseAnimation::_ZTV15QPauseAnimation) + 16u) - QAbstractAnimation (0x0x7f5a2820e410) 0 - primary-for QPauseAnimation (0x0x7f5a2820e3a8) - QObject (0x0x7f5a2820a480) 0 - primary-for QAbstractAnimation (0x0x7f5a2820e410) - -Class QStaticPlugin - size=16 align=8 - base size=16 base align=8 -QStaticPlugin (0x0x7f5a2820a6c0) 0 - -Class QPluginLoader::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPluginLoader::QPrivateSignal (0x0x7f5a2820a9c0) 0 empty - -Vtable for QPluginLoader -QPluginLoader::_ZTV13QPluginLoader: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QPluginLoader) -16 (int (*)(...))QPluginLoader::metaObject -24 (int (*)(...))QPluginLoader::qt_metacast -32 (int (*)(...))QPluginLoader::qt_metacall -40 (int (*)(...))QPluginLoader::~QPluginLoader -48 (int (*)(...))QPluginLoader::~QPluginLoader -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QPluginLoader - size=32 align=8 - base size=25 base align=8 -QPluginLoader (0x0x7f5a2820e618) 0 - vptr=((& QPluginLoader::_ZTV13QPluginLoader) + 16u) - QObject (0x0x7f5a2820a960) 0 - primary-for QPluginLoader (0x0x7f5a2820e618) - -Class QProcessEnvironment - size=8 align=8 - base size=8 base align=8 -QProcessEnvironment (0x0x7f5a2820aa20) 0 - -Class QProcess::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QProcess::QPrivateSignal (0x0x7f5a28294120) 0 empty - -Vtable for QProcess -QProcess::_ZTV8QProcess: 31u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QProcess) -16 (int (*)(...))QProcess::metaObject -24 (int (*)(...))QProcess::qt_metacast -32 (int (*)(...))QProcess::qt_metacall -40 (int (*)(...))QProcess::~QProcess -48 (int (*)(...))QProcess::~QProcess -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QProcess::isSequential -120 (int (*)(...))QProcess::open -128 (int (*)(...))QProcess::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QProcess::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QProcess::bytesAvailable -184 (int (*)(...))QProcess::bytesToWrite -192 (int (*)(...))QProcess::canReadLine -200 (int (*)(...))QProcess::waitForReadyRead -208 (int (*)(...))QProcess::waitForBytesWritten -216 (int (*)(...))QProcess::readData -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QProcess::writeData -240 (int (*)(...))QProcess::setupChildProcess - -Class QProcess - size=16 align=8 - base size=16 base align=8 -QProcess (0x0x7f5a2820ec98) 0 - vptr=((& QProcess::_ZTV8QProcess) + 16u) - QIODevice (0x0x7f5a2820ed00) 0 - primary-for QProcess (0x0x7f5a2820ec98) - QObject (0x0x7f5a282940c0) 0 - primary-for QIODevice (0x0x7f5a2820ed00) - -Class QVariantAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QVariantAnimation::QPrivateSignal (0x0x7f5a282941e0) 0 empty - -Vtable for QVariantAnimation -QVariantAnimation::_ZTV17QVariantAnimation: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QVariantAnimation) -16 (int (*)(...))QVariantAnimation::metaObject -24 (int (*)(...))QVariantAnimation::qt_metacast -32 (int (*)(...))QVariantAnimation::qt_metacall -40 (int (*)(...))QVariantAnimation::~QVariantAnimation -48 (int (*)(...))QVariantAnimation::~QVariantAnimation -56 (int (*)(...))QVariantAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QVariantAnimation::duration -120 (int (*)(...))QVariantAnimation::updateCurrentTime -128 (int (*)(...))QVariantAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection -144 (int (*)(...))QVariantAnimation::updateCurrentValue -152 (int (*)(...))QVariantAnimation::interpolated - -Class QVariantAnimation - size=16 align=8 - base size=16 base align=8 -QVariantAnimation (0x0x7f5a2820ed68) 0 - vptr=((& QVariantAnimation::_ZTV17QVariantAnimation) + 16u) - QAbstractAnimation (0x0x7f5a2820edd0) 0 - primary-for QVariantAnimation (0x0x7f5a2820ed68) - QObject (0x0x7f5a28294180) 0 - primary-for QAbstractAnimation (0x0x7f5a2820edd0) - -Class QPropertyAnimation::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPropertyAnimation::QPrivateSignal (0x0x7f5a282942a0) 0 empty - -Vtable for QPropertyAnimation -QPropertyAnimation::_ZTV18QPropertyAnimation: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QPropertyAnimation) -16 (int (*)(...))QPropertyAnimation::metaObject -24 (int (*)(...))QPropertyAnimation::qt_metacast -32 (int (*)(...))QPropertyAnimation::qt_metacall -40 (int (*)(...))QPropertyAnimation::~QPropertyAnimation -48 (int (*)(...))QPropertyAnimation::~QPropertyAnimation -56 (int (*)(...))QPropertyAnimation::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QVariantAnimation::duration -120 (int (*)(...))QVariantAnimation::updateCurrentTime -128 (int (*)(...))QPropertyAnimation::updateState -136 (int (*)(...))QAbstractAnimation::updateDirection -144 (int (*)(...))QPropertyAnimation::updateCurrentValue -152 (int (*)(...))QVariantAnimation::interpolated - -Class QPropertyAnimation - size=16 align=8 - base size=16 base align=8 -QPropertyAnimation (0x0x7f5a2820eea0) 0 - vptr=((& QPropertyAnimation::_ZTV18QPropertyAnimation) + 16u) - QVariantAnimation (0x0x7f5a2820ef08) 0 - primary-for QPropertyAnimation (0x0x7f5a2820eea0) - QAbstractAnimation (0x0x7f5a2820ef70) 0 - primary-for QVariantAnimation (0x0x7f5a2820ef08) - QObject (0x0x7f5a28294240) 0 - primary-for QAbstractAnimation (0x0x7f5a2820ef70) - -Class QRandomGenerator::Storage - size=2504 align=8 - base size=2504 base align=8 -QRandomGenerator::Storage (0x0x7f5a282943c0) 0 - -Class QRandomGenerator - size=2512 align=8 - base size=2512 base align=8 -QRandomGenerator (0x0x7f5a28294360) 0 - -Class QRandomGenerator64 - size=2512 align=8 - base size=2512 base align=8 -QRandomGenerator64 (0x0x7f5a27e8c270) 0 - QRandomGenerator (0x0x7f5a27e87360) 0 - -Class QReadWriteLock - size=8 align=8 - base size=8 base align=8 -QReadWriteLock (0x0x7f5a27e87420) 0 - -Class QReadLocker - size=8 align=8 - base size=8 base align=8 -QReadLocker (0x0x7f5a27e876c0) 0 - -Class QWriteLocker - size=8 align=8 - base size=8 base align=8 -QWriteLocker (0x0x7f5a27e87780) 0 - -Class QSize - size=8 align=4 - base size=8 base align=4 -QSize (0x0x7f5a27e87840) 0 - -Class QSizeF - size=16 align=8 - base size=16 base align=8 -QSizeF (0x0x7f5a27e87ae0) 0 - -Class QRect - size=16 align=4 - base size=16 base align=4 -QRect (0x0x7f5a27e87d80) 0 - -Class QRectF - size=32 align=8 - base size=32 base align=8 -QRectF (0x0x7f5a27be5060) 0 - -Class QResource - size=8 align=8 - base size=8 base align=8 -QResource (0x0x7f5a27be5300) 0 - -Class QSaveFile::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSaveFile::QPrivateSignal (0x0x7f5a27be5480) 0 empty - -Vtable for QSaveFile -QSaveFile::_ZTV9QSaveFile: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QSaveFile) -16 (int (*)(...))QSaveFile::metaObject -24 (int (*)(...))QSaveFile::qt_metacast -32 (int (*)(...))QSaveFile::qt_metacall -40 (int (*)(...))QSaveFile::~QSaveFile -48 (int (*)(...))QSaveFile::~QSaveFile -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QSaveFile::open -128 (int (*)(...))QSaveFile::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFileDevice::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QSaveFile::writeData -240 (int (*)(...))QSaveFile::fileName -248 (int (*)(...))QFileDevice::resize -256 (int (*)(...))QFileDevice::permissions -264 (int (*)(...))QFileDevice::setPermissions - -Class QSaveFile - size=16 align=8 - base size=16 base align=8 -QSaveFile (0x0x7f5a27e8cdd0) 0 - vptr=((& QSaveFile::_ZTV9QSaveFile) + 16u) - QFileDevice (0x0x7f5a27e8ce38) 0 - primary-for QSaveFile (0x0x7f5a27e8cdd0) - QIODevice (0x0x7f5a27e8cea0) 0 - primary-for QFileDevice (0x0x7f5a27e8ce38) - QObject (0x0x7f5a27be5420) 0 - primary-for QIODevice (0x0x7f5a27e8cea0) - -Class QSemaphore - size=8 align=8 - base size=8 base align=8 -QSemaphore (0x0x7f5a27be55a0) 0 - -Class QSemaphoreReleaser - size=16 align=8 - base size=12 base align=8 -QSemaphoreReleaser (0x0x7f5a27be5720) 0 - -Class QSequentialAnimationGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSequentialAnimationGroup::QPrivateSignal (0x0x7f5a27a2cd20) 0 empty - -Vtable for QSequentialAnimationGroup -QSequentialAnimationGroup::_ZTV25QSequentialAnimationGroup: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QSequentialAnimationGroup) -16 (int (*)(...))QSequentialAnimationGroup::metaObject -24 (int (*)(...))QSequentialAnimationGroup::qt_metacast -32 (int (*)(...))QSequentialAnimationGroup::qt_metacall -40 (int (*)(...))QSequentialAnimationGroup::~QSequentialAnimationGroup -48 (int (*)(...))QSequentialAnimationGroup::~QSequentialAnimationGroup -56 (int (*)(...))QSequentialAnimationGroup::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QSequentialAnimationGroup::duration -120 (int (*)(...))QSequentialAnimationGroup::updateCurrentTime -128 (int (*)(...))QSequentialAnimationGroup::updateState -136 (int (*)(...))QSequentialAnimationGroup::updateDirection - -Class QSequentialAnimationGroup - size=16 align=8 - base size=16 base align=8 -QSequentialAnimationGroup (0x0x7f5a27a41750) 0 - vptr=((& QSequentialAnimationGroup::_ZTV25QSequentialAnimationGroup) + 16u) - QAnimationGroup (0x0x7f5a27a417b8) 0 - primary-for QSequentialAnimationGroup (0x0x7f5a27a41750) - QAbstractAnimation (0x0x7f5a27a41820) 0 - primary-for QAnimationGroup (0x0x7f5a27a417b8) - QObject (0x0x7f5a27a2ccc0) 0 - primary-for QAbstractAnimation (0x0x7f5a27a41820) - -Class QSettings::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSettings::QPrivateSignal (0x0x7f5a27a2cde0) 0 empty - -Vtable for QSettings -QSettings::_ZTV9QSettings: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QSettings) -16 (int (*)(...))QSettings::metaObject -24 (int (*)(...))QSettings::qt_metacast -32 (int (*)(...))QSettings::qt_metacall -40 (int (*)(...))QSettings::~QSettings -48 (int (*)(...))QSettings::~QSettings -56 (int (*)(...))QSettings::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSettings - size=16 align=8 - base size=16 base align=8 -QSettings (0x0x7f5a27a41888) 0 - vptr=((& QSettings::_ZTV9QSettings) + 16u) - QObject (0x0x7f5a27a2cd80) 0 - primary-for QSettings (0x0x7f5a27a41888) - -Class QSharedMemory::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSharedMemory::QPrivateSignal (0x0x7f5a27a2cea0) 0 empty - -Vtable for QSharedMemory -QSharedMemory::_ZTV13QSharedMemory: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QSharedMemory) -16 (int (*)(...))QSharedMemory::metaObject -24 (int (*)(...))QSharedMemory::qt_metacast -32 (int (*)(...))QSharedMemory::qt_metacall -40 (int (*)(...))QSharedMemory::~QSharedMemory -48 (int (*)(...))QSharedMemory::~QSharedMemory -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSharedMemory - size=16 align=8 - base size=16 base align=8 -QSharedMemory (0x0x7f5a27a418f0) 0 - vptr=((& QSharedMemory::_ZTV13QSharedMemory) + 16u) - QObject (0x0x7f5a27a2ce40) 0 - primary-for QSharedMemory (0x0x7f5a27a418f0) - -Class QSignalMapper::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSignalMapper::QPrivateSignal (0x0x7f5a27a2cf60) 0 empty - -Vtable for QSignalMapper -QSignalMapper::_ZTV13QSignalMapper: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QSignalMapper) -16 (int (*)(...))QSignalMapper::metaObject -24 (int (*)(...))QSignalMapper::qt_metacast -32 (int (*)(...))QSignalMapper::qt_metacall -40 (int (*)(...))QSignalMapper::~QSignalMapper -48 (int (*)(...))QSignalMapper::~QSignalMapper -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSignalMapper - size=16 align=8 - base size=16 base align=8 -QSignalMapper (0x0x7f5a27a41958) 0 - vptr=((& QSignalMapper::_ZTV13QSignalMapper) + 16u) - QObject (0x0x7f5a27a2cf00) 0 - primary-for QSignalMapper (0x0x7f5a27a41958) - -Class QSignalTransition::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSignalTransition::QPrivateSignal (0x0x7f5a27aa7060) 0 empty - -Vtable for QSignalTransition -QSignalTransition::_ZTV17QSignalTransition: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSignalTransition) -16 (int (*)(...))QSignalTransition::metaObject -24 (int (*)(...))QSignalTransition::qt_metacast -32 (int (*)(...))QSignalTransition::qt_metacall -40 (int (*)(...))QSignalTransition::~QSignalTransition -48 (int (*)(...))QSignalTransition::~QSignalTransition -56 (int (*)(...))QSignalTransition::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QSignalTransition::eventTest -120 (int (*)(...))QSignalTransition::onTransition - -Class QSignalTransition - size=16 align=8 - base size=16 base align=8 -QSignalTransition (0x0x7f5a27a419c0) 0 - vptr=((& QSignalTransition::_ZTV17QSignalTransition) + 16u) - QAbstractTransition (0x0x7f5a27a41a28) 0 - primary-for QSignalTransition (0x0x7f5a27a419c0) - QObject (0x0x7f5a27aa7000) 0 - primary-for QAbstractTransition (0x0x7f5a27a41a28) - -Class QSocketNotifier::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSocketNotifier::QPrivateSignal (0x0x7f5a27aa7120) 0 empty - -Vtable for QSocketNotifier -QSocketNotifier::_ZTV15QSocketNotifier: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QSocketNotifier) -16 (int (*)(...))QSocketNotifier::metaObject -24 (int (*)(...))QSocketNotifier::qt_metacast -32 (int (*)(...))QSocketNotifier::qt_metacall -40 (int (*)(...))QSocketNotifier::~QSocketNotifier -48 (int (*)(...))QSocketNotifier::~QSocketNotifier -56 (int (*)(...))QSocketNotifier::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSocketNotifier - size=16 align=8 - base size=16 base align=8 -QSocketNotifier (0x0x7f5a27a41a90) 0 - vptr=((& QSocketNotifier::_ZTV15QSocketNotifier) + 16u) - QObject (0x0x7f5a27aa70c0) 0 - primary-for QSocketNotifier (0x0x7f5a27a41a90) - -Class QSortFilterProxyModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSortFilterProxyModel::QPrivateSignal (0x0x7f5a27aa71e0) 0 empty - -Vtable for QSortFilterProxyModel -QSortFilterProxyModel::_ZTV21QSortFilterProxyModel: 56u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QSortFilterProxyModel) -16 (int (*)(...))QSortFilterProxyModel::metaObject -24 (int (*)(...))QSortFilterProxyModel::qt_metacast -32 (int (*)(...))QSortFilterProxyModel::qt_metacall -40 (int (*)(...))QSortFilterProxyModel::~QSortFilterProxyModel -48 (int (*)(...))QSortFilterProxyModel::~QSortFilterProxyModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QSortFilterProxyModel::index -120 (int (*)(...))QSortFilterProxyModel::parent -128 (int (*)(...))QSortFilterProxyModel::sibling -136 (int (*)(...))QSortFilterProxyModel::rowCount -144 (int (*)(...))QSortFilterProxyModel::columnCount -152 (int (*)(...))QSortFilterProxyModel::hasChildren -160 (int (*)(...))QSortFilterProxyModel::data -168 (int (*)(...))QSortFilterProxyModel::setData -176 (int (*)(...))QSortFilterProxyModel::headerData -184 (int (*)(...))QSortFilterProxyModel::setHeaderData -192 (int (*)(...))QAbstractProxyModel::itemData -200 (int (*)(...))QAbstractProxyModel::setItemData -208 (int (*)(...))QSortFilterProxyModel::mimeTypes -216 (int (*)(...))QSortFilterProxyModel::mimeData -224 (int (*)(...))QAbstractProxyModel::canDropMimeData -232 (int (*)(...))QSortFilterProxyModel::dropMimeData -240 (int (*)(...))QSortFilterProxyModel::supportedDropActions -248 (int (*)(...))QAbstractProxyModel::supportedDragActions -256 (int (*)(...))QSortFilterProxyModel::insertRows -264 (int (*)(...))QSortFilterProxyModel::insertColumns -272 (int (*)(...))QSortFilterProxyModel::removeRows -280 (int (*)(...))QSortFilterProxyModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QSortFilterProxyModel::fetchMore -312 (int (*)(...))QSortFilterProxyModel::canFetchMore -320 (int (*)(...))QSortFilterProxyModel::flags -328 (int (*)(...))QSortFilterProxyModel::sort -336 (int (*)(...))QSortFilterProxyModel::buddy -344 (int (*)(...))QSortFilterProxyModel::match -352 (int (*)(...))QSortFilterProxyModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractProxyModel::submit -376 (int (*)(...))QAbstractProxyModel::revert -384 (int (*)(...))QSortFilterProxyModel::setSourceModel -392 (int (*)(...))QSortFilterProxyModel::mapToSource -400 (int (*)(...))QSortFilterProxyModel::mapFromSource -408 (int (*)(...))QSortFilterProxyModel::mapSelectionToSource -416 (int (*)(...))QSortFilterProxyModel::mapSelectionFromSource -424 (int (*)(...))QSortFilterProxyModel::filterAcceptsRow -432 (int (*)(...))QSortFilterProxyModel::filterAcceptsColumn -440 (int (*)(...))QSortFilterProxyModel::lessThan - -Class QSortFilterProxyModel - size=16 align=8 - base size=16 base align=8 -QSortFilterProxyModel (0x0x7f5a27a41af8) 0 - vptr=((& QSortFilterProxyModel::_ZTV21QSortFilterProxyModel) + 16u) - QAbstractProxyModel (0x0x7f5a27a41b60) 0 - primary-for QSortFilterProxyModel (0x0x7f5a27a41af8) - QAbstractItemModel (0x0x7f5a27a41bc8) 0 - primary-for QAbstractProxyModel (0x0x7f5a27a41b60) - QObject (0x0x7f5a27aa7180) 0 - primary-for QAbstractItemModel (0x0x7f5a27a41bc8) - -Class QStandardPaths - size=1 align=1 - base size=0 base align=1 -QStandardPaths (0x0x7f5a27aa72a0) 0 empty - -Class QState::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QState::QPrivateSignal (0x0x7f5a27aa74e0) 0 empty - -Vtable for QState -QState::_ZTV6QState: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QState) -16 (int (*)(...))QState::metaObject -24 (int (*)(...))QState::qt_metacast -32 (int (*)(...))QState::qt_metacall -40 (int (*)(...))QState::~QState -48 (int (*)(...))QState::~QState -56 (int (*)(...))QState::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QState::onEntry -120 (int (*)(...))QState::onExit - -Class QState - size=16 align=8 - base size=16 base align=8 -QState (0x0x7f5a27a41d68) 0 - vptr=((& QState::_ZTV6QState) + 16u) - QAbstractState (0x0x7f5a27a41dd0) 0 - primary-for QState (0x0x7f5a27a41d68) - QObject (0x0x7f5a27aa7480) 0 - primary-for QAbstractState (0x0x7f5a27a41dd0) - -Class QStateMachine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStateMachine::QPrivateSignal (0x0x7f5a27aa7600) 0 empty - -Vtable for QStateMachine::SignalEvent -QStateMachine::SignalEvent::_ZTVN13QStateMachine11SignalEventE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN13QStateMachine11SignalEventE) -16 (int (*)(...))QStateMachine::SignalEvent::~SignalEvent -24 (int (*)(...))QStateMachine::SignalEvent::~SignalEvent - -Class QStateMachine::SignalEvent - size=48 align=8 - base size=48 base align=8 -QStateMachine::SignalEvent (0x0x7f5a27a41f70) 0 - vptr=((& QStateMachine::SignalEvent::_ZTVN13QStateMachine11SignalEventE) + 16u) - QEvent (0x0x7f5a27aa7660) 0 - primary-for QStateMachine::SignalEvent (0x0x7f5a27a41f70) - -Vtable for QStateMachine::WrappedEvent -QStateMachine::WrappedEvent::_ZTVN13QStateMachine12WrappedEventE: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN13QStateMachine12WrappedEventE) -16 (int (*)(...))QStateMachine::WrappedEvent::~WrappedEvent -24 (int (*)(...))QStateMachine::WrappedEvent::~WrappedEvent - -Class QStateMachine::WrappedEvent - size=40 align=8 - base size=40 base align=8 -QStateMachine::WrappedEvent (0x0x7f5a27b57000) 0 - vptr=((& QStateMachine::WrappedEvent::_ZTVN13QStateMachine12WrappedEventE) + 16u) - QEvent (0x0x7f5a27aa76c0) 0 - primary-for QStateMachine::WrappedEvent (0x0x7f5a27b57000) - -Vtable for QStateMachine -QStateMachine::_ZTV13QStateMachine: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QStateMachine) -16 (int (*)(...))QStateMachine::metaObject -24 (int (*)(...))QStateMachine::qt_metacast -32 (int (*)(...))QStateMachine::qt_metacall -40 (int (*)(...))QStateMachine::~QStateMachine -48 (int (*)(...))QStateMachine::~QStateMachine -56 (int (*)(...))QStateMachine::event -64 (int (*)(...))QStateMachine::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QStateMachine::onEntry -120 (int (*)(...))QStateMachine::onExit -128 (int (*)(...))QStateMachine::beginSelectTransitions -136 (int (*)(...))QStateMachine::endSelectTransitions -144 (int (*)(...))QStateMachine::beginMicrostep -152 (int (*)(...))QStateMachine::endMicrostep - -Class QStateMachine - size=16 align=8 - base size=16 base align=8 -QStateMachine (0x0x7f5a27a41e38) 0 - vptr=((& QStateMachine::_ZTV13QStateMachine) + 16u) - QState (0x0x7f5a27a41ea0) 0 - primary-for QStateMachine (0x0x7f5a27a41e38) - QAbstractState (0x0x7f5a27a41f08) 0 - primary-for QState (0x0x7f5a27a41ea0) - QObject (0x0x7f5a27aa75a0) 0 - primary-for QAbstractState (0x0x7f5a27a41f08) - -Class QStorageInfo - size=8 align=8 - base size=8 base align=8 -QStorageInfo (0x0x7f5a27aa7720) 0 - -Class QAbstractConcatenable - size=1 align=1 - base size=0 base align=1 -QAbstractConcatenable (0x0x7f5a277ad660) 0 empty - -Class QStringListModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStringListModel::QPrivateSignal (0x0x7f5a27834a20) 0 empty - -Vtable for QStringListModel -QStringListModel::_ZTV16QStringListModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QStringListModel) -16 (int (*)(...))QStringListModel::metaObject -24 (int (*)(...))QStringListModel::qt_metacast -32 (int (*)(...))QStringListModel::qt_metacall -40 (int (*)(...))QStringListModel::~QStringListModel -48 (int (*)(...))QStringListModel::~QStringListModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractListModel::index -120 (int (*)(...))QAbstractListModel::parent -128 (int (*)(...))QStringListModel::sibling -136 (int (*)(...))QStringListModel::rowCount -144 (int (*)(...))QAbstractListModel::columnCount -152 (int (*)(...))QAbstractListModel::hasChildren -160 (int (*)(...))QStringListModel::data -168 (int (*)(...))QStringListModel::setData -176 (int (*)(...))QAbstractItemModel::headerData -184 (int (*)(...))QAbstractItemModel::setHeaderData -192 (int (*)(...))QAbstractItemModel::itemData -200 (int (*)(...))QAbstractItemModel::setItemData -208 (int (*)(...))QAbstractItemModel::mimeTypes -216 (int (*)(...))QAbstractItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QAbstractListModel::dropMimeData -240 (int (*)(...))QStringListModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QStringListModel::insertRows -264 (int (*)(...))QAbstractItemModel::insertColumns -272 (int (*)(...))QStringListModel::removeRows -280 (int (*)(...))QAbstractItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QStringListModel::flags -328 (int (*)(...))QStringListModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QStringListModel - size=24 align=8 - base size=24 base align=8 -QStringListModel (0x0x7f5a27864000) 0 - vptr=((& QStringListModel::_ZTV16QStringListModel) + 16u) - QAbstractListModel (0x0x7f5a27864068) 0 - primary-for QStringListModel (0x0x7f5a27864000) - QAbstractItemModel (0x0x7f5a278640d0) 0 - primary-for QAbstractListModel (0x0x7f5a27864068) - QObject (0x0x7f5a278349c0) 0 - primary-for QAbstractItemModel (0x0x7f5a278640d0) - -Class QSystemSemaphore - size=8 align=8 - base size=8 base align=8 -QSystemSemaphore (0x0x7f5a27834a80) 0 - -Class QTemporaryDir - size=8 align=8 - base size=8 base align=8 -QTemporaryDir (0x0x7f5a27834b40) 0 - -Class QTemporaryFile::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTemporaryFile::QPrivateSignal (0x0x7f5a27834c60) 0 empty - -Vtable for QTemporaryFile -QTemporaryFile::_ZTV14QTemporaryFile: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QTemporaryFile) -16 (int (*)(...))QTemporaryFile::metaObject -24 (int (*)(...))QTemporaryFile::qt_metacast -32 (int (*)(...))QTemporaryFile::qt_metacall -40 (int (*)(...))QTemporaryFile::~QTemporaryFile -48 (int (*)(...))QTemporaryFile::~QTemporaryFile -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QFileDevice::isSequential -120 (int (*)(...))QTemporaryFile::open -128 (int (*)(...))QFileDevice::close -136 (int (*)(...))QFileDevice::pos -144 (int (*)(...))QFile::size -152 (int (*)(...))QFileDevice::seek -160 (int (*)(...))QFileDevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))QFileDevice::readData -224 (int (*)(...))QFileDevice::readLineData -232 (int (*)(...))QFileDevice::writeData -240 (int (*)(...))QTemporaryFile::fileName -248 (int (*)(...))QFile::resize -256 (int (*)(...))QFile::permissions -264 (int (*)(...))QFile::setPermissions - -Class QTemporaryFile - size=16 align=8 - base size=16 base align=8 -QTemporaryFile (0x0x7f5a27864138) 0 - vptr=((& QTemporaryFile::_ZTV14QTemporaryFile) + 16u) - QFile (0x0x7f5a278641a0) 0 - primary-for QTemporaryFile (0x0x7f5a27864138) - QFileDevice (0x0x7f5a27864208) 0 - primary-for QFile (0x0x7f5a278641a0) - QIODevice (0x0x7f5a27864270) 0 - primary-for QFileDevice (0x0x7f5a27864208) - QObject (0x0x7f5a27834c00) 0 - primary-for QIODevice (0x0x7f5a27864270) - -Class QTextBoundaryFinder - size=48 align=8 - base size=48 base align=8 -QTextBoundaryFinder (0x0x7f5a27834cc0) 0 - -Class QTextCodec::ConverterState - size=32 align=8 - base size=32 base align=8 -QTextCodec::ConverterState (0x0x7f5a27834f00) 0 - -Vtable for QTextCodec -QTextCodec::_ZTV10QTextCodec: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTextCodec) -16 (int (*)(...))__cxa_pure_virtual -24 (int (*)(...))QTextCodec::aliases -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 0u -64 0u - -Class QTextCodec - size=8 align=8 - base size=8 base align=8 -QTextCodec (0x0x7f5a27834ea0) 0 nearly-empty - vptr=((& QTextCodec::_ZTV10QTextCodec) + 16u) - -Class QTextEncoder - size=40 align=8 - base size=40 base align=8 -QTextEncoder (0x0x7f5a278e6120) 0 - -Class QTextDecoder - size=40 align=8 - base size=40 base align=8 -QTextDecoder (0x0x7f5a278e6180) 0 - -Class std::__mutex_base - size=40 align=8 - base size=40 base align=8 -std::__mutex_base (0x0x7f5a278e61e0) 0 - -Class std::__recursive_mutex_base - size=40 align=8 - base size=40 base align=8 -std::__recursive_mutex_base (0x0x7f5a278e6240) 0 - -Class std::mutex - size=40 align=8 - base size=40 base align=8 -std::mutex (0x0x7f5a27864478) 0 - std::__mutex_base (0x0x7f5a278e62a0) 0 - -Class std::recursive_mutex - size=40 align=8 - base size=40 base align=8 -std::recursive_mutex (0x0x7f5a278644e0) 0 - std::__recursive_mutex_base (0x0x7f5a278e6300) 0 - -Class std::timed_mutex - size=40 align=8 - base size=40 base align=8 -std::timed_mutex (0x0x7f5a27950070) 0 - std::__mutex_base (0x0x7f5a278e6420) 0 - std::__timed_mutex_impl (0x0x7f5a278e6480) 0 empty - -Class std::recursive_timed_mutex - size=40 align=8 - base size=40 base align=8 -std::recursive_timed_mutex (0x0x7f5a27950a10) 0 - std::__recursive_mutex_base (0x0x7f5a278e6540) 0 - std::__timed_mutex_impl (0x0x7f5a278e65a0) 0 empty - -Class std::defer_lock_t - size=1 align=1 - base size=0 base align=1 -std::defer_lock_t (0x0x7f5a278e6600) 0 empty - -Class std::try_to_lock_t - size=1 align=1 - base size=0 base align=1 -std::try_to_lock_t (0x0x7f5a278e6660) 0 empty - -Class std::adopt_lock_t - size=1 align=1 - base size=0 base align=1 -std::adopt_lock_t (0x0x7f5a278e66c0) 0 empty - -Class std::once_flag - size=4 align=4 - base size=4 base align=4 -std::once_flag (0x0x7f5a278e6900) 0 - -Vtable for __gnu_cxx::__concurrence_lock_error -__gnu_cxx::__concurrence_lock_error::_ZTVN9__gnu_cxx24__concurrence_lock_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx24__concurrence_lock_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_lock_error::~__concurrence_lock_error -24 (int (*)(...))__gnu_cxx::__concurrence_lock_error::~__concurrence_lock_error -32 (int (*)(...))__gnu_cxx::__concurrence_lock_error::what - -Class __gnu_cxx::__concurrence_lock_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_lock_error (0x0x7f5a27864618) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_lock_error::_ZTVN9__gnu_cxx24__concurrence_lock_errorE) + 16u) - std::exception (0x0x7f5a278e69c0) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_lock_error (0x0x7f5a27864618) - -Vtable for __gnu_cxx::__concurrence_unlock_error -__gnu_cxx::__concurrence_unlock_error::_ZTVN9__gnu_cxx26__concurrence_unlock_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx26__concurrence_unlock_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_unlock_error::~__concurrence_unlock_error -24 (int (*)(...))__gnu_cxx::__concurrence_unlock_error::~__concurrence_unlock_error -32 (int (*)(...))__gnu_cxx::__concurrence_unlock_error::what - -Class __gnu_cxx::__concurrence_unlock_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_unlock_error (0x0x7f5a27864680) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_unlock_error::_ZTVN9__gnu_cxx26__concurrence_unlock_errorE) + 16u) - std::exception (0x0x7f5a278e6a80) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_unlock_error (0x0x7f5a27864680) - -Vtable for __gnu_cxx::__concurrence_broadcast_error -__gnu_cxx::__concurrence_broadcast_error::_ZTVN9__gnu_cxx29__concurrence_broadcast_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx29__concurrence_broadcast_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_broadcast_error::~__concurrence_broadcast_error -24 (int (*)(...))__gnu_cxx::__concurrence_broadcast_error::~__concurrence_broadcast_error -32 (int (*)(...))__gnu_cxx::__concurrence_broadcast_error::what - -Class __gnu_cxx::__concurrence_broadcast_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_broadcast_error (0x0x7f5a278646e8) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_broadcast_error::_ZTVN9__gnu_cxx29__concurrence_broadcast_errorE) + 16u) - std::exception (0x0x7f5a278e6b40) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_broadcast_error (0x0x7f5a278646e8) - -Vtable for __gnu_cxx::__concurrence_wait_error -__gnu_cxx::__concurrence_wait_error::_ZTVN9__gnu_cxx24__concurrence_wait_errorE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN9__gnu_cxx24__concurrence_wait_errorE) -16 (int (*)(...))__gnu_cxx::__concurrence_wait_error::~__concurrence_wait_error -24 (int (*)(...))__gnu_cxx::__concurrence_wait_error::~__concurrence_wait_error -32 (int (*)(...))__gnu_cxx::__concurrence_wait_error::what - -Class __gnu_cxx::__concurrence_wait_error - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__concurrence_wait_error (0x0x7f5a278647b8) 0 nearly-empty - vptr=((& __gnu_cxx::__concurrence_wait_error::_ZTVN9__gnu_cxx24__concurrence_wait_errorE) + 16u) - std::exception (0x0x7f5a278e6c00) 0 nearly-empty - primary-for __gnu_cxx::__concurrence_wait_error (0x0x7f5a278647b8) - -Class __gnu_cxx::__mutex - size=40 align=8 - base size=40 base align=8 -__gnu_cxx::__mutex (0x0x7f5a278e6cc0) 0 - -Class __gnu_cxx::__recursive_mutex - size=40 align=8 - base size=40 base align=8 -__gnu_cxx::__recursive_mutex (0x0x7f5a278e6d20) 0 - -Class __gnu_cxx::__scoped_lock - size=8 align=8 - base size=8 base align=8 -__gnu_cxx::__scoped_lock (0x0x7f5a278e6d80) 0 - -Class __gnu_cxx::__cond - size=48 align=8 - base size=48 base align=8 -__gnu_cxx::__cond (0x0x7f5a278e6de0) 0 - -Vtable for std::bad_weak_ptr -std::bad_weak_ptr::_ZTVSt12bad_weak_ptr: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12bad_weak_ptr) -16 (int (*)(...))std::bad_weak_ptr::~bad_weak_ptr -24 (int (*)(...))std::bad_weak_ptr::~bad_weak_ptr -32 (int (*)(...))std::bad_weak_ptr::what - -Class std::bad_weak_ptr - size=8 align=8 - base size=8 base align=8 -std::bad_weak_ptr (0x0x7f5a27864a90) 0 nearly-empty - vptr=((& std::bad_weak_ptr::_ZTVSt12bad_weak_ptr) + 16u) - std::exception (0x0x7f5a27632180) 0 nearly-empty - primary-for std::bad_weak_ptr (0x0x7f5a27864a90) - -Class std::_Sp_make_shared_tag - size=1 align=1 - base size=0 base align=1 -std::_Sp_make_shared_tag (0x0x7f5a276329c0) 0 empty - -Class std::_Sp_locker - size=2 align=1 - base size=2 base align=1 -std::_Sp_locker (0x0x7f5a273e01e0) 0 - -Class std::thread::id - size=8 align=8 - base size=8 base align=8 -std::thread::id (0x0x7f5a273e03c0) 0 - -Vtable for std::thread::_Impl_base -std::thread::_Impl_base::_ZTVNSt6thread10_Impl_baseE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt6thread10_Impl_baseE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class std::thread::_Impl_base - size=24 align=8 - base size=24 base align=8 -std::thread::_Impl_base (0x0x7f5a273e0420) 0 - vptr=((& std::thread::_Impl_base::_ZTVNSt6thread10_Impl_baseE) + 16u) - -Class std::thread - size=8 align=8 - base size=8 base align=8 -std::thread (0x0x7f5a273e0360) 0 - -Class std::condition_variable - size=48 align=8 - base size=48 base align=8 -std::condition_variable (0x0x7f5a275a1060) 0 - -Class std::__at_thread_exit_elt - size=16 align=8 - base size=16 base align=8 -std::__at_thread_exit_elt (0x0x7f5a275a1120) 0 - -Class std::_V2::condition_variable_any - size=64 align=8 - base size=64 base align=8 -std::_V2::condition_variable_any (0x0x7f5a275a1180) 0 - -Class std::__atomic_futex_unsigned_base - size=1 align=1 - base size=0 base align=1 -std::__atomic_futex_unsigned_base (0x0x7f5a272537e0) 0 empty - -Vtable for std::future_error -std::future_error::_ZTVSt12future_error: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt12future_error) -16 (int (*)(...))std::future_error::~future_error -24 (int (*)(...))std::future_error::~future_error -32 (int (*)(...))std::future_error::what - -Class std::future_error - size=32 align=8 - base size=32 base align=8 -std::future_error (0x0x7f5a27248dd0) 0 - vptr=((& std::future_error::_ZTVSt12future_error) + 16u) - std::logic_error (0x0x7f5a27248e38) 0 - primary-for std::future_error (0x0x7f5a27248dd0) - std::exception (0x0x7f5a27253900) 0 nearly-empty - primary-for std::logic_error (0x0x7f5a27248e38) - -Class std::__future_base::_Result_base::_Deleter - size=1 align=1 - base size=0 base align=1 -std::__future_base::_Result_base::_Deleter (0x0x7f5a27253a20) 0 empty - -Vtable for std::__future_base::_Result_base -std::__future_base::_Result_base::_ZTVNSt13__future_base12_Result_baseE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt13__future_base12_Result_baseE) -16 (int (*)(...))__cxa_pure_virtual -24 0u -32 0u - -Class std::__future_base::_Result_base - size=16 align=8 - base size=16 base align=8 -std::__future_base::_Result_base (0x0x7f5a272539c0) 0 - vptr=((& std::__future_base::_Result_base::_ZTVNSt13__future_base12_Result_baseE) + 16u) - -Class std::__future_base::_State_baseV2::__exception_ptr_tag - size=1 align=1 - base size=0 base align=1 -std::__future_base::_State_baseV2::__exception_ptr_tag (0x0x7f5a272ebf60) 0 empty - -Class std::__future_base::_State_baseV2::_Make_ready - size=32 align=8 - base size=32 base align=8 -std::__future_base::_State_baseV2::_Make_ready (0x0x7f5a26fd5410) 0 - std::__at_thread_exit_elt (0x0x7f5a26ff9060) 0 - -Vtable for std::__future_base::_State_baseV2 -std::__future_base::_State_baseV2::_ZTVNSt13__future_base13_State_baseV2E: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt13__future_base13_State_baseV2E) -16 (int (*)(...))std::__future_base::_State_baseV2::~_State_baseV2 -24 (int (*)(...))std::__future_base::_State_baseV2::~_State_baseV2 -32 (int (*)(...))std::__future_base::_State_baseV2::_M_complete_async -40 (int (*)(...))std::__future_base::_State_baseV2::_M_is_deferred_future - -Class std::__future_base::_State_baseV2 - size=32 align=8 - base size=28 base align=8 -std::__future_base::_State_baseV2 (0x0x7f5a27253ba0) 0 - vptr=((& std::__future_base::_State_baseV2::_ZTVNSt13__future_base13_State_baseV2E) + 16u) - -Class std::__future_base - size=1 align=1 - base size=0 base align=1 -std::__future_base (0x0x7f5a27253960) 0 empty - -Vtable for std::__future_base::_Async_state_commonV2 -std::__future_base::_Async_state_commonV2::_ZTVNSt13__future_base21_Async_state_commonV2E: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTINSt13__future_base21_Async_state_commonV2E) -16 (int (*)(...))std::__future_base::_Async_state_commonV2::~_Async_state_commonV2 -24 (int (*)(...))std::__future_base::_Async_state_commonV2::~_Async_state_commonV2 -32 (int (*)(...))std::__future_base::_Async_state_commonV2::_M_complete_async -40 (int (*)(...))std::__future_base::_State_baseV2::_M_is_deferred_future - -Class std::__future_base::_Async_state_commonV2 - size=48 align=8 - base size=44 base align=8 -std::__future_base::_Async_state_commonV2 (0x0x7f5a26d7c000) 0 - vptr=((& std::__future_base::_Async_state_commonV2::_ZTVNSt13__future_base21_Async_state_commonV2E) + 16u) - std::__future_base::_State_baseV2 (0x0x7f5a26d1bf00) 0 - primary-for std::__future_base::_Async_state_commonV2 (0x0x7f5a26d7c000) - -Class QThread::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QThread::QPrivateSignal (0x0x7f5a26d84660) 0 empty - -Vtable for QThread -QThread::_ZTV7QThread: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QThread) -16 (int (*)(...))QThread::metaObject -24 (int (*)(...))QThread::qt_metacast -32 (int (*)(...))QThread::qt_metacall -40 (int (*)(...))QThread::~QThread -48 (int (*)(...))QThread::~QThread -56 (int (*)(...))QThread::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QThread::run - -Class QThread - size=16 align=8 - base size=16 base align=8 -QThread (0x0x7f5a26d7ca90) 0 - vptr=((& QThread::_ZTV7QThread) + 16u) - QObject (0x0x7f5a26d84600) 0 - primary-for QThread (0x0x7f5a26d7ca90) - -Class QThreadPool::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QThreadPool::QPrivateSignal (0x0x7f5a26d84780) 0 empty - -Vtable for QThreadPool -QThreadPool::_ZTV11QThreadPool: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QThreadPool) -16 (int (*)(...))QThreadPool::metaObject -24 (int (*)(...))QThreadPool::qt_metacast -32 (int (*)(...))QThreadPool::qt_metacall -40 (int (*)(...))QThreadPool::~QThreadPool -48 (int (*)(...))QThreadPool::~QThreadPool -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QThreadPool - size=16 align=8 - base size=16 base align=8 -QThreadPool (0x0x7f5a26d7caf8) 0 - vptr=((& QThreadPool::_ZTV11QThreadPool) + 16u) - QObject (0x0x7f5a26d84720) 0 - primary-for QThreadPool (0x0x7f5a26d7caf8) - -Class QThreadStorageData - size=4 align=4 - base size=4 base align=4 -QThreadStorageData (0x0x7f5a26d847e0) 0 - -Class QTimeLine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTimeLine::QPrivateSignal (0x0x7f5a26d84900) 0 empty - -Vtable for QTimeLine -QTimeLine::_ZTV9QTimeLine: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QTimeLine) -16 (int (*)(...))QTimeLine::metaObject -24 (int (*)(...))QTimeLine::qt_metacast -32 (int (*)(...))QTimeLine::qt_metacall -40 (int (*)(...))QTimeLine::~QTimeLine -48 (int (*)(...))QTimeLine::~QTimeLine -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QTimeLine::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTimeLine::valueForTime - -Class QTimeLine - size=16 align=8 - base size=16 base align=8 -QTimeLine (0x0x7f5a26d7cb60) 0 - vptr=((& QTimeLine::_ZTV9QTimeLine) + 16u) - QObject (0x0x7f5a26d848a0) 0 - primary-for QTimeLine (0x0x7f5a26d7cb60) - -Class QTimer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTimer::QPrivateSignal (0x0x7f5a26d849c0) 0 empty - -Vtable for QTimer -QTimer::_ZTV6QTimer: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QTimer) -16 (int (*)(...))QTimer::metaObject -24 (int (*)(...))QTimer::qt_metacast -32 (int (*)(...))QTimer::qt_metacall -40 (int (*)(...))QTimer::~QTimer -48 (int (*)(...))QTimer::~QTimer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QTimer::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTimer - size=32 align=8 - base size=29 base align=8 -QTimer (0x0x7f5a26d7cbc8) 0 - vptr=((& QTimer::_ZTV6QTimer) + 16u) - QObject (0x0x7f5a26d84960) 0 - primary-for QTimer (0x0x7f5a26d7cbc8) - -Class QTimeZone::OffsetData - size=32 align=8 - base size=28 base align=8 -QTimeZone::OffsetData (0x0x7f5a26a4a120) 0 - -Class QTimeZone - size=8 align=8 - base size=8 base align=8 -QTimeZone (0x0x7f5a26a4a0c0) 0 - -Class QTranslator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTranslator::QPrivateSignal (0x0x7f5a26a4a6c0) 0 empty - -Vtable for QTranslator -QTranslator::_ZTV11QTranslator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTranslator) -16 (int (*)(...))QTranslator::metaObject -24 (int (*)(...))QTranslator::qt_metacast -32 (int (*)(...))QTranslator::qt_metacall -40 (int (*)(...))QTranslator::~QTranslator -48 (int (*)(...))QTranslator::~QTranslator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTranslator::translate -120 (int (*)(...))QTranslator::isEmpty - -Class QTranslator - size=16 align=8 - base size=16 base align=8 -QTranslator (0x0x7f5a26a41750) 0 - vptr=((& QTranslator::_ZTV11QTranslator) + 16u) - QObject (0x0x7f5a26a4a660) 0 - primary-for QTranslator (0x0x7f5a26a41750) - -Class QUrlQuery - size=8 align=8 - base size=8 base align=8 -QUrlQuery (0x0x7f5a26a4a720) 0 - -Class QWaitCondition - size=8 align=8 - base size=8 base align=8 -QWaitCondition (0x0x7f5a26a4ad80) 0 - -Class QXmlStreamStringRef - size=16 align=8 - base size=16 base align=8 -QXmlStreamStringRef (0x0x7f5a26a4ade0) 0 - -Class QXmlStreamAttribute - size=80 align=8 - base size=73 base align=8 -QXmlStreamAttribute (0x0x7f5a26af70c0) 0 - -Class QXmlStreamAttributes - size=8 align=8 - base size=8 base align=8 -QXmlStreamAttributes (0x0x7f5a26b06478) 0 - QVector (0x0x7f5a26af7480) 0 - -Class QXmlStreamNamespaceDeclaration - size=40 align=8 - base size=40 base align=8 -QXmlStreamNamespaceDeclaration (0x0x7f5a26af74e0) 0 - -Class QXmlStreamNotationDeclaration - size=56 align=8 - base size=56 base align=8 -QXmlStreamNotationDeclaration (0x0x7f5a26af7780) 0 - -Class QXmlStreamEntityDeclaration - size=88 align=8 - base size=88 base align=8 -QXmlStreamEntityDeclaration (0x0x7f5a26af7a20) 0 - -Vtable for QXmlStreamEntityResolver -QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QXmlStreamEntityResolver) -16 (int (*)(...))QXmlStreamEntityResolver::~QXmlStreamEntityResolver -24 (int (*)(...))QXmlStreamEntityResolver::~QXmlStreamEntityResolver -32 (int (*)(...))QXmlStreamEntityResolver::resolveEntity -40 (int (*)(...))QXmlStreamEntityResolver::resolveUndeclaredEntity - -Class QXmlStreamEntityResolver - size=8 align=8 - base size=8 base align=8 -QXmlStreamEntityResolver (0x0x7f5a26af7cc0) 0 nearly-empty - vptr=((& QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver) + 16u) - -Class QXmlStreamReader - size=8 align=8 - base size=8 base align=8 -QXmlStreamReader (0x0x7f5a26af7d20) 0 - -Class QXmlStreamWriter - size=8 align=8 - base size=8 base align=8 -QXmlStreamWriter (0x0x7f5a26802780) 0 - -Class QRgba64 - size=8 align=8 - base size=8 base align=8 -QRgba64 (0x0x7f5a268028a0) 0 - -Class QColor - size=16 align=4 - base size=14 base align=4 -QColor (0x0x7f5a26802b40) 0 - -Class QRegion::QRegionData - size=16 align=8 - base size=16 base align=8 -QRegion::QRegionData (0x0x7f5a26926540) 0 - -Class QRegion - size=8 align=8 - base size=8 base align=8 -QRegion (0x0x7f5a269264e0) 0 - -Class QKeySequence - size=8 align=8 - base size=8 base align=8 -QKeySequence (0x0x7f5a265d78a0) 0 - -Class QVector2D - size=8 align=4 - base size=8 base align=4 -QVector2D (0x0x7f5a26688de0) 0 - -Class QTouchDevice - size=8 align=8 - base size=8 base align=8 -QTouchDevice (0x0x7f5a266d30c0) 0 - -Vtable for QInputEvent -QInputEvent::_ZTV11QInputEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QInputEvent) -16 (int (*)(...))QInputEvent::~QInputEvent -24 (int (*)(...))QInputEvent::~QInputEvent - -Class QInputEvent - size=32 align=8 - base size=32 base align=8 -QInputEvent (0x0x7f5a266d1270) 0 - vptr=((& QInputEvent::_ZTV11QInputEvent) + 16u) - QEvent (0x0x7f5a266d32a0) 0 - primary-for QInputEvent (0x0x7f5a266d1270) - -Vtable for QEnterEvent -QEnterEvent::_ZTV11QEnterEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QEnterEvent) -16 (int (*)(...))QEnterEvent::~QEnterEvent -24 (int (*)(...))QEnterEvent::~QEnterEvent - -Class QEnterEvent - size=72 align=8 - base size=72 base align=8 -QEnterEvent (0x0x7f5a266d12d8) 0 - vptr=((& QEnterEvent::_ZTV11QEnterEvent) + 16u) - QEvent (0x0x7f5a266d3300) 0 - primary-for QEnterEvent (0x0x7f5a266d12d8) - -Vtable for QMouseEvent -QMouseEvent::_ZTV11QMouseEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QMouseEvent) -16 (int (*)(...))QMouseEvent::~QMouseEvent -24 (int (*)(...))QMouseEvent::~QMouseEvent - -Class QMouseEvent - size=104 align=8 - base size=100 base align=8 -QMouseEvent (0x0x7f5a266d1340) 0 - vptr=((& QMouseEvent::_ZTV11QMouseEvent) + 16u) - QInputEvent (0x0x7f5a266d13a8) 0 - primary-for QMouseEvent (0x0x7f5a266d1340) - QEvent (0x0x7f5a266d3360) 0 - primary-for QInputEvent (0x0x7f5a266d13a8) - -Vtable for QHoverEvent -QHoverEvent::_ZTV11QHoverEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QHoverEvent) -16 (int (*)(...))QHoverEvent::~QHoverEvent -24 (int (*)(...))QHoverEvent::~QHoverEvent - -Class QHoverEvent - size=64 align=8 - base size=64 base align=8 -QHoverEvent (0x0x7f5a266d1410) 0 - vptr=((& QHoverEvent::_ZTV11QHoverEvent) + 16u) - QInputEvent (0x0x7f5a266d1478) 0 - primary-for QHoverEvent (0x0x7f5a266d1410) - QEvent (0x0x7f5a266d33c0) 0 - primary-for QInputEvent (0x0x7f5a266d1478) - -Vtable for QWheelEvent -QWheelEvent::_ZTV11QWheelEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QWheelEvent) -16 (int (*)(...))QWheelEvent::~QWheelEvent -24 (int (*)(...))QWheelEvent::~QWheelEvent - -Class QWheelEvent - size=96 align=8 - base size=96 base align=8 -QWheelEvent (0x0x7f5a266d14e0) 0 - vptr=((& QWheelEvent::_ZTV11QWheelEvent) + 16u) - QInputEvent (0x0x7f5a266d1548) 0 - primary-for QWheelEvent (0x0x7f5a266d14e0) - QEvent (0x0x7f5a266d3420) 0 - primary-for QInputEvent (0x0x7f5a266d1548) - -Vtable for QTabletEvent -QTabletEvent::_ZTV12QTabletEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QTabletEvent) -16 (int (*)(...))QTabletEvent::~QTabletEvent -24 (int (*)(...))QTabletEvent::~QTabletEvent - -Class QTabletEvent - size=128 align=8 - base size=128 base align=8 -QTabletEvent (0x0x7f5a266d15b0) 0 - vptr=((& QTabletEvent::_ZTV12QTabletEvent) + 16u) - QInputEvent (0x0x7f5a266d1618) 0 - primary-for QTabletEvent (0x0x7f5a266d15b0) - QEvent (0x0x7f5a266d3480) 0 - primary-for QInputEvent (0x0x7f5a266d1618) - -Vtable for QNativeGestureEvent -QNativeGestureEvent::_ZTV19QNativeGestureEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QNativeGestureEvent) -16 (int (*)(...))QNativeGestureEvent::~QNativeGestureEvent -24 (int (*)(...))QNativeGestureEvent::~QNativeGestureEvent - -Class QNativeGestureEvent - size=112 align=8 - base size=112 base align=8 -QNativeGestureEvent (0x0x7f5a266d1680) 0 - vptr=((& QNativeGestureEvent::_ZTV19QNativeGestureEvent) + 16u) - QInputEvent (0x0x7f5a266d16e8) 0 - primary-for QNativeGestureEvent (0x0x7f5a266d1680) - QEvent (0x0x7f5a266d34e0) 0 - primary-for QInputEvent (0x0x7f5a266d16e8) - -Vtable for QKeyEvent -QKeyEvent::_ZTV9QKeyEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QKeyEvent) -16 (int (*)(...))QKeyEvent::~QKeyEvent -24 (int (*)(...))QKeyEvent::~QKeyEvent - -Class QKeyEvent - size=64 align=8 - base size=59 base align=8 -QKeyEvent (0x0x7f5a266d1750) 0 - vptr=((& QKeyEvent::_ZTV9QKeyEvent) + 16u) - QInputEvent (0x0x7f5a266d17b8) 0 - primary-for QKeyEvent (0x0x7f5a266d1750) - QEvent (0x0x7f5a266d3540) 0 - primary-for QInputEvent (0x0x7f5a266d17b8) - -Vtable for QFocusEvent -QFocusEvent::_ZTV11QFocusEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QFocusEvent) -16 (int (*)(...))QFocusEvent::~QFocusEvent -24 (int (*)(...))QFocusEvent::~QFocusEvent - -Class QFocusEvent - size=24 align=8 - base size=24 base align=8 -QFocusEvent (0x0x7f5a266d1820) 0 - vptr=((& QFocusEvent::_ZTV11QFocusEvent) + 16u) - QEvent (0x0x7f5a266d35a0) 0 - primary-for QFocusEvent (0x0x7f5a266d1820) - -Vtable for QPaintEvent -QPaintEvent::_ZTV11QPaintEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QPaintEvent) -16 (int (*)(...))QPaintEvent::~QPaintEvent -24 (int (*)(...))QPaintEvent::~QPaintEvent - -Class QPaintEvent - size=56 align=8 - base size=49 base align=8 -QPaintEvent (0x0x7f5a266d1888) 0 - vptr=((& QPaintEvent::_ZTV11QPaintEvent) + 16u) - QEvent (0x0x7f5a266d3600) 0 - primary-for QPaintEvent (0x0x7f5a266d1888) - -Vtable for QMoveEvent -QMoveEvent::_ZTV10QMoveEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QMoveEvent) -16 (int (*)(...))QMoveEvent::~QMoveEvent -24 (int (*)(...))QMoveEvent::~QMoveEvent - -Class QMoveEvent - size=40 align=8 - base size=36 base align=8 -QMoveEvent (0x0x7f5a266d18f0) 0 - vptr=((& QMoveEvent::_ZTV10QMoveEvent) + 16u) - QEvent (0x0x7f5a266d3660) 0 - primary-for QMoveEvent (0x0x7f5a266d18f0) - -Vtable for QExposeEvent -QExposeEvent::_ZTV12QExposeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QExposeEvent) -16 (int (*)(...))QExposeEvent::~QExposeEvent -24 (int (*)(...))QExposeEvent::~QExposeEvent - -Class QExposeEvent - size=32 align=8 - base size=32 base align=8 -QExposeEvent (0x0x7f5a266d1958) 0 - vptr=((& QExposeEvent::_ZTV12QExposeEvent) + 16u) - QEvent (0x0x7f5a266d36c0) 0 - primary-for QExposeEvent (0x0x7f5a266d1958) - -Vtable for QPlatformSurfaceEvent -QPlatformSurfaceEvent::_ZTV21QPlatformSurfaceEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QPlatformSurfaceEvent) -16 (int (*)(...))QPlatformSurfaceEvent::~QPlatformSurfaceEvent -24 (int (*)(...))QPlatformSurfaceEvent::~QPlatformSurfaceEvent - -Class QPlatformSurfaceEvent - size=24 align=8 - base size=24 base align=8 -QPlatformSurfaceEvent (0x0x7f5a266d19c0) 0 - vptr=((& QPlatformSurfaceEvent::_ZTV21QPlatformSurfaceEvent) + 16u) - QEvent (0x0x7f5a266d3720) 0 - primary-for QPlatformSurfaceEvent (0x0x7f5a266d19c0) - -Vtable for QResizeEvent -QResizeEvent::_ZTV12QResizeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QResizeEvent) -16 (int (*)(...))QResizeEvent::~QResizeEvent -24 (int (*)(...))QResizeEvent::~QResizeEvent - -Class QResizeEvent - size=40 align=8 - base size=36 base align=8 -QResizeEvent (0x0x7f5a266d1a28) 0 - vptr=((& QResizeEvent::_ZTV12QResizeEvent) + 16u) - QEvent (0x0x7f5a266d3780) 0 - primary-for QResizeEvent (0x0x7f5a266d1a28) - -Vtable for QCloseEvent -QCloseEvent::_ZTV11QCloseEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QCloseEvent) -16 (int (*)(...))QCloseEvent::~QCloseEvent -24 (int (*)(...))QCloseEvent::~QCloseEvent - -Class QCloseEvent - size=24 align=8 - base size=20 base align=8 -QCloseEvent (0x0x7f5a266d1a90) 0 - vptr=((& QCloseEvent::_ZTV11QCloseEvent) + 16u) - QEvent (0x0x7f5a266d37e0) 0 - primary-for QCloseEvent (0x0x7f5a266d1a90) - -Vtable for QIconDragEvent -QIconDragEvent::_ZTV14QIconDragEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QIconDragEvent) -16 (int (*)(...))QIconDragEvent::~QIconDragEvent -24 (int (*)(...))QIconDragEvent::~QIconDragEvent - -Class QIconDragEvent - size=24 align=8 - base size=20 base align=8 -QIconDragEvent (0x0x7f5a266d1af8) 0 - vptr=((& QIconDragEvent::_ZTV14QIconDragEvent) + 16u) - QEvent (0x0x7f5a266d3840) 0 - primary-for QIconDragEvent (0x0x7f5a266d1af8) - -Vtable for QShowEvent -QShowEvent::_ZTV10QShowEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QShowEvent) -16 (int (*)(...))QShowEvent::~QShowEvent -24 (int (*)(...))QShowEvent::~QShowEvent - -Class QShowEvent - size=24 align=8 - base size=20 base align=8 -QShowEvent (0x0x7f5a266d1b60) 0 - vptr=((& QShowEvent::_ZTV10QShowEvent) + 16u) - QEvent (0x0x7f5a266d38a0) 0 - primary-for QShowEvent (0x0x7f5a266d1b60) - -Vtable for QHideEvent -QHideEvent::_ZTV10QHideEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QHideEvent) -16 (int (*)(...))QHideEvent::~QHideEvent -24 (int (*)(...))QHideEvent::~QHideEvent - -Class QHideEvent - size=24 align=8 - base size=20 base align=8 -QHideEvent (0x0x7f5a266d1bc8) 0 - vptr=((& QHideEvent::_ZTV10QHideEvent) + 16u) - QEvent (0x0x7f5a266d3900) 0 - primary-for QHideEvent (0x0x7f5a266d1bc8) - -Vtable for QContextMenuEvent -QContextMenuEvent::_ZTV17QContextMenuEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QContextMenuEvent) -16 (int (*)(...))QContextMenuEvent::~QContextMenuEvent -24 (int (*)(...))QContextMenuEvent::~QContextMenuEvent - -Class QContextMenuEvent - size=56 align=8 - base size=49 base align=8 -QContextMenuEvent (0x0x7f5a266d1c30) 0 - vptr=((& QContextMenuEvent::_ZTV17QContextMenuEvent) + 16u) - QInputEvent (0x0x7f5a266d1c98) 0 - primary-for QContextMenuEvent (0x0x7f5a266d1c30) - QEvent (0x0x7f5a266d3960) 0 - primary-for QInputEvent (0x0x7f5a266d1c98) - -Class QInputMethodEvent::Attribute - size=32 align=8 - base size=32 base align=8 -QInputMethodEvent::Attribute (0x0x7f5a266d3a20) 0 - -Vtable for QInputMethodEvent -QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QInputMethodEvent) -16 (int (*)(...))QInputMethodEvent::~QInputMethodEvent -24 (int (*)(...))QInputMethodEvent::~QInputMethodEvent - -Class QInputMethodEvent - size=56 align=8 - base size=56 base align=8 -QInputMethodEvent (0x0x7f5a266d1d00) 0 - vptr=((& QInputMethodEvent::_ZTV17QInputMethodEvent) + 16u) - QEvent (0x0x7f5a266d39c0) 0 - primary-for QInputMethodEvent (0x0x7f5a266d1d00) - -Class QInputMethodQueryEvent::QueryPair - size=24 align=8 - base size=24 base align=8 -QInputMethodQueryEvent::QueryPair (0x0x7f5a266d3ea0) 0 - -Vtable for QInputMethodQueryEvent -QInputMethodQueryEvent::_ZTV22QInputMethodQueryEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QInputMethodQueryEvent) -16 (int (*)(...))QInputMethodQueryEvent::~QInputMethodQueryEvent -24 (int (*)(...))QInputMethodQueryEvent::~QInputMethodQueryEvent - -Class QInputMethodQueryEvent - size=32 align=8 - base size=32 base align=8 -QInputMethodQueryEvent (0x0x7f5a26447068) 0 - vptr=((& QInputMethodQueryEvent::_ZTV22QInputMethodQueryEvent) + 16u) - QEvent (0x0x7f5a266d3e40) 0 - primary-for QInputMethodQueryEvent (0x0x7f5a26447068) - -Vtable for QDropEvent -QDropEvent::_ZTV10QDropEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QDropEvent) -16 (int (*)(...))QDropEvent::~QDropEvent -24 (int (*)(...))QDropEvent::~QDropEvent - -Class QDropEvent - size=72 align=8 - base size=72 base align=8 -QDropEvent (0x0x7f5a26447340) 0 - vptr=((& QDropEvent::_ZTV10QDropEvent) + 16u) - QEvent (0x0x7f5a2647e240) 0 - primary-for QDropEvent (0x0x7f5a26447340) - -Vtable for QDragMoveEvent -QDragMoveEvent::_ZTV14QDragMoveEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QDragMoveEvent) -16 (int (*)(...))QDragMoveEvent::~QDragMoveEvent -24 (int (*)(...))QDragMoveEvent::~QDragMoveEvent - -Class QDragMoveEvent - size=88 align=8 - base size=88 base align=8 -QDragMoveEvent (0x0x7f5a264473a8) 0 - vptr=((& QDragMoveEvent::_ZTV14QDragMoveEvent) + 16u) - QDropEvent (0x0x7f5a26447410) 0 - primary-for QDragMoveEvent (0x0x7f5a264473a8) - QEvent (0x0x7f5a2647e2a0) 0 - primary-for QDropEvent (0x0x7f5a26447410) - -Vtable for QDragEnterEvent -QDragEnterEvent::_ZTV15QDragEnterEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QDragEnterEvent) -16 (int (*)(...))QDragEnterEvent::~QDragEnterEvent -24 (int (*)(...))QDragEnterEvent::~QDragEnterEvent - -Class QDragEnterEvent - size=88 align=8 - base size=88 base align=8 -QDragEnterEvent (0x0x7f5a26447478) 0 - vptr=((& QDragEnterEvent::_ZTV15QDragEnterEvent) + 16u) - QDragMoveEvent (0x0x7f5a264474e0) 0 - primary-for QDragEnterEvent (0x0x7f5a26447478) - QDropEvent (0x0x7f5a26447548) 0 - primary-for QDragMoveEvent (0x0x7f5a264474e0) - QEvent (0x0x7f5a2647e300) 0 - primary-for QDropEvent (0x0x7f5a26447548) - -Vtable for QDragLeaveEvent -QDragLeaveEvent::_ZTV15QDragLeaveEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QDragLeaveEvent) -16 (int (*)(...))QDragLeaveEvent::~QDragLeaveEvent -24 (int (*)(...))QDragLeaveEvent::~QDragLeaveEvent - -Class QDragLeaveEvent - size=24 align=8 - base size=20 base align=8 -QDragLeaveEvent (0x0x7f5a264475b0) 0 - vptr=((& QDragLeaveEvent::_ZTV15QDragLeaveEvent) + 16u) - QEvent (0x0x7f5a2647e360) 0 - primary-for QDragLeaveEvent (0x0x7f5a264475b0) - -Vtable for QHelpEvent -QHelpEvent::_ZTV10QHelpEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QHelpEvent) -16 (int (*)(...))QHelpEvent::~QHelpEvent -24 (int (*)(...))QHelpEvent::~QHelpEvent - -Class QHelpEvent - size=40 align=8 - base size=36 base align=8 -QHelpEvent (0x0x7f5a26447618) 0 - vptr=((& QHelpEvent::_ZTV10QHelpEvent) + 16u) - QEvent (0x0x7f5a2647e3c0) 0 - primary-for QHelpEvent (0x0x7f5a26447618) - -Vtable for QStatusTipEvent -QStatusTipEvent::_ZTV15QStatusTipEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QStatusTipEvent) -16 (int (*)(...))QStatusTipEvent::~QStatusTipEvent -24 (int (*)(...))QStatusTipEvent::~QStatusTipEvent - -Class QStatusTipEvent - size=32 align=8 - base size=32 base align=8 -QStatusTipEvent (0x0x7f5a26447680) 0 - vptr=((& QStatusTipEvent::_ZTV15QStatusTipEvent) + 16u) - QEvent (0x0x7f5a2647e420) 0 - primary-for QStatusTipEvent (0x0x7f5a26447680) - -Vtable for QWhatsThisClickedEvent -QWhatsThisClickedEvent::_ZTV22QWhatsThisClickedEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QWhatsThisClickedEvent) -16 (int (*)(...))QWhatsThisClickedEvent::~QWhatsThisClickedEvent -24 (int (*)(...))QWhatsThisClickedEvent::~QWhatsThisClickedEvent - -Class QWhatsThisClickedEvent - size=32 align=8 - base size=32 base align=8 -QWhatsThisClickedEvent (0x0x7f5a264476e8) 0 - vptr=((& QWhatsThisClickedEvent::_ZTV22QWhatsThisClickedEvent) + 16u) - QEvent (0x0x7f5a2647e480) 0 - primary-for QWhatsThisClickedEvent (0x0x7f5a264476e8) - -Vtable for QActionEvent -QActionEvent::_ZTV12QActionEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QActionEvent) -16 (int (*)(...))QActionEvent::~QActionEvent -24 (int (*)(...))QActionEvent::~QActionEvent - -Class QActionEvent - size=40 align=8 - base size=40 base align=8 -QActionEvent (0x0x7f5a26447750) 0 - vptr=((& QActionEvent::_ZTV12QActionEvent) + 16u) - QEvent (0x0x7f5a2647e4e0) 0 - primary-for QActionEvent (0x0x7f5a26447750) - -Vtable for QFileOpenEvent -QFileOpenEvent::_ZTV14QFileOpenEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QFileOpenEvent) -16 (int (*)(...))QFileOpenEvent::~QFileOpenEvent -24 (int (*)(...))QFileOpenEvent::~QFileOpenEvent - -Class QFileOpenEvent - size=40 align=8 - base size=40 base align=8 -QFileOpenEvent (0x0x7f5a264477b8) 0 - vptr=((& QFileOpenEvent::_ZTV14QFileOpenEvent) + 16u) - QEvent (0x0x7f5a2647e540) 0 - primary-for QFileOpenEvent (0x0x7f5a264477b8) - -Vtable for QToolBarChangeEvent -QToolBarChangeEvent::_ZTV19QToolBarChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QToolBarChangeEvent) -16 (int (*)(...))QToolBarChangeEvent::~QToolBarChangeEvent -24 (int (*)(...))QToolBarChangeEvent::~QToolBarChangeEvent - -Class QToolBarChangeEvent - size=24 align=8 - base size=21 base align=8 -QToolBarChangeEvent (0x0x7f5a26447820) 0 - vptr=((& QToolBarChangeEvent::_ZTV19QToolBarChangeEvent) + 16u) - QEvent (0x0x7f5a2647e5a0) 0 - primary-for QToolBarChangeEvent (0x0x7f5a26447820) - -Vtable for QShortcutEvent -QShortcutEvent::_ZTV14QShortcutEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QShortcutEvent) -16 (int (*)(...))QShortcutEvent::~QShortcutEvent -24 (int (*)(...))QShortcutEvent::~QShortcutEvent - -Class QShortcutEvent - size=40 align=8 - base size=40 base align=8 -QShortcutEvent (0x0x7f5a26447888) 0 - vptr=((& QShortcutEvent::_ZTV14QShortcutEvent) + 16u) - QEvent (0x0x7f5a2647e600) 0 - primary-for QShortcutEvent (0x0x7f5a26447888) - -Vtable for QWindowStateChangeEvent -QWindowStateChangeEvent::_ZTV23QWindowStateChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QWindowStateChangeEvent) -16 (int (*)(...))QWindowStateChangeEvent::~QWindowStateChangeEvent -24 (int (*)(...))QWindowStateChangeEvent::~QWindowStateChangeEvent - -Class QWindowStateChangeEvent - size=32 align=8 - base size=25 base align=8 -QWindowStateChangeEvent (0x0x7f5a264478f0) 0 - vptr=((& QWindowStateChangeEvent::_ZTV23QWindowStateChangeEvent) + 16u) - QEvent (0x0x7f5a2647e660) 0 - primary-for QWindowStateChangeEvent (0x0x7f5a264478f0) - -Class QPointingDeviceUniqueId - size=8 align=8 - base size=8 base align=8 -QPointingDeviceUniqueId (0x0x7f5a2647e6c0) 0 - -Class QTouchEvent::TouchPoint - size=8 align=8 - base size=8 base align=8 -QTouchEvent::TouchPoint (0x0x7f5a2647ed80) 0 - -Vtable for QTouchEvent -QTouchEvent::_ZTV11QTouchEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTouchEvent) -16 (int (*)(...))QTouchEvent::~QTouchEvent -24 (int (*)(...))QTouchEvent::~QTouchEvent - -Class QTouchEvent - size=72 align=8 - base size=72 base align=8 -QTouchEvent (0x0x7f5a26447f70) 0 - vptr=((& QTouchEvent::_ZTV11QTouchEvent) + 16u) - QInputEvent (0x0x7f5a264ed000) 0 - primary-for QTouchEvent (0x0x7f5a26447f70) - QEvent (0x0x7f5a2647ed20) 0 - primary-for QInputEvent (0x0x7f5a264ed000) - -Vtable for QScrollPrepareEvent -QScrollPrepareEvent::_ZTV19QScrollPrepareEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QScrollPrepareEvent) -16 (int (*)(...))QScrollPrepareEvent::~QScrollPrepareEvent -24 (int (*)(...))QScrollPrepareEvent::~QScrollPrepareEvent - -Class QScrollPrepareEvent - size=112 align=8 - base size=112 base align=8 -QScrollPrepareEvent (0x0x7f5a261ac820) 0 - vptr=((& QScrollPrepareEvent::_ZTV19QScrollPrepareEvent) + 16u) - QEvent (0x0x7f5a261b0420) 0 - primary-for QScrollPrepareEvent (0x0x7f5a261ac820) - -Vtable for QScrollEvent -QScrollEvent::_ZTV12QScrollEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QScrollEvent) -16 (int (*)(...))QScrollEvent::~QScrollEvent -24 (int (*)(...))QScrollEvent::~QScrollEvent - -Class QScrollEvent - size=64 align=8 - base size=60 base align=8 -QScrollEvent (0x0x7f5a261ac888) 0 - vptr=((& QScrollEvent::_ZTV12QScrollEvent) + 16u) - QEvent (0x0x7f5a261b0480) 0 - primary-for QScrollEvent (0x0x7f5a261ac888) - -Vtable for QScreenOrientationChangeEvent -QScreenOrientationChangeEvent::_ZTV29QScreenOrientationChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI29QScreenOrientationChangeEvent) -16 (int (*)(...))QScreenOrientationChangeEvent::~QScreenOrientationChangeEvent -24 (int (*)(...))QScreenOrientationChangeEvent::~QScreenOrientationChangeEvent - -Class QScreenOrientationChangeEvent - size=40 align=8 - base size=36 base align=8 -QScreenOrientationChangeEvent (0x0x7f5a261ac8f0) 0 - vptr=((& QScreenOrientationChangeEvent::_ZTV29QScreenOrientationChangeEvent) + 16u) - QEvent (0x0x7f5a261b04e0) 0 - primary-for QScreenOrientationChangeEvent (0x0x7f5a261ac8f0) - -Vtable for QApplicationStateChangeEvent -QApplicationStateChangeEvent::_ZTV28QApplicationStateChangeEvent: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI28QApplicationStateChangeEvent) -16 (int (*)(...))QApplicationStateChangeEvent::~QApplicationStateChangeEvent -24 (int (*)(...))QApplicationStateChangeEvent::~QApplicationStateChangeEvent - -Class QApplicationStateChangeEvent - size=24 align=8 - base size=24 base align=8 -QApplicationStateChangeEvent (0x0x7f5a261ac958) 0 - vptr=((& QApplicationStateChangeEvent::_ZTV28QApplicationStateChangeEvent) + 16u) - QEvent (0x0x7f5a261b0540) 0 - primary-for QApplicationStateChangeEvent (0x0x7f5a261ac958) - -Class QFont - size=16 align=8 - base size=12 base align=8 -QFont (0x0x7f5a261b05a0) 0 - -Class QPolygon - size=8 align=8 - base size=8 base align=8 -QPolygon (0x0x7f5a262646e8) 0 - QVector (0x0x7f5a2626f2a0) 0 - -Class QPolygonF - size=8 align=8 - base size=8 base align=8 -QPolygonF (0x0x7f5a26264a90) 0 - QVector (0x0x7f5a2626f720) 0 - -Class QMatrix - size=48 align=8 - base size=48 base align=8 -QMatrix (0x0x7f5a2626fae0) 0 - -Class QPainterPath::Element - size=24 align=8 - base size=24 base align=8 -QPainterPath::Element (0x0x7f5a2626fde0) 0 - -Class QPainterPath - size=8 align=8 - base size=8 base align=8 -QPainterPath (0x0x7f5a2626fd80) 0 - -Class QPainterPathStroker - size=8 align=8 - base size=8 base align=8 -QPainterPathStroker (0x0x7f5a25fb77e0) 0 - -Class QTransform - size=88 align=8 - base size=88 base align=8 -QTransform (0x0x7f5a25fb7900) 0 - -Vtable for QPaintDevice -QPaintDevice::_ZTV12QPaintDevice: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QPaintDevice) -16 0u -24 0u -32 (int (*)(...))QPaintDevice::devType -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QPaintDevice::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QPaintDevice - size=24 align=8 - base size=24 base align=8 -QPaintDevice (0x0x7f5a26055060) 0 - vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 16u) - -Class QPixelFormat - size=8 align=8 - base size=8 base align=8 -QPixelFormat (0x0x7f5a260550c0) 0 - -Vtable for QImage -QImage::_ZTV6QImage: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QImage) -16 (int (*)(...))QImage::~QImage -24 (int (*)(...))QImage::~QImage -32 (int (*)(...))QImage::devType -40 (int (*)(...))QImage::paintEngine -48 (int (*)(...))QImage::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QImage - size=32 align=8 - base size=32 base align=8 -QImage (0x0x7f5a26108958) 0 - vptr=((& QImage::_ZTV6QImage) + 16u) - QPaintDevice (0x0x7f5a26055b40) 0 - primary-for QImage (0x0x7f5a26108958) - -Vtable for QPixmap -QPixmap::_ZTV7QPixmap: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QPixmap) -16 (int (*)(...))QPixmap::~QPixmap -24 (int (*)(...))QPixmap::~QPixmap -32 (int (*)(...))QPixmap::devType -40 (int (*)(...))QPixmap::paintEngine -48 (int (*)(...))QPixmap::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QPixmap - size=32 align=8 - base size=32 base align=8 -QPixmap (0x0x7f5a25df04e0) 0 - vptr=((& QPixmap::_ZTV7QPixmap) + 16u) - QPaintDevice (0x0x7f5a25ddfae0) 0 - primary-for QPixmap (0x0x7f5a25df04e0) - -Class QBrush - size=8 align=8 - base size=8 base align=8 -QBrush (0x0x7f5a25ddfde0) 0 - -Class QBrushData - size=112 align=8 - base size=112 base align=8 -QBrushData (0x0x7f5a25e775a0) 0 - -Class QGradient - size=64 align=8 - base size=64 base align=8 -QGradient (0x0x7f5a25e77600) 0 - -Class QLinearGradient - size=64 align=8 - base size=64 base align=8 -QLinearGradient (0x0x7f5a25df0e38) 0 - QGradient (0x0x7f5a25e778a0) 0 - -Class QRadialGradient - size=64 align=8 - base size=64 base align=8 -QRadialGradient (0x0x7f5a25df0ea0) 0 - QGradient (0x0x7f5a25e77900) 0 - -Class QConicalGradient - size=64 align=8 - base size=64 base align=8 -QConicalGradient (0x0x7f5a25df0f08) 0 - QGradient (0x0x7f5a25e77960) 0 - -Class QPen - size=8 align=8 - base size=8 base align=8 -QPen (0x0x7f5a25e779c0) 0 - -Class QTextOption::Tab - size=16 align=8 - base size=14 base align=8 -QTextOption::Tab (0x0x7f5a25f70c00) 0 - -Class QTextOption - size=32 align=8 - base size=32 base align=8 -QTextOption (0x0x7f5a25f70ba0) 0 - -Class QTextLength - size=16 align=8 - base size=16 base align=8 -QTextLength (0x0x7f5a25ba93c0) 0 - -Class QTextFormat - size=16 align=8 - base size=12 base align=8 -QTextFormat (0x0x7f5a25ba9ae0) 0 - -Class QTextCharFormat - size=16 align=8 - base size=12 base align=8 -QTextCharFormat (0x0x7f5a25c167b8) 0 - QTextFormat (0x0x7f5a25c59960) 0 - -Class QTextBlockFormat - size=16 align=8 - base size=12 base align=8 -QTextBlockFormat (0x0x7f5a25d4a068) 0 - QTextFormat (0x0x7f5a25c59c00) 0 - -Class QTextListFormat - size=16 align=8 - base size=12 base align=8 -QTextListFormat (0x0x7f5a25d4a2d8) 0 - QTextFormat (0x0x7f5a25c59ea0) 0 - -Class QTextImageFormat - size=16 align=8 - base size=12 base align=8 -QTextImageFormat (0x0x7f5a25d4a4e0) 0 - QTextCharFormat (0x0x7f5a25d4a548) 0 - QTextFormat (0x0x7f5a25d87180) 0 - -Class QTextFrameFormat - size=16 align=8 - base size=12 base align=8 -QTextFrameFormat (0x0x7f5a25d4a750) 0 - QTextFormat (0x0x7f5a25d87420) 0 - -Class QTextTableFormat - size=16 align=8 - base size=12 base align=8 -QTextTableFormat (0x0x7f5a25d4a958) 0 - QTextFrameFormat (0x0x7f5a25d4a9c0) 0 - QTextFormat (0x0x7f5a25d876c0) 0 - -Class QTextTableCellFormat - size=16 align=8 - base size=12 base align=8 -QTextTableCellFormat (0x0x7f5a25d4abc8) 0 - QTextCharFormat (0x0x7f5a25d4ac30) 0 - QTextFormat (0x0x7f5a25d879c0) 0 - -Class QFontDatabase - size=8 align=8 - base size=8 base align=8 -QFontDatabase (0x0x7f5a25d87c60) 0 - -Class QRawFont - size=8 align=8 - base size=8 base align=8 -QRawFont (0x0x7f5a25d87cc0) 0 - -Class QGlyphRun - size=8 align=8 - base size=8 base align=8 -QGlyphRun (0x0x7f5a25a481e0) 0 - -Class QTextCursor - size=8 align=8 - base size=8 base align=8 -QTextCursor (0x0x7f5a25a484e0) 0 - -Class QTextInlineObject - size=16 align=8 - base size=16 base align=8 -QTextInlineObject (0x0x7f5a25a487e0) 0 - -Class QTextLayout::FormatRange - size=24 align=8 - base size=24 base align=8 -QTextLayout::FormatRange (0x0x7f5a25a488a0) 0 - -Class QTextLayout - size=8 align=8 - base size=8 base align=8 -QTextLayout (0x0x7f5a25a48840) 0 - -Class QTextLine - size=16 align=8 - base size=16 base align=8 -QTextLine (0x0x7f5a25b36300) 0 - -Vtable for QAbstractUndoItem -QAbstractUndoItem::_ZTV17QAbstractUndoItem: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAbstractUndoItem) -16 (int (*)(...))__cxa_pure_virtual -24 (int (*)(...))__cxa_pure_virtual -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QAbstractUndoItem - size=8 align=8 - base size=8 base align=8 -QAbstractUndoItem (0x0x7f5a25b36360) 0 nearly-empty - vptr=((& QAbstractUndoItem::_ZTV17QAbstractUndoItem) + 16u) - -Class QTextDocument::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextDocument::QPrivateSignal (0x0x7f5a25b36420) 0 empty - -Vtable for QTextDocument -QTextDocument::_ZTV13QTextDocument: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QTextDocument) -16 (int (*)(...))QTextDocument::metaObject -24 (int (*)(...))QTextDocument::qt_metacast -32 (int (*)(...))QTextDocument::qt_metacall -40 (int (*)(...))QTextDocument::~QTextDocument -48 (int (*)(...))QTextDocument::~QTextDocument -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTextDocument::clear -120 (int (*)(...))QTextDocument::createObject -128 (int (*)(...))QTextDocument::loadResource - -Class QTextDocument - size=16 align=8 - base size=16 base align=8 -QTextDocument (0x0x7f5a25a4c478) 0 - vptr=((& QTextDocument::_ZTV13QTextDocument) + 16u) - QObject (0x0x7f5a25b363c0) 0 - primary-for QTextDocument (0x0x7f5a25a4c478) - -Class QPalette::Data - size=4 align=4 - base size=4 base align=4 -QPalette::Data (0x0x7f5a25b36660) 0 - -Class QPalette - size=16 align=8 - base size=12 base align=8 -QPalette (0x0x7f5a25b36600) 0 - -Class QAbstractTextDocumentLayout::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractTextDocumentLayout::QPrivateSignal (0x0x7f5a25854720) 0 empty - -Class QAbstractTextDocumentLayout::Selection - size=24 align=8 - base size=24 base align=8 -QAbstractTextDocumentLayout::Selection (0x0x7f5a25854780) 0 - -Class QAbstractTextDocumentLayout::PaintContext - size=64 align=8 - base size=64 base align=8 -QAbstractTextDocumentLayout::PaintContext (0x0x7f5a258547e0) 0 - -Vtable for QAbstractTextDocumentLayout -QAbstractTextDocumentLayout::_ZTV27QAbstractTextDocumentLayout: 24u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QAbstractTextDocumentLayout) -16 (int (*)(...))QAbstractTextDocumentLayout::metaObject -24 (int (*)(...))QAbstractTextDocumentLayout::qt_metacast -32 (int (*)(...))QAbstractTextDocumentLayout::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QAbstractTextDocumentLayout::resizeInlineObject -176 (int (*)(...))QAbstractTextDocumentLayout::positionInlineObject -184 (int (*)(...))QAbstractTextDocumentLayout::drawInlineObject - -Class QAbstractTextDocumentLayout - size=16 align=8 - base size=16 base align=8 -QAbstractTextDocumentLayout (0x0x7f5a25851c98) 0 - vptr=((& QAbstractTextDocumentLayout::_ZTV27QAbstractTextDocumentLayout) + 16u) - QObject (0x0x7f5a258546c0) 0 - primary-for QAbstractTextDocumentLayout (0x0x7f5a25851c98) - -Vtable for QTextObjectInterface -QTextObjectInterface::_ZTV20QTextObjectInterface: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QTextObjectInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QTextObjectInterface - size=8 align=8 - base size=8 base align=8 -QTextObjectInterface (0x0x7f5a25854d80) 0 nearly-empty - vptr=((& QTextObjectInterface::_ZTV20QTextObjectInterface) + 16u) - -Class QAccessible::State - size=8 align=8 - base size=5 base align=8 -QAccessible::State (0x0x7f5a25854ea0) 0 - -Vtable for QAccessible::ActivationObserver -QAccessible::ActivationObserver::_ZTVN11QAccessible18ActivationObserverE: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN11QAccessible18ActivationObserverE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QAccessible::ActivationObserver - size=8 align=8 - base size=8 base align=8 -QAccessible::ActivationObserver (0x0x7f5a25854f00) 0 nearly-empty - vptr=((& QAccessible::ActivationObserver::_ZTVN11QAccessible18ActivationObserverE) + 16u) - -Class QAccessible - size=1 align=1 - base size=0 base align=1 -QAccessible (0x0x7f5a25854e40) 0 empty - -Vtable for QAccessibleInterface -QAccessibleInterface::_ZTV20QAccessibleInterface: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QAccessibleInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QAccessibleInterface::window -56 (int (*)(...))QAccessibleInterface::relations -64 (int (*)(...))QAccessibleInterface::focusChild -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAccessibleInterface::foregroundColor -160 (int (*)(...))QAccessibleInterface::backgroundColor -168 (int (*)(...))QAccessibleInterface::virtual_hook -176 (int (*)(...))QAccessibleInterface::interface_cast - -Class QAccessibleInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleInterface (0x0x7f5a25909120) 0 nearly-empty - vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 16u) - -Vtable for QAccessibleTextInterface -QAccessibleTextInterface::_ZTV24QAccessibleTextInterface: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QAccessibleTextInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))QAccessibleTextInterface::textBeforeOffset -104 (int (*)(...))QAccessibleTextInterface::textAfterOffset -112 (int (*)(...))QAccessibleTextInterface::textAtOffset -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleTextInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleTextInterface (0x0x7f5a25909180) 0 nearly-empty - vptr=((& QAccessibleTextInterface::_ZTV24QAccessibleTextInterface) + 16u) - -Vtable for QAccessibleEditableTextInterface -QAccessibleEditableTextInterface::_ZTV32QAccessibleEditableTextInterface: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI32QAccessibleEditableTextInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleEditableTextInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleEditableTextInterface (0x0x7f5a259091e0) 0 nearly-empty - vptr=((& QAccessibleEditableTextInterface::_ZTV32QAccessibleEditableTextInterface) + 16u) - -Vtable for QAccessibleValueInterface -QAccessibleValueInterface::_ZTV25QAccessibleValueInterface: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QAccessibleValueInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleValueInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleValueInterface (0x0x7f5a25909240) 0 nearly-empty - vptr=((& QAccessibleValueInterface::_ZTV25QAccessibleValueInterface) + 16u) - -Vtable for QAccessibleTableCellInterface -QAccessibleTableCellInterface::_ZTV29QAccessibleTableCellInterface: 12u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI29QAccessibleTableCellInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleTableCellInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleTableCellInterface (0x0x7f5a259092a0) 0 nearly-empty - vptr=((& QAccessibleTableCellInterface::_ZTV29QAccessibleTableCellInterface) + 16u) - -Vtable for QAccessibleTableInterface -QAccessibleTableInterface::_ZTV25QAccessibleTableInterface: 24u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QAccessibleTableInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))__cxa_pure_virtual -176 (int (*)(...))__cxa_pure_virtual -184 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleTableInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleTableInterface (0x0x7f5a25909300) 0 nearly-empty - vptr=((& QAccessibleTableInterface::_ZTV25QAccessibleTableInterface) + 16u) - -Vtable for QAccessibleActionInterface -QAccessibleActionInterface::_ZTV26QAccessibleActionInterface: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleActionInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QAccessibleActionInterface::localizedActionName -48 (int (*)(...))QAccessibleActionInterface::localizedActionDescription -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleActionInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleActionInterface (0x0x7f5a25909360) 0 nearly-empty - vptr=((& QAccessibleActionInterface::_ZTV26QAccessibleActionInterface) + 16u) - -Vtable for QAccessibleImageInterface -QAccessibleImageInterface::_ZTV25QAccessibleImageInterface: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI25QAccessibleImageInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleImageInterface - size=8 align=8 - base size=8 base align=8 -QAccessibleImageInterface (0x0x7f5a259093c0) 0 nearly-empty - vptr=((& QAccessibleImageInterface::_ZTV25QAccessibleImageInterface) + 16u) - -Vtable for QAccessibleEvent -QAccessibleEvent::_ZTV16QAccessibleEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QAccessibleEvent) -16 (int (*)(...))QAccessibleEvent::~QAccessibleEvent -24 (int (*)(...))QAccessibleEvent::~QAccessibleEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleEvent - size=32 align=8 - base size=28 base align=8 -QAccessibleEvent (0x0x7f5a25909420) 0 - vptr=((& QAccessibleEvent::_ZTV16QAccessibleEvent) + 16u) - -Vtable for QAccessibleStateChangeEvent -QAccessibleStateChangeEvent::_ZTV27QAccessibleStateChangeEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QAccessibleStateChangeEvent) -16 (int (*)(...))QAccessibleStateChangeEvent::~QAccessibleStateChangeEvent -24 (int (*)(...))QAccessibleStateChangeEvent::~QAccessibleStateChangeEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleStateChangeEvent - size=40 align=8 - base size=40 base align=8 -QAccessibleStateChangeEvent (0x0x7f5a258d56e8) 0 - vptr=((& QAccessibleStateChangeEvent::_ZTV27QAccessibleStateChangeEvent) + 16u) - QAccessibleEvent (0x0x7f5a25909960) 0 - primary-for QAccessibleStateChangeEvent (0x0x7f5a258d56e8) - -Vtable for QAccessibleTextCursorEvent -QAccessibleTextCursorEvent::_ZTV26QAccessibleTextCursorEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextCursorEvent) -16 (int (*)(...))QAccessibleTextCursorEvent::~QAccessibleTextCursorEvent -24 (int (*)(...))QAccessibleTextCursorEvent::~QAccessibleTextCursorEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextCursorEvent - size=32 align=8 - base size=32 base align=8 -QAccessibleTextCursorEvent (0x0x7f5a258d5750) 0 - vptr=((& QAccessibleTextCursorEvent::_ZTV26QAccessibleTextCursorEvent) + 16u) - QAccessibleEvent (0x0x7f5a259099c0) 0 - primary-for QAccessibleTextCursorEvent (0x0x7f5a258d5750) - -Vtable for QAccessibleTextSelectionEvent -QAccessibleTextSelectionEvent::_ZTV29QAccessibleTextSelectionEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI29QAccessibleTextSelectionEvent) -16 (int (*)(...))QAccessibleTextSelectionEvent::~QAccessibleTextSelectionEvent -24 (int (*)(...))QAccessibleTextSelectionEvent::~QAccessibleTextSelectionEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextSelectionEvent - size=40 align=8 - base size=40 base align=8 -QAccessibleTextSelectionEvent (0x0x7f5a258d57b8) 0 - vptr=((& QAccessibleTextSelectionEvent::_ZTV29QAccessibleTextSelectionEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7f5a258d5820) 0 - primary-for QAccessibleTextSelectionEvent (0x0x7f5a258d57b8) - QAccessibleEvent (0x0x7f5a25909a20) 0 - primary-for QAccessibleTextCursorEvent (0x0x7f5a258d5820) - -Vtable for QAccessibleTextInsertEvent -QAccessibleTextInsertEvent::_ZTV26QAccessibleTextInsertEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextInsertEvent) -16 (int (*)(...))QAccessibleTextInsertEvent::~QAccessibleTextInsertEvent -24 (int (*)(...))QAccessibleTextInsertEvent::~QAccessibleTextInsertEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextInsertEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleTextInsertEvent (0x0x7f5a258d5888) 0 - vptr=((& QAccessibleTextInsertEvent::_ZTV26QAccessibleTextInsertEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7f5a258d58f0) 0 - primary-for QAccessibleTextInsertEvent (0x0x7f5a258d5888) - QAccessibleEvent (0x0x7f5a25909a80) 0 - primary-for QAccessibleTextCursorEvent (0x0x7f5a258d58f0) - -Vtable for QAccessibleTextRemoveEvent -QAccessibleTextRemoveEvent::_ZTV26QAccessibleTextRemoveEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextRemoveEvent) -16 (int (*)(...))QAccessibleTextRemoveEvent::~QAccessibleTextRemoveEvent -24 (int (*)(...))QAccessibleTextRemoveEvent::~QAccessibleTextRemoveEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextRemoveEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleTextRemoveEvent (0x0x7f5a258d5958) 0 - vptr=((& QAccessibleTextRemoveEvent::_ZTV26QAccessibleTextRemoveEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7f5a258d59c0) 0 - primary-for QAccessibleTextRemoveEvent (0x0x7f5a258d5958) - QAccessibleEvent (0x0x7f5a25909ae0) 0 - primary-for QAccessibleTextCursorEvent (0x0x7f5a258d59c0) - -Vtable for QAccessibleTextUpdateEvent -QAccessibleTextUpdateEvent::_ZTV26QAccessibleTextUpdateEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QAccessibleTextUpdateEvent) -16 (int (*)(...))QAccessibleTextUpdateEvent::~QAccessibleTextUpdateEvent -24 (int (*)(...))QAccessibleTextUpdateEvent::~QAccessibleTextUpdateEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTextUpdateEvent - size=56 align=8 - base size=56 base align=8 -QAccessibleTextUpdateEvent (0x0x7f5a258d5a28) 0 - vptr=((& QAccessibleTextUpdateEvent::_ZTV26QAccessibleTextUpdateEvent) + 16u) - QAccessibleTextCursorEvent (0x0x7f5a258d5a90) 0 - primary-for QAccessibleTextUpdateEvent (0x0x7f5a258d5a28) - QAccessibleEvent (0x0x7f5a25909b40) 0 - primary-for QAccessibleTextCursorEvent (0x0x7f5a258d5a90) - -Vtable for QAccessibleValueChangeEvent -QAccessibleValueChangeEvent::_ZTV27QAccessibleValueChangeEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QAccessibleValueChangeEvent) -16 (int (*)(...))QAccessibleValueChangeEvent::~QAccessibleValueChangeEvent -24 (int (*)(...))QAccessibleValueChangeEvent::~QAccessibleValueChangeEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleValueChangeEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleValueChangeEvent (0x0x7f5a258d5af8) 0 - vptr=((& QAccessibleValueChangeEvent::_ZTV27QAccessibleValueChangeEvent) + 16u) - QAccessibleEvent (0x0x7f5a25909ba0) 0 - primary-for QAccessibleValueChangeEvent (0x0x7f5a258d5af8) - -Vtable for QAccessibleTableModelChangeEvent -QAccessibleTableModelChangeEvent::_ZTV32QAccessibleTableModelChangeEvent: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI32QAccessibleTableModelChangeEvent) -16 (int (*)(...))QAccessibleTableModelChangeEvent::~QAccessibleTableModelChangeEvent -24 (int (*)(...))QAccessibleTableModelChangeEvent::~QAccessibleTableModelChangeEvent -32 (int (*)(...))QAccessibleEvent::accessibleInterface - -Class QAccessibleTableModelChangeEvent - size=48 align=8 - base size=48 base align=8 -QAccessibleTableModelChangeEvent (0x0x7f5a258d5b60) 0 - vptr=((& QAccessibleTableModelChangeEvent::_ZTV32QAccessibleTableModelChangeEvent) + 16u) - QAccessibleEvent (0x0x7f5a25909c00) 0 - primary-for QAccessibleTableModelChangeEvent (0x0x7f5a258d5b60) - -Vtable for QAccessibleBridge -QAccessibleBridge::_ZTV17QAccessibleBridge: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAccessibleBridge) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleBridge - size=8 align=8 - base size=8 base align=8 -QAccessibleBridge (0x0x7f5a25909cc0) 0 nearly-empty - vptr=((& QAccessibleBridge::_ZTV17QAccessibleBridge) + 16u) - -Class QAccessibleBridgePlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessibleBridgePlugin::QPrivateSignal (0x0x7f5a25909d80) 0 empty - -Vtable for QAccessibleBridgePlugin -QAccessibleBridgePlugin::_ZTV23QAccessibleBridgePlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QAccessibleBridgePlugin) -16 (int (*)(...))QAccessibleBridgePlugin::metaObject -24 (int (*)(...))QAccessibleBridgePlugin::qt_metacast -32 (int (*)(...))QAccessibleBridgePlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QAccessibleBridgePlugin - size=16 align=8 - base size=16 base align=8 -QAccessibleBridgePlugin (0x0x7f5a258d5bc8) 0 - vptr=((& QAccessibleBridgePlugin::_ZTV23QAccessibleBridgePlugin) + 16u) - QObject (0x0x7f5a25909d20) 0 - primary-for QAccessibleBridgePlugin (0x0x7f5a258d5bc8) - -Vtable for QAccessibleObject -QAccessibleObject::_ZTV17QAccessibleObject: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAccessibleObject) -16 0u -24 0u -32 (int (*)(...))QAccessibleObject::isValid -40 (int (*)(...))QAccessibleObject::object -48 (int (*)(...))QAccessibleInterface::window -56 (int (*)(...))QAccessibleInterface::relations -64 (int (*)(...))QAccessibleInterface::focusChild -72 (int (*)(...))QAccessibleObject::childAt -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QAccessibleObject::setText -128 (int (*)(...))QAccessibleObject::rect -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QAccessibleInterface::foregroundColor -160 (int (*)(...))QAccessibleInterface::backgroundColor -168 (int (*)(...))QAccessibleInterface::virtual_hook -176 (int (*)(...))QAccessibleInterface::interface_cast - -Class QAccessibleObject - size=16 align=8 - base size=16 base align=8 -QAccessibleObject (0x0x7f5a258d5c30) 0 - vptr=((& QAccessibleObject::_ZTV17QAccessibleObject) + 16u) - QAccessibleInterface (0x0x7f5a25909de0) 0 nearly-empty - primary-for QAccessibleObject (0x0x7f5a258d5c30) - -Vtable for QAccessibleApplication -QAccessibleApplication::_ZTV22QAccessibleApplication: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QAccessibleApplication) -16 (int (*)(...))QAccessibleApplication::~QAccessibleApplication -24 (int (*)(...))QAccessibleApplication::~QAccessibleApplication -32 (int (*)(...))QAccessibleObject::isValid -40 (int (*)(...))QAccessibleObject::object -48 (int (*)(...))QAccessibleApplication::window -56 (int (*)(...))QAccessibleInterface::relations -64 (int (*)(...))QAccessibleApplication::focusChild -72 (int (*)(...))QAccessibleObject::childAt -80 (int (*)(...))QAccessibleApplication::parent -88 (int (*)(...))QAccessibleApplication::child -96 (int (*)(...))QAccessibleApplication::childCount -104 (int (*)(...))QAccessibleApplication::indexOfChild -112 (int (*)(...))QAccessibleApplication::text -120 (int (*)(...))QAccessibleObject::setText -128 (int (*)(...))QAccessibleObject::rect -136 (int (*)(...))QAccessibleApplication::role -144 (int (*)(...))QAccessibleApplication::state -152 (int (*)(...))QAccessibleInterface::foregroundColor -160 (int (*)(...))QAccessibleInterface::backgroundColor -168 (int (*)(...))QAccessibleInterface::virtual_hook -176 (int (*)(...))QAccessibleInterface::interface_cast - -Class QAccessibleApplication - size=16 align=8 - base size=16 base align=8 -QAccessibleApplication (0x0x7f5a258d5c98) 0 - vptr=((& QAccessibleApplication::_ZTV22QAccessibleApplication) + 16u) - QAccessibleObject (0x0x7f5a258d5d00) 0 - primary-for QAccessibleApplication (0x0x7f5a258d5c98) - QAccessibleInterface (0x0x7f5a25909e40) 0 nearly-empty - primary-for QAccessibleObject (0x0x7f5a258d5d00) - -Class QAccessiblePlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessiblePlugin::QPrivateSignal (0x0x7f5a25909f00) 0 empty - -Vtable for QAccessiblePlugin -QAccessiblePlugin::_ZTV17QAccessiblePlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QAccessiblePlugin) -16 (int (*)(...))QAccessiblePlugin::metaObject -24 (int (*)(...))QAccessiblePlugin::qt_metacast -32 (int (*)(...))QAccessiblePlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QAccessiblePlugin - size=16 align=8 - base size=16 base align=8 -QAccessiblePlugin (0x0x7f5a258d5d68) 0 - vptr=((& QAccessiblePlugin::_ZTV17QAccessiblePlugin) + 16u) - QObject (0x0x7f5a25909ea0) 0 - primary-for QAccessiblePlugin (0x0x7f5a258d5d68) - -Class QSurfaceFormat - size=8 align=8 - base size=8 base align=8 -QSurfaceFormat (0x0x7f5a25909f60) 0 - -Vtable for QSurface -QSurface::_ZTV8QSurface: 8u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QSurface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual - -Class QSurface - size=24 align=8 - base size=24 base align=8 -QSurface (0x0x7f5a25693180) 0 - vptr=((& QSurface::_ZTV8QSurface) + 16u) - -Class QIcon - size=8 align=8 - base size=8 base align=8 -QIcon (0x0x7f5a25693300) 0 - -Class QCursor - size=8 align=8 - base size=8 base align=8 -QCursor (0x0x7f5a2575c6c0) 0 - -Class QWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QWindow::QPrivateSignal (0x0x7f5a253e7cc0) 0 empty - -Vtable for QWindow -QWindow::_ZTV7QWindow: 45u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QWindow) -16 (int (*)(...))QWindow::metaObject -24 (int (*)(...))QWindow::qt_metacast -32 (int (*)(...))QWindow::qt_metacall -40 (int (*)(...))QWindow::~QWindow -48 (int (*)(...))QWindow::~QWindow -56 (int (*)(...))QWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QWindow::exposeEvent -160 (int (*)(...))QWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))-16 -304 (int (*)(...))(& _ZTI7QWindow) -312 (int (*)(...))QWindow::_ZThn16_N7QWindowD1Ev -320 (int (*)(...))QWindow::_ZThn16_N7QWindowD0Ev -328 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -336 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -344 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv - -Class QWindow - size=40 align=8 - base size=40 base align=8 -QWindow (0x0x7f5a253ff380) 0 - vptr=((& QWindow::_ZTV7QWindow) + 16u) - QObject (0x0x7f5a253e7c00) 0 - primary-for QWindow (0x0x7f5a253ff380) - QSurface (0x0x7f5a253e7c60) 16 - vptr=((& QWindow::_ZTV7QWindow) + 312u) - -Class QBackingStore - size=8 align=8 - base size=8 base align=8 -QBackingStore (0x0x7f5a253e7de0) 0 - -Vtable for QBitmap -QBitmap::_ZTV7QBitmap: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QBitmap) -16 (int (*)(...))QBitmap::~QBitmap -24 (int (*)(...))QBitmap::~QBitmap -32 (int (*)(...))QPixmap::devType -40 (int (*)(...))QPixmap::paintEngine -48 (int (*)(...))QPixmap::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter - -Class QBitmap - size=32 align=8 - base size=32 base align=8 -QBitmap (0x0x7f5a253eadd0) 0 - vptr=((& QBitmap::_ZTV7QBitmap) + 16u) - QPixmap (0x0x7f5a253eae38) 0 - primary-for QBitmap (0x0x7f5a253eadd0) - QPaintDevice (0x0x7f5a253e7ea0) 0 - primary-for QPixmap (0x0x7f5a253eae38) - -Class QClipboard::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QClipboard::QPrivateSignal (0x0x7f5a25479240) 0 empty - -Vtable for QClipboard -QClipboard::_ZTV10QClipboard: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QClipboard) -16 (int (*)(...))QClipboard::metaObject -24 (int (*)(...))QClipboard::qt_metacast -32 (int (*)(...))QClipboard::qt_metacall -40 (int (*)(...))QClipboard::~QClipboard -48 (int (*)(...))QClipboard::~QClipboard -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QClipboard - size=16 align=8 - base size=16 base align=8 -QClipboard (0x0x7f5a2547d0d0) 0 - vptr=((& QClipboard::_ZTV10QClipboard) + 16u) - QObject (0x0x7f5a254791e0) 0 - primary-for QClipboard (0x0x7f5a2547d0d0) - -Class QDesktopServices - size=1 align=1 - base size=0 base align=1 -QDesktopServices (0x0x7f5a254792a0) 0 empty - -Class QDrag::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QDrag::QPrivateSignal (0x0x7f5a25479360) 0 empty - -Vtable for QDrag -QDrag::_ZTV5QDrag: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI5QDrag) -16 (int (*)(...))QDrag::metaObject -24 (int (*)(...))QDrag::qt_metacast -32 (int (*)(...))QDrag::qt_metacall -40 (int (*)(...))QDrag::~QDrag -48 (int (*)(...))QDrag::~QDrag -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QDrag - size=16 align=8 - base size=16 base align=8 -QDrag (0x0x7f5a2547d138) 0 - vptr=((& QDrag::_ZTV5QDrag) + 16u) - QObject (0x0x7f5a25479300) 0 - primary-for QDrag (0x0x7f5a2547d138) - -Class QFontInfo - size=8 align=8 - base size=8 base align=8 -QFontInfo (0x0x7f5a254793c0) 0 - -Class QFontMetrics - size=8 align=8 - base size=8 base align=8 -QFontMetrics (0x0x7f5a25479660) 0 - -Class QFontMetricsF - size=8 align=8 - base size=8 base align=8 -QFontMetricsF (0x0x7f5a25479960) 0 - -Class QGenericPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QGenericPlugin::QPrivateSignal (0x0x7f5a2554ee40) 0 empty - -Vtable for QGenericPlugin -QGenericPlugin::_ZTV14QGenericPlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QGenericPlugin) -16 (int (*)(...))QGenericPlugin::metaObject -24 (int (*)(...))QGenericPlugin::qt_metacast -32 (int (*)(...))QGenericPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QGenericPlugin - size=16 align=8 - base size=16 base align=8 -QGenericPlugin (0x0x7f5a2547d9c0) 0 - vptr=((& QGenericPlugin::_ZTV14QGenericPlugin) + 16u) - QObject (0x0x7f5a2554ede0) 0 - primary-for QGenericPlugin (0x0x7f5a2547d9c0) - -Class QGenericPluginFactory - size=1 align=1 - base size=0 base align=1 -QGenericPluginFactory (0x0x7f5a2554eea0) 0 empty - -Class QInputMethod::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QInputMethod::QPrivateSignal (0x0x7f5a2554ef60) 0 empty - -Vtable for QInputMethod -QInputMethod::_ZTV12QInputMethod: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QInputMethod) -16 (int (*)(...))QInputMethod::metaObject -24 (int (*)(...))QInputMethod::qt_metacast -32 (int (*)(...))QInputMethod::qt_metacall -40 (int (*)(...))QInputMethod::~QInputMethod -48 (int (*)(...))QInputMethod::~QInputMethod -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QInputMethod - size=16 align=8 - base size=16 base align=8 -QInputMethod (0x0x7f5a2547da28) 0 - vptr=((& QInputMethod::_ZTV12QInputMethod) + 16u) - QObject (0x0x7f5a2554ef00) 0 - primary-for QInputMethod (0x0x7f5a2547da28) - -Class QGuiApplication::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QGuiApplication::QPrivateSignal (0x0x7f5a2525f060) 0 empty - -Vtable for QGuiApplication -QGuiApplication::_ZTV15QGuiApplication: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QGuiApplication) -16 (int (*)(...))QGuiApplication::metaObject -24 (int (*)(...))QGuiApplication::qt_metacast -32 (int (*)(...))QGuiApplication::qt_metacall -40 (int (*)(...))QGuiApplication::~QGuiApplication -48 (int (*)(...))QGuiApplication::~QGuiApplication -56 (int (*)(...))QGuiApplication::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QGuiApplication::notify -120 (int (*)(...))QGuiApplication::compressEvent - -Class QGuiApplication - size=16 align=8 - base size=16 base align=8 -QGuiApplication (0x0x7f5a2547da90) 0 - vptr=((& QGuiApplication::_ZTV15QGuiApplication) + 16u) - QCoreApplication (0x0x7f5a2547daf8) 0 - primary-for QGuiApplication (0x0x7f5a2547da90) - QObject (0x0x7f5a2525f000) 0 - primary-for QCoreApplication (0x0x7f5a2547daf8) - -Class QIconEngine::AvailableSizesArgument - size=16 align=8 - base size=16 base align=8 -QIconEngine::AvailableSizesArgument (0x0x7f5a2525f5a0) 0 - -Class QIconEngine::ScaledPixmapArgument - size=56 align=8 - base size=56 base align=8 -QIconEngine::ScaledPixmapArgument (0x0x7f5a2525f720) 0 - -Vtable for QIconEngine -QIconEngine::_ZTV11QIconEngine: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QIconEngine) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QIconEngine::actualSize -48 (int (*)(...))QIconEngine::pixmap -56 (int (*)(...))QIconEngine::addPixmap -64 (int (*)(...))QIconEngine::addFile -72 (int (*)(...))QIconEngine::key -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))QIconEngine::read -96 (int (*)(...))QIconEngine::write -104 (int (*)(...))QIconEngine::availableSizes -112 (int (*)(...))QIconEngine::iconName -120 (int (*)(...))QIconEngine::virtual_hook - -Class QIconEngine - size=8 align=8 - base size=8 base align=8 -QIconEngine (0x0x7f5a2525f540) 0 nearly-empty - vptr=((& QIconEngine::_ZTV11QIconEngine) + 16u) - -Class QIconEnginePlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIconEnginePlugin::QPrivateSignal (0x0x7f5a2525f7e0) 0 empty - -Vtable for QIconEnginePlugin -QIconEnginePlugin::_ZTV17QIconEnginePlugin: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QIconEnginePlugin) -16 (int (*)(...))QIconEnginePlugin::metaObject -24 (int (*)(...))QIconEnginePlugin::qt_metacast -32 (int (*)(...))QIconEnginePlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QIconEnginePlugin - size=16 align=8 - base size=16 base align=8 -QIconEnginePlugin (0x0x7f5a25294068) 0 - vptr=((& QIconEnginePlugin::_ZTV17QIconEnginePlugin) + 16u) - QObject (0x0x7f5a2525f780) 0 - primary-for QIconEnginePlugin (0x0x7f5a25294068) - -Vtable for QImageIOHandler -QImageIOHandler::_ZTV15QImageIOHandler: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QImageIOHandler) -16 0u -24 0u -32 (int (*)(...))QImageIOHandler::name -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))QImageIOHandler::write -64 (int (*)(...))QImageIOHandler::option -72 (int (*)(...))QImageIOHandler::setOption -80 (int (*)(...))QImageIOHandler::supportsOption -88 (int (*)(...))QImageIOHandler::jumpToNextImage -96 (int (*)(...))QImageIOHandler::jumpToImage -104 (int (*)(...))QImageIOHandler::loopCount -112 (int (*)(...))QImageIOHandler::imageCount -120 (int (*)(...))QImageIOHandler::nextImageDelay -128 (int (*)(...))QImageIOHandler::currentImageNumber -136 (int (*)(...))QImageIOHandler::currentImageRect - -Class QImageIOHandler - size=16 align=8 - base size=16 base align=8 -QImageIOHandler (0x0x7f5a2525f840) 0 - vptr=((& QImageIOHandler::_ZTV15QImageIOHandler) + 16u) - -Class QImageIOPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QImageIOPlugin::QPrivateSignal (0x0x7f5a2525f9c0) 0 empty - -Vtable for QImageIOPlugin -QImageIOPlugin::_ZTV14QImageIOPlugin: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QImageIOPlugin) -16 (int (*)(...))QImageIOPlugin::metaObject -24 (int (*)(...))QImageIOPlugin::qt_metacast -32 (int (*)(...))QImageIOPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QImageIOPlugin - size=16 align=8 - base size=16 base align=8 -QImageIOPlugin (0x0x7f5a252940d0) 0 - vptr=((& QImageIOPlugin::_ZTV14QImageIOPlugin) + 16u) - QObject (0x0x7f5a2525f960) 0 - primary-for QImageIOPlugin (0x0x7f5a252940d0) - -Class QImageReader - size=8 align=8 - base size=8 base align=8 -QImageReader (0x0x7f5a2525fba0) 0 - -Class QImageWriter - size=8 align=8 - base size=8 base align=8 -QImageWriter (0x0x7f5a2525fc00) 0 - -Class QVector3D - size=12 align=4 - base size=12 base align=4 -QVector3D (0x0x7f5a2525fc60) 0 - -Class QVector4D - size=16 align=4 - base size=16 base align=4 -QVector4D (0x0x7f5a2525ff00) 0 - -Class QQuaternion - size=16 align=4 - base size=16 base align=4 -QQuaternion (0x0x7f5a24fac1e0) 0 - -Class QMatrix4x4 - size=68 align=4 - base size=68 base align=4 -QMatrix4x4 (0x0x7f5a24fac7e0) 0 - -Class QMovie::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QMovie::QPrivateSignal (0x0x7f5a24facf60) 0 empty - -Vtable for QMovie -QMovie::_ZTV6QMovie: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6QMovie) -16 (int (*)(...))QMovie::metaObject -24 (int (*)(...))QMovie::qt_metacast -32 (int (*)(...))QMovie::qt_metacall -40 (int (*)(...))QMovie::~QMovie -48 (int (*)(...))QMovie::~QMovie -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QMovie - size=16 align=8 - base size=16 base align=8 -QMovie (0x0x7f5a250b42d8) 0 - vptr=((& QMovie::_ZTV6QMovie) + 16u) - QObject (0x0x7f5a24facf00) 0 - primary-for QMovie (0x0x7f5a250b42d8) - -Class QOffscreenSurface::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOffscreenSurface::QPrivateSignal (0x0x7f5a24db60c0) 0 empty - -Vtable for QOffscreenSurface -QOffscreenSurface::_ZTV17QOffscreenSurface: 26u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QOffscreenSurface) -16 (int (*)(...))QOffscreenSurface::metaObject -24 (int (*)(...))QOffscreenSurface::qt_metacast -32 (int (*)(...))QOffscreenSurface::qt_metacall -40 (int (*)(...))QOffscreenSurface::~QOffscreenSurface -48 (int (*)(...))QOffscreenSurface::~QOffscreenSurface -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QOffscreenSurface::surfaceType -120 (int (*)(...))QOffscreenSurface::format -128 (int (*)(...))QOffscreenSurface::size -136 (int (*)(...))QOffscreenSurface::surfaceHandle -144 (int (*)(...))-16 -152 (int (*)(...))(& _ZTI17QOffscreenSurface) -160 (int (*)(...))QOffscreenSurface::_ZThn16_N17QOffscreenSurfaceD1Ev -168 (int (*)(...))QOffscreenSurface::_ZThn16_N17QOffscreenSurfaceD0Ev -176 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface6formatEv -184 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface13surfaceHandleEv -192 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface11surfaceTypeEv -200 (int (*)(...))QOffscreenSurface::_ZThn16_NK17QOffscreenSurface4sizeEv - -Class QOffscreenSurface - size=40 align=8 - base size=40 base align=8 -QOffscreenSurface (0x0x7f5a25175b60) 0 - vptr=((& QOffscreenSurface::_ZTV17QOffscreenSurface) + 16u) - QObject (0x0x7f5a24db6000) 0 - primary-for QOffscreenSurface (0x0x7f5a25175b60) - QSurface (0x0x7f5a24db6060) 16 - vptr=((& QOffscreenSurface::_ZTV17QOffscreenSurface) + 160u) - -Class QOpenGLBuffer - size=8 align=8 - base size=8 base align=8 -QOpenGLBuffer (0x0x7f5a24db6180) 0 - -Class QOpenGLVersionStatus - size=12 align=4 - base size=12 base align=4 -QOpenGLVersionStatus (0x0x7f5a24db6360) 0 - -Class QOpenGLVersionFunctionsBackend - size=16 align=8 - base size=12 base align=8 -QOpenGLVersionFunctionsBackend (0x0x7f5a24b1be40) 0 - -Class QOpenGLVersionFunctionsStorage - size=8 align=8 - base size=8 base align=8 -QOpenGLVersionFunctionsStorage (0x0x7f5a24b1bea0) 0 - -Class QAbstractOpenGLFunctionsPrivate - size=16 align=8 - base size=9 base align=8 -QAbstractOpenGLFunctionsPrivate (0x0x7f5a24b1bf00) 0 - -Vtable for QAbstractOpenGLFunctions -QAbstractOpenGLFunctions::_ZTV24QAbstractOpenGLFunctions: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QAbstractOpenGLFunctions) -16 (int (*)(...))QAbstractOpenGLFunctions::~QAbstractOpenGLFunctions -24 (int (*)(...))QAbstractOpenGLFunctions::~QAbstractOpenGLFunctions -32 (int (*)(...))QAbstractOpenGLFunctions::initializeOpenGLFunctions - -Class QAbstractOpenGLFunctions - size=16 align=8 - base size=16 base align=8 -QAbstractOpenGLFunctions (0x0x7f5a24b1bf60) 0 - vptr=((& QAbstractOpenGLFunctions::_ZTV24QAbstractOpenGLFunctions) + 16u) - -Class QOpenGLFunctions_1_0_CoreBackend::Functions - size=384 align=8 - base size=384 base align=8 -QOpenGLFunctions_1_0_CoreBackend::Functions (0x0x7f5a24b67060) 0 - -Class QOpenGLFunctions_1_0_CoreBackend - size=400 align=8 - base size=400 base align=8 -QOpenGLFunctions_1_0_CoreBackend (0x0x7f5a24b3f548) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67000) 0 - -Class QOpenGLFunctions_1_1_CoreBackend::Functions - size=128 align=8 - base size=128 base align=8 -QOpenGLFunctions_1_1_CoreBackend::Functions (0x0x7f5a24b67180) 0 - -Class QOpenGLFunctions_1_1_CoreBackend - size=144 align=8 - base size=144 base align=8 -QOpenGLFunctions_1_1_CoreBackend (0x0x7f5a24b3f5b0) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67120) 0 - -Class QOpenGLFunctions_1_2_CoreBackend::Functions - size=48 align=8 - base size=48 base align=8 -QOpenGLFunctions_1_2_CoreBackend::Functions (0x0x7f5a24b672a0) 0 - -Class QOpenGLFunctions_1_2_CoreBackend - size=64 align=8 - base size=64 base align=8 -QOpenGLFunctions_1_2_CoreBackend (0x0x7f5a24b3f618) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67240) 0 - -Class QOpenGLFunctions_1_3_CoreBackend::Functions - size=72 align=8 - base size=72 base align=8 -QOpenGLFunctions_1_3_CoreBackend::Functions (0x0x7f5a24b673c0) 0 - -Class QOpenGLFunctions_1_3_CoreBackend - size=88 align=8 - base size=88 base align=8 -QOpenGLFunctions_1_3_CoreBackend (0x0x7f5a24b3f680) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67360) 0 - -Class QOpenGLFunctions_1_4_CoreBackend::Functions - size=56 align=8 - base size=56 base align=8 -QOpenGLFunctions_1_4_CoreBackend::Functions (0x0x7f5a24b67540) 0 - -Class QOpenGLFunctions_1_4_CoreBackend - size=72 align=8 - base size=72 base align=8 -QOpenGLFunctions_1_4_CoreBackend (0x0x7f5a24b3f6e8) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b674e0) 0 - -Class QOpenGLFunctions_1_5_CoreBackend::Functions - size=152 align=8 - base size=152 base align=8 -QOpenGLFunctions_1_5_CoreBackend::Functions (0x0x7f5a24b67660) 0 - -Class QOpenGLFunctions_1_5_CoreBackend - size=168 align=8 - base size=168 base align=8 -QOpenGLFunctions_1_5_CoreBackend (0x0x7f5a24b3f750) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67600) 0 - -Class QOpenGLFunctions_2_0_CoreBackend::Functions - size=744 align=8 - base size=744 base align=8 -QOpenGLFunctions_2_0_CoreBackend::Functions (0x0x7f5a24b67780) 0 - -Class QOpenGLFunctions_2_0_CoreBackend - size=760 align=8 - base size=760 base align=8 -QOpenGLFunctions_2_0_CoreBackend (0x0x7f5a24b3f7b8) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67720) 0 - -Class QOpenGLFunctions_2_1_CoreBackend::Functions - size=48 align=8 - base size=48 base align=8 -QOpenGLFunctions_2_1_CoreBackend::Functions (0x0x7f5a24b678a0) 0 - -Class QOpenGLFunctions_2_1_CoreBackend - size=64 align=8 - base size=64 base align=8 -QOpenGLFunctions_2_1_CoreBackend (0x0x7f5a24b3f820) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67840) 0 - -Class QOpenGLFunctions_3_0_CoreBackend::Functions - size=672 align=8 - base size=672 base align=8 -QOpenGLFunctions_3_0_CoreBackend::Functions (0x0x7f5a24b679c0) 0 - -Class QOpenGLFunctions_3_0_CoreBackend - size=688 align=8 - base size=688 base align=8 -QOpenGLFunctions_3_0_CoreBackend (0x0x7f5a24b3f888) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67960) 0 - -Class QOpenGLFunctions_3_1_CoreBackend::Functions - size=96 align=8 - base size=96 base align=8 -QOpenGLFunctions_3_1_CoreBackend::Functions (0x0x7f5a24b67ae0) 0 - -Class QOpenGLFunctions_3_1_CoreBackend - size=112 align=8 - base size=112 base align=8 -QOpenGLFunctions_3_1_CoreBackend (0x0x7f5a24b3f8f0) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67a80) 0 - -Class QOpenGLFunctions_3_2_CoreBackend::Functions - size=152 align=8 - base size=152 base align=8 -QOpenGLFunctions_3_2_CoreBackend::Functions (0x0x7f5a24b67c00) 0 - -Class QOpenGLFunctions_3_2_CoreBackend - size=168 align=8 - base size=168 base align=8 -QOpenGLFunctions_3_2_CoreBackend (0x0x7f5a24b3f958) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67ba0) 0 - -Class QOpenGLFunctions_3_3_CoreBackend::Functions - size=464 align=8 - base size=464 base align=8 -QOpenGLFunctions_3_3_CoreBackend::Functions (0x0x7f5a24b67d20) 0 - -Class QOpenGLFunctions_3_3_CoreBackend - size=480 align=8 - base size=480 base align=8 -QOpenGLFunctions_3_3_CoreBackend (0x0x7f5a24b3f9c0) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67cc0) 0 - -Class QOpenGLFunctions_4_0_CoreBackend::Functions - size=368 align=8 - base size=368 base align=8 -QOpenGLFunctions_4_0_CoreBackend::Functions (0x0x7f5a24b67e40) 0 - -Class QOpenGLFunctions_4_0_CoreBackend - size=384 align=8 - base size=384 base align=8 -QOpenGLFunctions_4_0_CoreBackend (0x0x7f5a24b3fa28) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67de0) 0 - -Class QOpenGLFunctions_4_1_CoreBackend::Functions - size=704 align=8 - base size=704 base align=8 -QOpenGLFunctions_4_1_CoreBackend::Functions (0x0x7f5a24b67f60) 0 - -Class QOpenGLFunctions_4_1_CoreBackend - size=720 align=8 - base size=720 base align=8 -QOpenGLFunctions_4_1_CoreBackend (0x0x7f5a24b3fa90) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a24b67f00) 0 - -Class QOpenGLFunctions_4_2_CoreBackend::Functions - size=96 align=8 - base size=96 base align=8 -QOpenGLFunctions_4_2_CoreBackend::Functions (0x0x7f5a2485e0c0) 0 - -Class QOpenGLFunctions_4_2_CoreBackend - size=112 align=8 - base size=112 base align=8 -QOpenGLFunctions_4_2_CoreBackend (0x0x7f5a24b3faf8) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485e060) 0 - -Class QOpenGLFunctions_4_3_CoreBackend::Functions - size=344 align=8 - base size=344 base align=8 -QOpenGLFunctions_4_3_CoreBackend::Functions (0x0x7f5a2485e1e0) 0 - -Class QOpenGLFunctions_4_3_CoreBackend - size=360 align=8 - base size=360 base align=8 -QOpenGLFunctions_4_3_CoreBackend (0x0x7f5a24b3fb60) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485e180) 0 - -Class QOpenGLFunctions_4_4_CoreBackend::Functions - size=72 align=8 - base size=72 base align=8 -QOpenGLFunctions_4_4_CoreBackend::Functions (0x0x7f5a2485e300) 0 - -Class QOpenGLFunctions_4_4_CoreBackend - size=88 align=8 - base size=88 base align=8 -QOpenGLFunctions_4_4_CoreBackend (0x0x7f5a24b3fbc8) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485e2a0) 0 - -Class QOpenGLFunctions_4_5_CoreBackend::Functions - size=848 align=8 - base size=848 base align=8 -QOpenGLFunctions_4_5_CoreBackend::Functions (0x0x7f5a2485e480) 0 - -Class QOpenGLFunctions_4_5_CoreBackend - size=864 align=8 - base size=864 base align=8 -QOpenGLFunctions_4_5_CoreBackend (0x0x7f5a24b3fc30) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485e420) 0 - -Class QOpenGLFunctions_1_0_DeprecatedBackend::Functions - size=2064 align=8 - base size=2064 base align=8 -QOpenGLFunctions_1_0_DeprecatedBackend::Functions (0x0x7f5a2485e5a0) 0 - -Class QOpenGLFunctions_1_0_DeprecatedBackend - size=2080 align=8 - base size=2080 base align=8 -QOpenGLFunctions_1_0_DeprecatedBackend (0x0x7f5a24b3fc98) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485e540) 0 - -Class QOpenGLFunctions_1_1_DeprecatedBackend::Functions - size=136 align=8 - base size=136 base align=8 -QOpenGLFunctions_1_1_DeprecatedBackend::Functions (0x0x7f5a2485e6c0) 0 - -Class QOpenGLFunctions_1_1_DeprecatedBackend - size=152 align=8 - base size=152 base align=8 -QOpenGLFunctions_1_1_DeprecatedBackend (0x0x7f5a24b3fd00) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485e660) 0 - -Class QOpenGLFunctions_1_2_DeprecatedBackend::Functions - size=256 align=8 - base size=256 base align=8 -QOpenGLFunctions_1_2_DeprecatedBackend::Functions (0x0x7f5a2485e7e0) 0 - -Class QOpenGLFunctions_1_2_DeprecatedBackend - size=272 align=8 - base size=272 base align=8 -QOpenGLFunctions_1_2_DeprecatedBackend (0x0x7f5a24b3fd68) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485e780) 0 - -Class QOpenGLFunctions_1_3_DeprecatedBackend::Functions - size=296 align=8 - base size=296 base align=8 -QOpenGLFunctions_1_3_DeprecatedBackend::Functions (0x0x7f5a2485e900) 0 - -Class QOpenGLFunctions_1_3_DeprecatedBackend - size=312 align=8 - base size=312 base align=8 -QOpenGLFunctions_1_3_DeprecatedBackend (0x0x7f5a24b3fdd0) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485e8a0) 0 - -Class QOpenGLFunctions_1_4_DeprecatedBackend::Functions - size=304 align=8 - base size=304 base align=8 -QOpenGLFunctions_1_4_DeprecatedBackend::Functions (0x0x7f5a2485ea20) 0 - -Class QOpenGLFunctions_1_4_DeprecatedBackend - size=320 align=8 - base size=320 base align=8 -QOpenGLFunctions_1_4_DeprecatedBackend (0x0x7f5a24b3fe38) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485e9c0) 0 - -Class QOpenGLFunctions_2_0_DeprecatedBackend::Functions - size=288 align=8 - base size=288 base align=8 -QOpenGLFunctions_2_0_DeprecatedBackend::Functions (0x0x7f5a2485eb40) 0 - -Class QOpenGLFunctions_2_0_DeprecatedBackend - size=304 align=8 - base size=304 base align=8 -QOpenGLFunctions_2_0_DeprecatedBackend (0x0x7f5a24b3fea0) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485eae0) 0 - -Class QOpenGLFunctions_3_0_DeprecatedBackend::Functions - size=160 align=8 - base size=160 base align=8 -QOpenGLFunctions_3_0_DeprecatedBackend::Functions (0x0x7f5a2485ec60) 0 - -Class QOpenGLFunctions_3_0_DeprecatedBackend - size=176 align=8 - base size=176 base align=8 -QOpenGLFunctions_3_0_DeprecatedBackend (0x0x7f5a24b3ff08) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485ec00) 0 - -Class QOpenGLFunctions_3_3_DeprecatedBackend::Functions - size=240 align=8 - base size=240 base align=8 -QOpenGLFunctions_3_3_DeprecatedBackend::Functions (0x0x7f5a2485ed80) 0 - -Class QOpenGLFunctions_3_3_DeprecatedBackend - size=256 align=8 - base size=256 base align=8 -QOpenGLFunctions_3_3_DeprecatedBackend (0x0x7f5a24b3ff70) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485ed20) 0 - -Class QOpenGLFunctions_4_5_DeprecatedBackend::Functions - size=96 align=8 - base size=96 base align=8 -QOpenGLFunctions_4_5_DeprecatedBackend::Functions (0x0x7f5a2485eea0) 0 - -Class QOpenGLFunctions_4_5_DeprecatedBackend - size=112 align=8 - base size=112 base align=8 -QOpenGLFunctions_4_5_DeprecatedBackend (0x0x7f5a24972000) 0 - QOpenGLVersionFunctionsBackend (0x0x7f5a2485ee40) 0 - -Class QOpenGLVersionProfile - size=8 align=8 - base size=8 base align=8 -QOpenGLVersionProfile (0x0x7f5a2485ef60) 0 - -Class QOpenGLContextGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLContextGroup::QPrivateSignal (0x0x7f5a2498c960) 0 empty - -Vtable for QOpenGLContextGroup -QOpenGLContextGroup::_ZTV19QOpenGLContextGroup: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QOpenGLContextGroup) -16 (int (*)(...))QOpenGLContextGroup::metaObject -24 (int (*)(...))QOpenGLContextGroup::qt_metacast -32 (int (*)(...))QOpenGLContextGroup::qt_metacall -40 (int (*)(...))QOpenGLContextGroup::~QOpenGLContextGroup -48 (int (*)(...))QOpenGLContextGroup::~QOpenGLContextGroup -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLContextGroup - size=16 align=8 - base size=16 base align=8 -QOpenGLContextGroup (0x0x7f5a24972a28) 0 - vptr=((& QOpenGLContextGroup::_ZTV19QOpenGLContextGroup) + 16u) - QObject (0x0x7f5a2498c900) 0 - primary-for QOpenGLContextGroup (0x0x7f5a24972a28) - -Class QOpenGLContext::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLContext::QPrivateSignal (0x0x7f5a2498ca20) 0 empty - -Vtable for QOpenGLContext -QOpenGLContext::_ZTV14QOpenGLContext: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QOpenGLContext) -16 (int (*)(...))QOpenGLContext::metaObject -24 (int (*)(...))QOpenGLContext::qt_metacast -32 (int (*)(...))QOpenGLContext::qt_metacall -40 (int (*)(...))QOpenGLContext::~QOpenGLContext -48 (int (*)(...))QOpenGLContext::~QOpenGLContext -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLContext - size=16 align=8 - base size=16 base align=8 -QOpenGLContext (0x0x7f5a24972a90) 0 - vptr=((& QOpenGLContext::_ZTV14QOpenGLContext) + 16u) - QObject (0x0x7f5a2498c9c0) 0 - primary-for QOpenGLContext (0x0x7f5a24972a90) - -Class QOpenGLDebugMessage - size=8 align=8 - base size=8 base align=8 -QOpenGLDebugMessage (0x0x7f5a2498ca80) 0 - -Class QOpenGLDebugLogger::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLDebugLogger::QPrivateSignal (0x0x7f5a2461d2a0) 0 empty - -Vtable for QOpenGLDebugLogger -QOpenGLDebugLogger::_ZTV18QOpenGLDebugLogger: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QOpenGLDebugLogger) -16 (int (*)(...))QOpenGLDebugLogger::metaObject -24 (int (*)(...))QOpenGLDebugLogger::qt_metacast -32 (int (*)(...))QOpenGLDebugLogger::qt_metacall -40 (int (*)(...))QOpenGLDebugLogger::~QOpenGLDebugLogger -48 (int (*)(...))QOpenGLDebugLogger::~QOpenGLDebugLogger -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLDebugLogger - size=16 align=8 - base size=16 base align=8 -QOpenGLDebugLogger (0x0x7f5a24972f08) 0 - vptr=((& QOpenGLDebugLogger::_ZTV18QOpenGLDebugLogger) + 16u) - QObject (0x0x7f5a2461d240) 0 - primary-for QOpenGLDebugLogger (0x0x7f5a24972f08) - -Class QOpenGLFunctions - size=8 align=8 - base size=8 base align=8 -QOpenGLFunctions (0x0x7f5a2461d420) 0 - -Class QOpenGLFunctionsPrivate::Functions - size=1152 align=8 - base size=1152 base align=8 -QOpenGLFunctionsPrivate::Functions (0x0x7f5a2461d660) 0 - -Class QOpenGLFunctionsPrivate - size=1152 align=8 - base size=1152 base align=8 -QOpenGLFunctionsPrivate (0x0x7f5a2461d600) 0 - -Class QOpenGLExtraFunctions - size=8 align=8 - base size=8 base align=8 -QOpenGLExtraFunctions (0x0x7f5a246e61a0) 0 - QOpenGLFunctions (0x0x7f5a243efd80) 0 - -Class QOpenGLExtraFunctionsPrivate::Functions - size=1728 align=8 - base size=1728 base align=8 -QOpenGLExtraFunctionsPrivate::Functions (0x0x7f5a243efe40) 0 - -Class QOpenGLExtraFunctionsPrivate - size=2880 align=8 - base size=2880 base align=8 -QOpenGLExtraFunctionsPrivate (0x0x7f5a246e6208) 0 - QOpenGLFunctionsPrivate (0x0x7f5a243efde0) 0 - -Vtable for QOpenGLFramebufferObject -QOpenGLFramebufferObject::_ZTV24QOpenGLFramebufferObject: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QOpenGLFramebufferObject) -16 (int (*)(...))QOpenGLFramebufferObject::~QOpenGLFramebufferObject -24 (int (*)(...))QOpenGLFramebufferObject::~QOpenGLFramebufferObject - -Class QOpenGLFramebufferObject - size=16 align=8 - base size=16 base align=8 -QOpenGLFramebufferObject (0x0x7f5a2425a540) 0 - vptr=((& QOpenGLFramebufferObject::_ZTV24QOpenGLFramebufferObject) + 16u) - -Class QOpenGLFramebufferObjectFormat - size=8 align=8 - base size=8 base align=8 -QOpenGLFramebufferObjectFormat (0x0x7f5a2425a660) 0 - -Vtable for QOpenGLPaintDevice -QOpenGLPaintDevice::_ZTV18QOpenGLPaintDevice: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QOpenGLPaintDevice) -16 (int (*)(...))QOpenGLPaintDevice::~QOpenGLPaintDevice -24 (int (*)(...))QOpenGLPaintDevice::~QOpenGLPaintDevice -32 (int (*)(...))QOpenGLPaintDevice::devType -40 (int (*)(...))QOpenGLPaintDevice::paintEngine -48 (int (*)(...))QOpenGLPaintDevice::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter -80 (int (*)(...))QOpenGLPaintDevice::ensureActiveTarget - -Class QOpenGLPaintDevice - size=32 align=8 - base size=32 base align=8 -QOpenGLPaintDevice (0x0x7f5a246e64e0) 0 - vptr=((& QOpenGLPaintDevice::_ZTV18QOpenGLPaintDevice) + 16u) - QPaintDevice (0x0x7f5a2425a6c0) 0 - primary-for QOpenGLPaintDevice (0x0x7f5a246e64e0) - -Class QOpenGLPixelTransferOptions - size=8 align=8 - base size=8 base align=8 -QOpenGLPixelTransferOptions (0x0x7f5a2425a7e0) 0 - -Class QOpenGLShader::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLShader::QPrivateSignal (0x0x7f5a2425ab40) 0 empty - -Vtable for QOpenGLShader -QOpenGLShader::_ZTV13QOpenGLShader: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QOpenGLShader) -16 (int (*)(...))QOpenGLShader::metaObject -24 (int (*)(...))QOpenGLShader::qt_metacast -32 (int (*)(...))QOpenGLShader::qt_metacall -40 (int (*)(...))QOpenGLShader::~QOpenGLShader -48 (int (*)(...))QOpenGLShader::~QOpenGLShader -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLShader - size=16 align=8 - base size=16 base align=8 -QOpenGLShader (0x0x7f5a246e66e8) 0 - vptr=((& QOpenGLShader::_ZTV13QOpenGLShader) + 16u) - QObject (0x0x7f5a2425aae0) 0 - primary-for QOpenGLShader (0x0x7f5a246e66e8) - -Class QOpenGLShaderProgram::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLShaderProgram::QPrivateSignal (0x0x7f5a2425ad80) 0 empty - -Vtable for QOpenGLShaderProgram -QOpenGLShaderProgram::_ZTV20QOpenGLShaderProgram: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QOpenGLShaderProgram) -16 (int (*)(...))QOpenGLShaderProgram::metaObject -24 (int (*)(...))QOpenGLShaderProgram::qt_metacast -32 (int (*)(...))QOpenGLShaderProgram::qt_metacall -40 (int (*)(...))QOpenGLShaderProgram::~QOpenGLShaderProgram -48 (int (*)(...))QOpenGLShaderProgram::~QOpenGLShaderProgram -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QOpenGLShaderProgram::link - -Class QOpenGLShaderProgram - size=16 align=8 - base size=16 base align=8 -QOpenGLShaderProgram (0x0x7f5a246e6820) 0 - vptr=((& QOpenGLShaderProgram::_ZTV20QOpenGLShaderProgram) + 16u) - QObject (0x0x7f5a2425ad20) 0 - primary-for QOpenGLShaderProgram (0x0x7f5a246e6820) - -Class QOpenGLTexture - size=8 align=8 - base size=8 base align=8 -QOpenGLTexture (0x0x7f5a2425ade0) 0 - -Class QOpenGLTextureBlitter - size=8 align=8 - base size=8 base align=8 -QOpenGLTextureBlitter (0x0x7f5a23fce0c0) 0 - -Class QOpenGLTimerQuery::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLTimerQuery::QPrivateSignal (0x0x7f5a23fce240) 0 empty - -Vtable for QOpenGLTimerQuery -QOpenGLTimerQuery::_ZTV17QOpenGLTimerQuery: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QOpenGLTimerQuery) -16 (int (*)(...))QOpenGLTimerQuery::metaObject -24 (int (*)(...))QOpenGLTimerQuery::qt_metacast -32 (int (*)(...))QOpenGLTimerQuery::qt_metacall -40 (int (*)(...))QOpenGLTimerQuery::~QOpenGLTimerQuery -48 (int (*)(...))QOpenGLTimerQuery::~QOpenGLTimerQuery -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLTimerQuery - size=16 align=8 - base size=16 base align=8 -QOpenGLTimerQuery (0x0x7f5a246e6958) 0 - vptr=((& QOpenGLTimerQuery::_ZTV17QOpenGLTimerQuery) + 16u) - QObject (0x0x7f5a23fce1e0) 0 - primary-for QOpenGLTimerQuery (0x0x7f5a246e6958) - -Class QOpenGLTimeMonitor::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLTimeMonitor::QPrivateSignal (0x0x7f5a23fce300) 0 empty - -Vtable for QOpenGLTimeMonitor -QOpenGLTimeMonitor::_ZTV18QOpenGLTimeMonitor: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QOpenGLTimeMonitor) -16 (int (*)(...))QOpenGLTimeMonitor::metaObject -24 (int (*)(...))QOpenGLTimeMonitor::qt_metacast -32 (int (*)(...))QOpenGLTimeMonitor::qt_metacall -40 (int (*)(...))QOpenGLTimeMonitor::~QOpenGLTimeMonitor -48 (int (*)(...))QOpenGLTimeMonitor::~QOpenGLTimeMonitor -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLTimeMonitor - size=16 align=8 - base size=16 base align=8 -QOpenGLTimeMonitor (0x0x7f5a246e69c0) 0 - vptr=((& QOpenGLTimeMonitor::_ZTV18QOpenGLTimeMonitor) + 16u) - QObject (0x0x7f5a23fce2a0) 0 - primary-for QOpenGLTimeMonitor (0x0x7f5a246e69c0) - -Class QOpenGLVertexArrayObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLVertexArrayObject::QPrivateSignal (0x0x7f5a23fce3c0) 0 empty - -Class QOpenGLVertexArrayObject::Binder - size=8 align=8 - base size=8 base align=8 -QOpenGLVertexArrayObject::Binder (0x0x7f5a23fce420) 0 - -Vtable for QOpenGLVertexArrayObject -QOpenGLVertexArrayObject::_ZTV24QOpenGLVertexArrayObject: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QOpenGLVertexArrayObject) -16 (int (*)(...))QOpenGLVertexArrayObject::metaObject -24 (int (*)(...))QOpenGLVertexArrayObject::qt_metacast -32 (int (*)(...))QOpenGLVertexArrayObject::qt_metacall -40 (int (*)(...))QOpenGLVertexArrayObject::~QOpenGLVertexArrayObject -48 (int (*)(...))QOpenGLVertexArrayObject::~QOpenGLVertexArrayObject -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QOpenGLVertexArrayObject - size=16 align=8 - base size=16 base align=8 -QOpenGLVertexArrayObject (0x0x7f5a246e6a28) 0 - vptr=((& QOpenGLVertexArrayObject::_ZTV24QOpenGLVertexArrayObject) + 16u) - QObject (0x0x7f5a23fce360) 0 - primary-for QOpenGLVertexArrayObject (0x0x7f5a246e6a28) - -Class QPaintDeviceWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPaintDeviceWindow::QPrivateSignal (0x0x7f5a23fce5a0) 0 empty - -Vtable for QPaintDeviceWindow -QPaintDeviceWindow::_ZTV18QPaintDeviceWindow: 58u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QPaintDeviceWindow) -16 (int (*)(...))QPaintDeviceWindow::metaObject -24 (int (*)(...))QPaintDeviceWindow::qt_metacast -32 (int (*)(...))QPaintDeviceWindow::qt_metacall -40 (int (*)(...))QPaintDeviceWindow::~QPaintDeviceWindow -48 (int (*)(...))QPaintDeviceWindow::~QPaintDeviceWindow -56 (int (*)(...))QPaintDeviceWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QPaintDeviceWindow::exposeEvent -160 (int (*)(...))QWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))QPaintDeviceWindow::paintEvent -304 (int (*)(...))QPaintDeviceWindow::metric -312 (int (*)(...))QPaintDeviceWindow::paintEngine -320 (int (*)(...))-16 -328 (int (*)(...))(& _ZTI18QPaintDeviceWindow) -336 (int (*)(...))QPaintDeviceWindow::_ZThn16_N18QPaintDeviceWindowD1Ev -344 (int (*)(...))QPaintDeviceWindow::_ZThn16_N18QPaintDeviceWindowD0Ev -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -360 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -368 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -376 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv -384 (int (*)(...))-40 -392 (int (*)(...))(& _ZTI18QPaintDeviceWindow) -400 (int (*)(...))QPaintDeviceWindow::_ZThn40_N18QPaintDeviceWindowD1Ev -408 (int (*)(...))QPaintDeviceWindow::_ZThn40_N18QPaintDeviceWindowD0Ev -416 (int (*)(...))QPaintDevice::devType -424 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow11paintEngineEv -432 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow6metricEN12QPaintDevice17PaintDeviceMetricE -440 (int (*)(...))QPaintDevice::initPainter -448 (int (*)(...))QPaintDevice::redirected -456 (int (*)(...))QPaintDevice::sharedPainter - -Class QPaintDeviceWindow - size=64 align=8 - base size=64 base align=8 -QPaintDeviceWindow (0x0x7f5a24036a80) 0 - vptr=((& QPaintDeviceWindow::_ZTV18QPaintDeviceWindow) + 16u) - QWindow (0x0x7f5a24036af0) 0 - primary-for QPaintDeviceWindow (0x0x7f5a24036a80) - QObject (0x0x7f5a23fce480) 0 - primary-for QWindow (0x0x7f5a24036af0) - QSurface (0x0x7f5a23fce4e0) 16 - vptr=((& QPaintDeviceWindow::_ZTV18QPaintDeviceWindow) + 336u) - QPaintDevice (0x0x7f5a23fce540) 40 - vptr=((& QPaintDeviceWindow::_ZTV18QPaintDeviceWindow) + 400u) - -Class QOpenGLWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QOpenGLWindow::QPrivateSignal (0x0x7f5a23fce720) 0 empty - -Vtable for QOpenGLWindow -QOpenGLWindow::_ZTV13QOpenGLWindow: 64u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QOpenGLWindow) -16 (int (*)(...))QOpenGLWindow::metaObject -24 (int (*)(...))QOpenGLWindow::qt_metacast -32 (int (*)(...))QOpenGLWindow::qt_metacall -40 (int (*)(...))QOpenGLWindow::~QOpenGLWindow -48 (int (*)(...))QOpenGLWindow::~QOpenGLWindow -56 (int (*)(...))QPaintDeviceWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QPaintDeviceWindow::exposeEvent -160 (int (*)(...))QOpenGLWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))QOpenGLWindow::paintEvent -304 (int (*)(...))QOpenGLWindow::metric -312 (int (*)(...))QPaintDeviceWindow::paintEngine -320 (int (*)(...))QOpenGLWindow::initializeGL -328 (int (*)(...))QOpenGLWindow::resizeGL -336 (int (*)(...))QOpenGLWindow::paintGL -344 (int (*)(...))QOpenGLWindow::paintUnderGL -352 (int (*)(...))QOpenGLWindow::paintOverGL -360 (int (*)(...))QOpenGLWindow::redirected -368 (int (*)(...))-16 -376 (int (*)(...))(& _ZTI13QOpenGLWindow) -384 (int (*)(...))QOpenGLWindow::_ZThn16_N13QOpenGLWindowD1Ev -392 (int (*)(...))QOpenGLWindow::_ZThn16_N13QOpenGLWindowD0Ev -400 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -408 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -416 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -424 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv -432 (int (*)(...))-40 -440 (int (*)(...))(& _ZTI13QOpenGLWindow) -448 (int (*)(...))QOpenGLWindow::_ZThn40_N13QOpenGLWindowD1Ev -456 (int (*)(...))QOpenGLWindow::_ZThn40_N13QOpenGLWindowD0Ev -464 (int (*)(...))QPaintDevice::devType -472 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow11paintEngineEv -480 (int (*)(...))QOpenGLWindow::_ZThn40_NK13QOpenGLWindow6metricEN12QPaintDevice17PaintDeviceMetricE -488 (int (*)(...))QPaintDevice::initPainter -496 (int (*)(...))QOpenGLWindow::_ZThn40_NK13QOpenGLWindow10redirectedEP6QPoint -504 (int (*)(...))QPaintDevice::sharedPainter - -Class QOpenGLWindow - size=64 align=8 - base size=64 base align=8 -QOpenGLWindow (0x0x7f5a246e6af8) 0 - vptr=((& QOpenGLWindow::_ZTV13QOpenGLWindow) + 16u) - QPaintDeviceWindow (0x0x7f5a24036e70) 0 - primary-for QOpenGLWindow (0x0x7f5a246e6af8) - QWindow (0x0x7f5a24036ee0) 0 - primary-for QPaintDeviceWindow (0x0x7f5a24036e70) - QObject (0x0x7f5a23fce600) 0 - primary-for QWindow (0x0x7f5a24036ee0) - QSurface (0x0x7f5a23fce660) 16 - vptr=((& QOpenGLWindow::_ZTV13QOpenGLWindow) + 384u) - QPaintDevice (0x0x7f5a23fce6c0) 40 - vptr=((& QOpenGLWindow::_ZTV13QOpenGLWindow) + 448u) - -Class QPageSize - size=8 align=8 - base size=8 base align=8 -QPageSize (0x0x7f5a23fce780) 0 - -Class QPageLayout - size=8 align=8 - base size=8 base align=8 -QPageLayout (0x0x7f5a240b3180) 0 - -Class QPagedPaintDevice::Margins - size=32 align=8 - base size=32 base align=8 -QPagedPaintDevice::Margins (0x0x7f5a240b3ba0) 0 - -Vtable for QPagedPaintDevice -QPagedPaintDevice::_ZTV17QPagedPaintDevice: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QPagedPaintDevice) -16 0u -24 0u -32 (int (*)(...))QPaintDevice::devType -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QPaintDevice::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))QPagedPaintDevice::setPageSize -96 (int (*)(...))QPagedPaintDevice::setPageSizeMM -104 (int (*)(...))QPagedPaintDevice::setMargins - -Class QPagedPaintDevice - size=32 align=8 - base size=32 base align=8 -QPagedPaintDevice (0x0x7f5a240a0820) 0 - vptr=((& QPagedPaintDevice::_ZTV17QPagedPaintDevice) + 16u) - QPaintDevice (0x0x7f5a240b3b40) 0 - primary-for QPagedPaintDevice (0x0x7f5a240a0820) - -Class QPainter::PixmapFragment - size=80 align=8 - base size=80 base align=8 -QPainter::PixmapFragment (0x0x7f5a240b3c60) 0 - -Class QPainter - size=8 align=8 - base size=8 base align=8 -QPainter (0x0x7f5a240b3c00) 0 - -Class QTextItem - size=1 align=1 - base size=0 base align=1 -QTextItem (0x0x7f5a23da7a80) 0 empty - -Vtable for QPaintEngine -QPaintEngine::_ZTV12QPaintEngine: 24u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QPaintEngine) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))QPaintEngine::drawRects -64 (int (*)(...))QPaintEngine::drawRects -72 (int (*)(...))QPaintEngine::drawLines -80 (int (*)(...))QPaintEngine::drawLines -88 (int (*)(...))QPaintEngine::drawEllipse -96 (int (*)(...))QPaintEngine::drawEllipse -104 (int (*)(...))QPaintEngine::drawPath -112 (int (*)(...))QPaintEngine::drawPoints -120 (int (*)(...))QPaintEngine::drawPoints -128 (int (*)(...))QPaintEngine::drawPolygon -136 (int (*)(...))QPaintEngine::drawPolygon -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))QPaintEngine::drawTextItem -160 (int (*)(...))QPaintEngine::drawTiledPixmap -168 (int (*)(...))QPaintEngine::drawImage -176 (int (*)(...))QPaintEngine::coordinateOffset -184 (int (*)(...))__cxa_pure_virtual - -Class QPaintEngine - size=32 align=8 - base size=32 base align=8 -QPaintEngine (0x0x7f5a23da7d20) 0 - vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 16u) - -Class QPaintEngineState - size=4 align=4 - base size=4 base align=4 -QPaintEngineState (0x0x7f5a23f73000) 0 - -Class QPdfWriter::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPdfWriter::QPrivateSignal (0x0x7f5a23f73420) 0 empty - -Vtable for QPdfWriter -QPdfWriter::_ZTV10QPdfWriter: 34u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QPdfWriter) -16 (int (*)(...))QPdfWriter::metaObject -24 (int (*)(...))QPdfWriter::qt_metacast -32 (int (*)(...))QPdfWriter::qt_metacall -40 (int (*)(...))QPdfWriter::~QPdfWriter -48 (int (*)(...))QPdfWriter::~QPdfWriter -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QPdfWriter::newPage -120 (int (*)(...))QPdfWriter::setPageSize -128 (int (*)(...))QPdfWriter::setPageSizeMM -136 (int (*)(...))QPdfWriter::setMargins -144 (int (*)(...))QPdfWriter::paintEngine -152 (int (*)(...))QPdfWriter::metric -160 (int (*)(...))-16 -168 (int (*)(...))(& _ZTI10QPdfWriter) -176 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriterD1Ev -184 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriterD0Ev -192 (int (*)(...))QPaintDevice::devType -200 (int (*)(...))QPdfWriter::_ZThn16_NK10QPdfWriter11paintEngineEv -208 (int (*)(...))QPdfWriter::_ZThn16_NK10QPdfWriter6metricEN12QPaintDevice17PaintDeviceMetricE -216 (int (*)(...))QPaintDevice::initPainter -224 (int (*)(...))QPaintDevice::redirected -232 (int (*)(...))QPaintDevice::sharedPainter -240 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter7newPageEv -248 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter11setPageSizeEN17QPagedPaintDevice8PageSizeE -256 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter13setPageSizeMMERK6QSizeF -264 (int (*)(...))QPdfWriter::_ZThn16_N10QPdfWriter10setMarginsERKN17QPagedPaintDevice7MarginsE - -Class QPdfWriter - size=48 align=8 - base size=48 base align=8 -QPdfWriter (0x0x7f5a23bb3e00) 0 - vptr=((& QPdfWriter::_ZTV10QPdfWriter) + 16u) - QObject (0x0x7f5a23f73360) 0 - primary-for QPdfWriter (0x0x7f5a23bb3e00) - QPagedPaintDevice (0x0x7f5a23f02888) 16 - vptr=((& QPdfWriter::_ZTV10QPdfWriter) + 176u) - QPaintDevice (0x0x7f5a23f733c0) 16 - primary-for QPagedPaintDevice (0x0x7f5a23f02888) - -Vtable for QPicture -QPicture::_ZTV8QPicture: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI8QPicture) -16 (int (*)(...))QPicture::~QPicture -24 (int (*)(...))QPicture::~QPicture -32 (int (*)(...))QPicture::devType -40 (int (*)(...))QPicture::paintEngine -48 (int (*)(...))QPicture::metric -56 (int (*)(...))QPaintDevice::initPainter -64 (int (*)(...))QPaintDevice::redirected -72 (int (*)(...))QPaintDevice::sharedPainter -80 (int (*)(...))QPicture::setData - -Class QPicture - size=32 align=8 - base size=32 base align=8 -QPicture (0x0x7f5a23f028f0) 0 - vptr=((& QPicture::_ZTV8QPicture) + 16u) - QPaintDevice (0x0x7f5a23f735a0) 0 - primary-for QPicture (0x0x7f5a23f028f0) - -Class QPictureIO - size=8 align=8 - base size=8 base align=8 -QPictureIO (0x0x7f5a23f738a0) 0 - -Class QPictureFormatPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QPictureFormatPlugin::QPrivateSignal (0x0x7f5a23f73960) 0 empty - -Vtable for QPictureFormatPlugin -QPictureFormatPlugin::_ZTV20QPictureFormatPlugin: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QPictureFormatPlugin) -16 (int (*)(...))QPictureFormatPlugin::metaObject -24 (int (*)(...))QPictureFormatPlugin::qt_metacast -32 (int (*)(...))QPictureFormatPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QPictureFormatPlugin::loadPicture -120 (int (*)(...))QPictureFormatPlugin::savePicture -128 (int (*)(...))__cxa_pure_virtual - -Class QPictureFormatPlugin - size=16 align=8 - base size=16 base align=8 -QPictureFormatPlugin (0x0x7f5a23f02af8) 0 - vptr=((& QPictureFormatPlugin::_ZTV20QPictureFormatPlugin) + 16u) - QObject (0x0x7f5a23f73900) 0 - primary-for QPictureFormatPlugin (0x0x7f5a23f02af8) - -Class QPixmapCache::Key - size=8 align=8 - base size=8 base align=8 -QPixmapCache::Key (0x0x7f5a23f73a20) 0 - -Class QPixmapCache - size=1 align=1 - base size=0 base align=1 -QPixmapCache (0x0x7f5a23f739c0) 0 empty - -Class QRasterWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QRasterWindow::QPrivateSignal (0x0x7f5a23cb4ba0) 0 empty - -Vtable for QRasterWindow -QRasterWindow::_ZTV13QRasterWindow: 59u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QRasterWindow) -16 (int (*)(...))QRasterWindow::metaObject -24 (int (*)(...))QRasterWindow::qt_metacast -32 (int (*)(...))QRasterWindow::qt_metacall -40 (int (*)(...))QRasterWindow::~QRasterWindow -48 (int (*)(...))QRasterWindow::~QRasterWindow -56 (int (*)(...))QPaintDeviceWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QWindow::accessibleRoot -144 (int (*)(...))QWindow::focusObject -152 (int (*)(...))QPaintDeviceWindow::exposeEvent -160 (int (*)(...))QWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QWindow::focusInEvent -184 (int (*)(...))QWindow::focusOutEvent -192 (int (*)(...))QWindow::showEvent -200 (int (*)(...))QWindow::hideEvent -208 (int (*)(...))QWindow::keyPressEvent -216 (int (*)(...))QWindow::keyReleaseEvent -224 (int (*)(...))QWindow::mousePressEvent -232 (int (*)(...))QWindow::mouseReleaseEvent -240 (int (*)(...))QWindow::mouseDoubleClickEvent -248 (int (*)(...))QWindow::mouseMoveEvent -256 (int (*)(...))QWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))QPaintDeviceWindow::paintEvent -304 (int (*)(...))QRasterWindow::metric -312 (int (*)(...))QPaintDeviceWindow::paintEngine -320 (int (*)(...))QRasterWindow::redirected -328 (int (*)(...))-16 -336 (int (*)(...))(& _ZTI13QRasterWindow) -344 (int (*)(...))QRasterWindow::_ZThn16_N13QRasterWindowD1Ev -352 (int (*)(...))QRasterWindow::_ZThn16_N13QRasterWindowD0Ev -360 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -368 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -376 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -384 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv -392 (int (*)(...))-40 -400 (int (*)(...))(& _ZTI13QRasterWindow) -408 (int (*)(...))QRasterWindow::_ZThn40_N13QRasterWindowD1Ev -416 (int (*)(...))QRasterWindow::_ZThn40_N13QRasterWindowD0Ev -424 (int (*)(...))QPaintDevice::devType -432 (int (*)(...))QPaintDeviceWindow::_ZThn40_NK18QPaintDeviceWindow11paintEngineEv -440 (int (*)(...))QRasterWindow::_ZThn40_NK13QRasterWindow6metricEN12QPaintDevice17PaintDeviceMetricE -448 (int (*)(...))QPaintDevice::initPainter -456 (int (*)(...))QRasterWindow::_ZThn40_NK13QRasterWindow10redirectedEP6QPoint -464 (int (*)(...))QPaintDevice::sharedPainter - -Class QRasterWindow - size=64 align=8 - base size=64 base align=8 -QRasterWindow (0x0x7f5a23cc1208) 0 - vptr=((& QRasterWindow::_ZTV13QRasterWindow) + 16u) - QPaintDeviceWindow (0x0x7f5a23cbbbd0) 0 - primary-for QRasterWindow (0x0x7f5a23cc1208) - QWindow (0x0x7f5a23cbbc40) 0 - primary-for QPaintDeviceWindow (0x0x7f5a23cbbbd0) - QObject (0x0x7f5a23cb4a80) 0 - primary-for QWindow (0x0x7f5a23cbbc40) - QSurface (0x0x7f5a23cb4ae0) 16 - vptr=((& QRasterWindow::_ZTV13QRasterWindow) + 344u) - QPaintDevice (0x0x7f5a23cb4b40) 40 - vptr=((& QRasterWindow::_ZTV13QRasterWindow) + 408u) - -Class QScreen::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QScreen::QPrivateSignal (0x0x7f5a23cb4c60) 0 empty - -Vtable for QScreen -QScreen::_ZTV7QScreen: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QScreen) -16 (int (*)(...))QScreen::metaObject -24 (int (*)(...))QScreen::qt_metacast -32 (int (*)(...))QScreen::qt_metacall -40 (int (*)(...))QScreen::~QScreen -48 (int (*)(...))QScreen::~QScreen -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QScreen - size=16 align=8 - base size=16 base align=8 -QScreen (0x0x7f5a23cc12d8) 0 - vptr=((& QScreen::_ZTV7QScreen) + 16u) - QObject (0x0x7f5a23cb4c00) 0 - primary-for QScreen (0x0x7f5a23cc12d8) - -Class QSessionManager::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSessionManager::QPrivateSignal (0x0x7f5a23cb4d20) 0 empty - -Vtable for QSessionManager -QSessionManager::_ZTV15QSessionManager: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QSessionManager) -16 (int (*)(...))QSessionManager::metaObject -24 (int (*)(...))QSessionManager::qt_metacast -32 (int (*)(...))QSessionManager::qt_metacall -40 (int (*)(...))QSessionManager::~QSessionManager -48 (int (*)(...))QSessionManager::~QSessionManager -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSessionManager - size=16 align=8 - base size=16 base align=8 -QSessionManager (0x0x7f5a23cc1340) 0 - vptr=((& QSessionManager::_ZTV15QSessionManager) + 16u) - QObject (0x0x7f5a23cb4cc0) 0 - primary-for QSessionManager (0x0x7f5a23cc1340) - -Vtable for QStandardItem -QStandardItem::_ZTV13QStandardItem: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QStandardItem) -16 (int (*)(...))QStandardItem::~QStandardItem -24 (int (*)(...))QStandardItem::~QStandardItem -32 (int (*)(...))QStandardItem::data -40 (int (*)(...))QStandardItem::setData -48 (int (*)(...))QStandardItem::clone -56 (int (*)(...))QStandardItem::type -64 (int (*)(...))QStandardItem::read -72 (int (*)(...))QStandardItem::write -80 (int (*)(...))QStandardItem::operator< - -Class QStandardItem - size=16 align=8 - base size=16 base align=8 -QStandardItem (0x0x7f5a23cb4d80) 0 - vptr=((& QStandardItem::_ZTV13QStandardItem) + 16u) - -Class QStandardItemModel::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStandardItemModel::QPrivateSignal (0x0x7f5a23d524e0) 0 empty - -Vtable for QStandardItemModel -QStandardItemModel::_ZTV18QStandardItemModel: 48u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QStandardItemModel) -16 (int (*)(...))QStandardItemModel::metaObject -24 (int (*)(...))QStandardItemModel::qt_metacast -32 (int (*)(...))QStandardItemModel::qt_metacall -40 (int (*)(...))QStandardItemModel::~QStandardItemModel -48 (int (*)(...))QStandardItemModel::~QStandardItemModel -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QStandardItemModel::index -120 (int (*)(...))QStandardItemModel::parent -128 (int (*)(...))QStandardItemModel::sibling -136 (int (*)(...))QStandardItemModel::rowCount -144 (int (*)(...))QStandardItemModel::columnCount -152 (int (*)(...))QStandardItemModel::hasChildren -160 (int (*)(...))QStandardItemModel::data -168 (int (*)(...))QStandardItemModel::setData -176 (int (*)(...))QStandardItemModel::headerData -184 (int (*)(...))QStandardItemModel::setHeaderData -192 (int (*)(...))QStandardItemModel::itemData -200 (int (*)(...))QStandardItemModel::setItemData -208 (int (*)(...))QStandardItemModel::mimeTypes -216 (int (*)(...))QStandardItemModel::mimeData -224 (int (*)(...))QAbstractItemModel::canDropMimeData -232 (int (*)(...))QStandardItemModel::dropMimeData -240 (int (*)(...))QStandardItemModel::supportedDropActions -248 (int (*)(...))QAbstractItemModel::supportedDragActions -256 (int (*)(...))QStandardItemModel::insertRows -264 (int (*)(...))QStandardItemModel::insertColumns -272 (int (*)(...))QStandardItemModel::removeRows -280 (int (*)(...))QStandardItemModel::removeColumns -288 (int (*)(...))QAbstractItemModel::moveRows -296 (int (*)(...))QAbstractItemModel::moveColumns -304 (int (*)(...))QAbstractItemModel::fetchMore -312 (int (*)(...))QAbstractItemModel::canFetchMore -320 (int (*)(...))QStandardItemModel::flags -328 (int (*)(...))QStandardItemModel::sort -336 (int (*)(...))QAbstractItemModel::buddy -344 (int (*)(...))QAbstractItemModel::match -352 (int (*)(...))QAbstractItemModel::span -360 (int (*)(...))QAbstractItemModel::roleNames -368 (int (*)(...))QAbstractItemModel::submit -376 (int (*)(...))QAbstractItemModel::revert - -Class QStandardItemModel - size=16 align=8 - base size=16 base align=8 -QStandardItemModel (0x0x7f5a23cc19c0) 0 - vptr=((& QStandardItemModel::_ZTV18QStandardItemModel) + 16u) - QAbstractItemModel (0x0x7f5a23cc1a28) 0 - primary-for QStandardItemModel (0x0x7f5a23cc19c0) - QObject (0x0x7f5a23d52480) 0 - primary-for QAbstractItemModel (0x0x7f5a23cc1a28) - -Class QStaticText - size=8 align=8 - base size=8 base align=8 -QStaticText (0x0x7f5a23d52540) 0 - -Class QStyleHints::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QStyleHints::QPrivateSignal (0x0x7f5a23d529c0) 0 empty - -Vtable for QStyleHints -QStyleHints::_ZTV11QStyleHints: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QStyleHints) -16 (int (*)(...))QStyleHints::metaObject -24 (int (*)(...))QStyleHints::qt_metacast -32 (int (*)(...))QStyleHints::qt_metacall -40 (int (*)(...))QStyleHints::~QStyleHints -48 (int (*)(...))QStyleHints::~QStyleHints -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QStyleHints - size=16 align=8 - base size=16 base align=8 -QStyleHints (0x0x7f5a23cc1c30) 0 - vptr=((& QStyleHints::_ZTV11QStyleHints) + 16u) - QObject (0x0x7f5a23d52960) 0 - primary-for QStyleHints (0x0x7f5a23cc1c30) - -Class QTextObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextObject::QPrivateSignal (0x0x7f5a23d52a80) 0 empty - -Vtable for QTextObject -QTextObject::_ZTV11QTextObject: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QTextObject) -16 (int (*)(...))QTextObject::metaObject -24 (int (*)(...))QTextObject::qt_metacast -32 (int (*)(...))QTextObject::qt_metacall -40 (int (*)(...))QTextObject::~QTextObject -48 (int (*)(...))QTextObject::~QTextObject -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTextObject - size=16 align=8 - base size=16 base align=8 -QTextObject (0x0x7f5a23cc1c98) 0 - vptr=((& QTextObject::_ZTV11QTextObject) + 16u) - QObject (0x0x7f5a23d52a20) 0 - primary-for QTextObject (0x0x7f5a23cc1c98) - -Class QTextBlockGroup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextBlockGroup::QPrivateSignal (0x0x7f5a23d52b40) 0 empty - -Vtable for QTextBlockGroup -QTextBlockGroup::_ZTV15QTextBlockGroup: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QTextBlockGroup) -16 (int (*)(...))QTextBlockGroup::metaObject -24 (int (*)(...))QTextBlockGroup::qt_metacast -32 (int (*)(...))QTextBlockGroup::qt_metacall -40 (int (*)(...))QTextBlockGroup::~QTextBlockGroup -48 (int (*)(...))QTextBlockGroup::~QTextBlockGroup -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTextBlockGroup::blockInserted -120 (int (*)(...))QTextBlockGroup::blockRemoved -128 (int (*)(...))QTextBlockGroup::blockFormatChanged - -Class QTextBlockGroup - size=16 align=8 - base size=16 base align=8 -QTextBlockGroup (0x0x7f5a23cc1d00) 0 - vptr=((& QTextBlockGroup::_ZTV15QTextBlockGroup) + 16u) - QTextObject (0x0x7f5a23cc1d68) 0 - primary-for QTextBlockGroup (0x0x7f5a23cc1d00) - QObject (0x0x7f5a23d52ae0) 0 - primary-for QTextObject (0x0x7f5a23cc1d68) - -Vtable for QTextFrameLayoutData -QTextFrameLayoutData::_ZTV20QTextFrameLayoutData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QTextFrameLayoutData) -16 (int (*)(...))QTextFrameLayoutData::~QTextFrameLayoutData -24 (int (*)(...))QTextFrameLayoutData::~QTextFrameLayoutData - -Class QTextFrameLayoutData - size=8 align=8 - base size=8 base align=8 -QTextFrameLayoutData (0x0x7f5a23d52ba0) 0 nearly-empty - vptr=((& QTextFrameLayoutData::_ZTV20QTextFrameLayoutData) + 16u) - -Class QTextFrame::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextFrame::QPrivateSignal (0x0x7f5a23d52c60) 0 empty - -Class QTextFrame::iterator - size=32 align=8 - base size=28 base align=8 -QTextFrame::iterator (0x0x7f5a23d52cc0) 0 - -Vtable for QTextFrame -QTextFrame::_ZTV10QTextFrame: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTextFrame) -16 (int (*)(...))QTextFrame::metaObject -24 (int (*)(...))QTextFrame::qt_metacast -32 (int (*)(...))QTextFrame::qt_metacall -40 (int (*)(...))QTextFrame::~QTextFrame -48 (int (*)(...))QTextFrame::~QTextFrame -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTextFrame - size=16 align=8 - base size=16 base align=8 -QTextFrame (0x0x7f5a23cc1dd0) 0 - vptr=((& QTextFrame::_ZTV10QTextFrame) + 16u) - QTextObject (0x0x7f5a23cc1e38) 0 - primary-for QTextFrame (0x0x7f5a23cc1dd0) - QObject (0x0x7f5a23d52c00) 0 - primary-for QTextObject (0x0x7f5a23cc1e38) - -Vtable for QTextBlockUserData -QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QTextBlockUserData) -16 (int (*)(...))QTextBlockUserData::~QTextBlockUserData -24 (int (*)(...))QTextBlockUserData::~QTextBlockUserData - -Class QTextBlockUserData - size=8 align=8 - base size=8 base align=8 -QTextBlockUserData (0x0x7f5a23d52f60) 0 nearly-empty - vptr=((& QTextBlockUserData::_ZTV18QTextBlockUserData) + 16u) - -Class QTextBlock::iterator - size=24 align=8 - base size=20 base align=8 -QTextBlock::iterator (0x0x7f5a23a9d060) 0 - -Class QTextBlock - size=16 align=8 - base size=12 base align=8 -QTextBlock (0x0x7f5a23a9d000) 0 - -Class QTextFragment - size=16 align=8 - base size=16 base align=8 -QTextFragment (0x0x7f5a23a9d540) 0 - -Class QSyntaxHighlighter::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSyntaxHighlighter::QPrivateSignal (0x0x7f5a23a9d840) 0 empty - -Vtable for QSyntaxHighlighter -QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QSyntaxHighlighter) -16 (int (*)(...))QSyntaxHighlighter::metaObject -24 (int (*)(...))QSyntaxHighlighter::qt_metacast -32 (int (*)(...))QSyntaxHighlighter::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QSyntaxHighlighter - size=16 align=8 - base size=16 base align=8 -QSyntaxHighlighter (0x0x7f5a23a97548) 0 - vptr=((& QSyntaxHighlighter::_ZTV18QSyntaxHighlighter) + 16u) - QObject (0x0x7f5a23a9d7e0) 0 - primary-for QSyntaxHighlighter (0x0x7f5a23a97548) - -Class QTextDocumentFragment - size=8 align=8 - base size=8 base align=8 -QTextDocumentFragment (0x0x7f5a23a9d8a0) 0 - -Class QTextDocumentWriter - size=8 align=8 - base size=8 base align=8 -QTextDocumentWriter (0x0x7f5a23a9d900) 0 - -Class QTextList::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextList::QPrivateSignal (0x0x7f5a23a9d9c0) 0 empty - -Vtable for QTextList -QTextList::_ZTV9QTextList: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QTextList) -16 (int (*)(...))QTextList::metaObject -24 (int (*)(...))QTextList::qt_metacast -32 (int (*)(...))QTextList::qt_metacall -40 (int (*)(...))QTextList::~QTextList -48 (int (*)(...))QTextList::~QTextList -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTextBlockGroup::blockInserted -120 (int (*)(...))QTextBlockGroup::blockRemoved -128 (int (*)(...))QTextBlockGroup::blockFormatChanged - -Class QTextList - size=16 align=8 - base size=16 base align=8 -QTextList (0x0x7f5a23a975b0) 0 - vptr=((& QTextList::_ZTV9QTextList) + 16u) - QTextBlockGroup (0x0x7f5a23a97618) 0 - primary-for QTextList (0x0x7f5a23a975b0) - QTextObject (0x0x7f5a23a97680) 0 - primary-for QTextBlockGroup (0x0x7f5a23a97618) - QObject (0x0x7f5a23a9d960) 0 - primary-for QTextObject (0x0x7f5a23a97680) - -Class QTextTableCell - size=16 align=8 - base size=12 base align=8 -QTextTableCell (0x0x7f5a23a9da20) 0 - -Class QTextTable::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTextTable::QPrivateSignal (0x0x7f5a23a9dae0) 0 empty - -Vtable for QTextTable -QTextTable::_ZTV10QTextTable: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTextTable) -16 (int (*)(...))QTextTable::metaObject -24 (int (*)(...))QTextTable::qt_metacast -32 (int (*)(...))QTextTable::qt_metacall -40 (int (*)(...))QTextTable::~QTextTable -48 (int (*)(...))QTextTable::~QTextTable -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QTextTable - size=16 align=8 - base size=16 base align=8 -QTextTable (0x0x7f5a23a976e8) 0 - vptr=((& QTextTable::_ZTV10QTextTable) + 16u) - QTextFrame (0x0x7f5a23a97750) 0 - primary-for QTextTable (0x0x7f5a23a976e8) - QTextObject (0x0x7f5a23a977b8) 0 - primary-for QTextFrame (0x0x7f5a23a97750) - QObject (0x0x7f5a23a9da80) 0 - primary-for QTextObject (0x0x7f5a23a977b8) - -Class QValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QValidator::QPrivateSignal (0x0x7f5a23a9dba0) 0 empty - -Vtable for QValidator -QValidator::_ZTV10QValidator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QValidator) -16 (int (*)(...))QValidator::metaObject -24 (int (*)(...))QValidator::qt_metacast -32 (int (*)(...))QValidator::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QValidator::fixup - -Class QValidator - size=16 align=8 - base size=16 base align=8 -QValidator (0x0x7f5a23a97820) 0 - vptr=((& QValidator::_ZTV10QValidator) + 16u) - QObject (0x0x7f5a23a9db40) 0 - primary-for QValidator (0x0x7f5a23a97820) - -Class QIntValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QIntValidator::QPrivateSignal (0x0x7f5a23a9dc60) 0 empty - -Vtable for QIntValidator -QIntValidator::_ZTV13QIntValidator: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QIntValidator) -16 (int (*)(...))QIntValidator::metaObject -24 (int (*)(...))QIntValidator::qt_metacast -32 (int (*)(...))QIntValidator::qt_metacall -40 (int (*)(...))QIntValidator::~QIntValidator -48 (int (*)(...))QIntValidator::~QIntValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QIntValidator::validate -120 (int (*)(...))QIntValidator::fixup -128 (int (*)(...))QIntValidator::setRange - -Class QIntValidator - size=24 align=8 - base size=24 base align=8 -QIntValidator (0x0x7f5a23a97888) 0 - vptr=((& QIntValidator::_ZTV13QIntValidator) + 16u) - QValidator (0x0x7f5a23a978f0) 0 - primary-for QIntValidator (0x0x7f5a23a97888) - QObject (0x0x7f5a23a9dc00) 0 - primary-for QValidator (0x0x7f5a23a978f0) - -Class QDoubleValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QDoubleValidator::QPrivateSignal (0x0x7f5a23a9dd20) 0 empty - -Vtable for QDoubleValidator -QDoubleValidator::_ZTV16QDoubleValidator: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QDoubleValidator) -16 (int (*)(...))QDoubleValidator::metaObject -24 (int (*)(...))QDoubleValidator::qt_metacast -32 (int (*)(...))QDoubleValidator::qt_metacall -40 (int (*)(...))QDoubleValidator::~QDoubleValidator -48 (int (*)(...))QDoubleValidator::~QDoubleValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QDoubleValidator::validate -120 (int (*)(...))QValidator::fixup -128 (int (*)(...))QDoubleValidator::setRange - -Class QDoubleValidator - size=40 align=8 - base size=36 base align=8 -QDoubleValidator (0x0x7f5a23a97958) 0 - vptr=((& QDoubleValidator::_ZTV16QDoubleValidator) + 16u) - QValidator (0x0x7f5a23a979c0) 0 - primary-for QDoubleValidator (0x0x7f5a23a97958) - QObject (0x0x7f5a23a9dcc0) 0 - primary-for QValidator (0x0x7f5a23a979c0) - -Class QRegExpValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QRegExpValidator::QPrivateSignal (0x0x7f5a23a9de40) 0 empty - -Vtable for QRegExpValidator -QRegExpValidator::_ZTV16QRegExpValidator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QRegExpValidator) -16 (int (*)(...))QRegExpValidator::metaObject -24 (int (*)(...))QRegExpValidator::qt_metacast -32 (int (*)(...))QRegExpValidator::qt_metacall -40 (int (*)(...))QRegExpValidator::~QRegExpValidator -48 (int (*)(...))QRegExpValidator::~QRegExpValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QRegExpValidator::validate -120 (int (*)(...))QValidator::fixup - -Class QRegExpValidator - size=24 align=8 - base size=24 base align=8 -QRegExpValidator (0x0x7f5a23a97a28) 0 - vptr=((& QRegExpValidator::_ZTV16QRegExpValidator) + 16u) - QValidator (0x0x7f5a23a97a90) 0 - primary-for QRegExpValidator (0x0x7f5a23a97a28) - QObject (0x0x7f5a23a9dde0) 0 - primary-for QValidator (0x0x7f5a23a97a90) - -Class QRegularExpressionValidator::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QRegularExpressionValidator::QPrivateSignal (0x0x7f5a23a9df00) 0 empty - -Vtable for QRegularExpressionValidator -QRegularExpressionValidator::_ZTV27QRegularExpressionValidator: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QRegularExpressionValidator) -16 (int (*)(...))QRegularExpressionValidator::metaObject -24 (int (*)(...))QRegularExpressionValidator::qt_metacast -32 (int (*)(...))QRegularExpressionValidator::qt_metacall -40 (int (*)(...))QRegularExpressionValidator::~QRegularExpressionValidator -48 (int (*)(...))QRegularExpressionValidator::~QRegularExpressionValidator -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QRegularExpressionValidator::validate -120 (int (*)(...))QValidator::fixup - -Class QRegularExpressionValidator - size=16 align=8 - base size=16 base align=8 -QRegularExpressionValidator (0x0x7f5a23a97af8) 0 - vptr=((& QRegularExpressionValidator::_ZTV27QRegularExpressionValidator) + 16u) - QValidator (0x0x7f5a23a97b60) 0 - primary-for QRegularExpressionValidator (0x0x7f5a23a97af8) - QObject (0x0x7f5a23a9dea0) 0 - primary-for QValidator (0x0x7f5a23a97b60) - -Class QNetworkRequest - size=8 align=8 - base size=8 base align=8 -QNetworkRequest (0x0x7f5a23a9df60) 0 - -Class QNetworkCacheMetaData - size=8 align=8 - base size=8 base align=8 -QNetworkCacheMetaData (0x0x7f5a237a94e0) 0 - -Class QAbstractNetworkCache::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractNetworkCache::QPrivateSignal (0x0x7f5a237a9ba0) 0 empty - -Vtable for QAbstractNetworkCache -QAbstractNetworkCache::_ZTV21QAbstractNetworkCache: 22u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QAbstractNetworkCache) -16 (int (*)(...))QAbstractNetworkCache::metaObject -24 (int (*)(...))QAbstractNetworkCache::qt_metacast -32 (int (*)(...))QAbstractNetworkCache::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))__cxa_pure_virtual - -Class QAbstractNetworkCache - size=16 align=8 - base size=16 base align=8 -QAbstractNetworkCache (0x0x7f5a237ee3a8) 0 - vptr=((& QAbstractNetworkCache::_ZTV21QAbstractNetworkCache) + 16u) - QObject (0x0x7f5a237a9b40) 0 - primary-for QAbstractNetworkCache (0x0x7f5a237ee3a8) - -Class QAbstractSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAbstractSocket::QPrivateSignal (0x0x7f5a237a9c60) 0 empty - -Vtable for QAbstractSocket -QAbstractSocket::_ZTV15QAbstractSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QAbstractSocket) -16 (int (*)(...))QAbstractSocket::metaObject -24 (int (*)(...))QAbstractSocket::qt_metacast -32 (int (*)(...))QAbstractSocket::qt_metacall -40 (int (*)(...))QAbstractSocket::~QAbstractSocket -48 (int (*)(...))QAbstractSocket::~QAbstractSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QAbstractSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QAbstractSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QAbstractSocket::bytesAvailable -184 (int (*)(...))QAbstractSocket::bytesToWrite -192 (int (*)(...))QAbstractSocket::canReadLine -200 (int (*)(...))QAbstractSocket::waitForReadyRead -208 (int (*)(...))QAbstractSocket::waitForBytesWritten -216 (int (*)(...))QAbstractSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QAbstractSocket::writeData -240 (int (*)(...))QAbstractSocket::resume -248 (int (*)(...))QAbstractSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QAbstractSocket::disconnectFromHost -272 (int (*)(...))QAbstractSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QAbstractSocket::setSocketDescriptor -296 (int (*)(...))QAbstractSocket::setSocketOption -304 (int (*)(...))QAbstractSocket::socketOption -312 (int (*)(...))QAbstractSocket::waitForConnected -320 (int (*)(...))QAbstractSocket::waitForDisconnected - -Class QAbstractSocket - size=16 align=8 - base size=16 base align=8 -QAbstractSocket (0x0x7f5a237ee410) 0 - vptr=((& QAbstractSocket::_ZTV15QAbstractSocket) + 16u) - QIODevice (0x0x7f5a237ee478) 0 - primary-for QAbstractSocket (0x0x7f5a237ee410) - QObject (0x0x7f5a237a9c00) 0 - primary-for QIODevice (0x0x7f5a237ee478) - -Class QAuthenticator - size=8 align=8 - base size=8 base align=8 -QAuthenticator (0x0x7f5a2389d240) 0 - -Class QDnsDomainNameRecord - size=8 align=8 - base size=8 base align=8 -QDnsDomainNameRecord (0x0x7f5a2389d2a0) 0 - -Class QDnsHostAddressRecord - size=8 align=8 - base size=8 base align=8 -QDnsHostAddressRecord (0x0x7f5a2389d5a0) 0 - -Class QDnsMailExchangeRecord - size=8 align=8 - base size=8 base align=8 -QDnsMailExchangeRecord (0x0x7f5a2389d8a0) 0 - -Class QDnsServiceRecord - size=8 align=8 - base size=8 base align=8 -QDnsServiceRecord (0x0x7f5a2389dba0) 0 - -Class QDnsTextRecord - size=8 align=8 - base size=8 base align=8 -QDnsTextRecord (0x0x7f5a2389dea0) 0 - -Class QDnsLookup::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QDnsLookup::QPrivateSignal (0x0x7f5a2392f240) 0 empty - -Vtable for QDnsLookup -QDnsLookup::_ZTV10QDnsLookup: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QDnsLookup) -16 (int (*)(...))QDnsLookup::metaObject -24 (int (*)(...))QDnsLookup::qt_metacast -32 (int (*)(...))QDnsLookup::qt_metacall -40 (int (*)(...))QDnsLookup::~QDnsLookup -48 (int (*)(...))QDnsLookup::~QDnsLookup -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QDnsLookup - size=16 align=8 - base size=16 base align=8 -QDnsLookup (0x0x7f5a237eeea0) 0 - vptr=((& QDnsLookup::_ZTV10QDnsLookup) + 16u) - QObject (0x0x7f5a2392f1e0) 0 - primary-for QDnsLookup (0x0x7f5a237eeea0) - -Class QTcpSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTcpSocket::QPrivateSignal (0x0x7f5a2392f300) 0 empty - -Vtable for QTcpSocket -QTcpSocket::_ZTV10QTcpSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTcpSocket) -16 (int (*)(...))QTcpSocket::metaObject -24 (int (*)(...))QTcpSocket::qt_metacast -32 (int (*)(...))QTcpSocket::qt_metacall -40 (int (*)(...))QTcpSocket::~QTcpSocket -48 (int (*)(...))QTcpSocket::~QTcpSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QAbstractSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QAbstractSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QAbstractSocket::bytesAvailable -184 (int (*)(...))QAbstractSocket::bytesToWrite -192 (int (*)(...))QAbstractSocket::canReadLine -200 (int (*)(...))QAbstractSocket::waitForReadyRead -208 (int (*)(...))QAbstractSocket::waitForBytesWritten -216 (int (*)(...))QAbstractSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QAbstractSocket::writeData -240 (int (*)(...))QAbstractSocket::resume -248 (int (*)(...))QAbstractSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QAbstractSocket::disconnectFromHost -272 (int (*)(...))QAbstractSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QAbstractSocket::setSocketDescriptor -296 (int (*)(...))QAbstractSocket::setSocketOption -304 (int (*)(...))QAbstractSocket::socketOption -312 (int (*)(...))QAbstractSocket::waitForConnected -320 (int (*)(...))QAbstractSocket::waitForDisconnected - -Class QTcpSocket - size=16 align=8 - base size=16 base align=8 -QTcpSocket (0x0x7f5a237eef08) 0 - vptr=((& QTcpSocket::_ZTV10QTcpSocket) + 16u) - QAbstractSocket (0x0x7f5a237eef70) 0 - primary-for QTcpSocket (0x0x7f5a237eef08) - QIODevice (0x0x7f5a2394e000) 0 - primary-for QAbstractSocket (0x0x7f5a237eef70) - QObject (0x0x7f5a2392f2a0) 0 - primary-for QIODevice (0x0x7f5a2394e000) - -Class QSslCertificate - size=8 align=8 - base size=8 base align=8 -QSslCertificate (0x0x7f5a2392f4e0) 0 - -Class QSslError - size=8 align=8 - base size=8 base align=8 -QSslError (0x0x7f5a2392f900) 0 - -Class QSslSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSslSocket::QPrivateSignal (0x0x7f5a235f72a0) 0 empty - -Vtable for QSslSocket -QSslSocket::_ZTV10QSslSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QSslSocket) -16 (int (*)(...))QSslSocket::metaObject -24 (int (*)(...))QSslSocket::qt_metacast -32 (int (*)(...))QSslSocket::qt_metacall -40 (int (*)(...))QSslSocket::~QSslSocket -48 (int (*)(...))QSslSocket::~QSslSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QSslSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QSslSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QSslSocket::bytesAvailable -184 (int (*)(...))QSslSocket::bytesToWrite -192 (int (*)(...))QSslSocket::canReadLine -200 (int (*)(...))QSslSocket::waitForReadyRead -208 (int (*)(...))QSslSocket::waitForBytesWritten -216 (int (*)(...))QSslSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QSslSocket::writeData -240 (int (*)(...))QSslSocket::resume -248 (int (*)(...))QSslSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QSslSocket::disconnectFromHost -272 (int (*)(...))QSslSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QSslSocket::setSocketDescriptor -296 (int (*)(...))QSslSocket::setSocketOption -304 (int (*)(...))QSslSocket::socketOption -312 (int (*)(...))QSslSocket::waitForConnected -320 (int (*)(...))QSslSocket::waitForDisconnected - -Class QSslSocket - size=16 align=8 - base size=16 base align=8 -QSslSocket (0x0x7f5a2394e9c0) 0 - vptr=((& QSslSocket::_ZTV10QSslSocket) + 16u) - QTcpSocket (0x0x7f5a2394ea28) 0 - primary-for QSslSocket (0x0x7f5a2394e9c0) - QAbstractSocket (0x0x7f5a2394ea90) 0 - primary-for QTcpSocket (0x0x7f5a2394ea28) - QIODevice (0x0x7f5a2394eaf8) 0 - primary-for QAbstractSocket (0x0x7f5a2394ea90) - QObject (0x0x7f5a235f7240) 0 - primary-for QIODevice (0x0x7f5a2394eaf8) - -Class QDtlsClientVerifier::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QDtlsClientVerifier::QPrivateSignal (0x0x7f5a235f7360) 0 empty - -Class QDtlsClientVerifier::GeneratorParameters - size=16 align=8 - base size=16 base align=8 -QDtlsClientVerifier::GeneratorParameters (0x0x7f5a235f73c0) 0 - -Vtable for QDtlsClientVerifier -QDtlsClientVerifier::_ZTV19QDtlsClientVerifier: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QDtlsClientVerifier) -16 (int (*)(...))QDtlsClientVerifier::metaObject -24 (int (*)(...))QDtlsClientVerifier::qt_metacast -32 (int (*)(...))QDtlsClientVerifier::qt_metacall -40 (int (*)(...))QDtlsClientVerifier::~QDtlsClientVerifier -48 (int (*)(...))QDtlsClientVerifier::~QDtlsClientVerifier -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QDtlsClientVerifier - size=16 align=8 - base size=16 base align=8 -QDtlsClientVerifier (0x0x7f5a2394eb60) 0 - vptr=((& QDtlsClientVerifier::_ZTV19QDtlsClientVerifier) + 16u) - QObject (0x0x7f5a235f7300) 0 - primary-for QDtlsClientVerifier (0x0x7f5a2394eb60) - -Class QDtls::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QDtls::QPrivateSignal (0x0x7f5a235f7480) 0 empty - -Vtable for QDtls -QDtls::_ZTV5QDtls: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI5QDtls) -16 (int (*)(...))QDtls::metaObject -24 (int (*)(...))QDtls::qt_metacast -32 (int (*)(...))QDtls::qt_metacall -40 (int (*)(...))QDtls::~QDtls -48 (int (*)(...))QDtls::~QDtls -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QDtls - size=16 align=8 - base size=16 base align=8 -QDtls (0x0x7f5a2394ebc8) 0 - vptr=((& QDtls::_ZTV5QDtls) + 16u) - QObject (0x0x7f5a235f7420) 0 - primary-for QDtls (0x0x7f5a2394ebc8) - -Class QIPv6Address - size=16 align=1 - base size=16 base align=1 -QIPv6Address (0x0x7f5a235f7540) 0 - -Class QHostAddress - size=8 align=8 - base size=8 base align=8 -QHostAddress (0x0x7f5a235f75a0) 0 - -Class QHostInfo - size=8 align=8 - base size=8 base align=8 -QHostInfo (0x0x7f5a235f7d80) 0 - -Class QHstsPolicy - size=8 align=8 - base size=8 base align=8 -QHstsPolicy (0x0x7f5a237132a0) 0 - -Class QHttpPart - size=8 align=8 - base size=8 base align=8 -QHttpPart (0x0x7f5a23713a80) 0 - -Class QHttpMultiPart::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QHttpMultiPart::QPrivateSignal (0x0x7f5a23713de0) 0 empty - -Vtable for QHttpMultiPart -QHttpMultiPart::_ZTV14QHttpMultiPart: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QHttpMultiPart) -16 (int (*)(...))QHttpMultiPart::metaObject -24 (int (*)(...))QHttpMultiPart::qt_metacast -32 (int (*)(...))QHttpMultiPart::qt_metacall -40 (int (*)(...))QHttpMultiPart::~QHttpMultiPart -48 (int (*)(...))QHttpMultiPart::~QHttpMultiPart -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QHttpMultiPart - size=16 align=8 - base size=16 base align=8 -QHttpMultiPart (0x0x7f5a236dae38) 0 - vptr=((& QHttpMultiPart::_ZTV14QHttpMultiPart) + 16u) - QObject (0x0x7f5a23713d80) 0 - primary-for QHttpMultiPart (0x0x7f5a236dae38) - -Class QLocalServer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QLocalServer::QPrivateSignal (0x0x7f5a23713ea0) 0 empty - -Vtable for QLocalServer -QLocalServer::_ZTV12QLocalServer: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QLocalServer) -16 (int (*)(...))QLocalServer::metaObject -24 (int (*)(...))QLocalServer::qt_metacast -32 (int (*)(...))QLocalServer::qt_metacall -40 (int (*)(...))QLocalServer::~QLocalServer -48 (int (*)(...))QLocalServer::~QLocalServer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QLocalServer::hasPendingConnections -120 (int (*)(...))QLocalServer::nextPendingConnection -128 (int (*)(...))QLocalServer::incomingConnection - -Class QLocalServer - size=16 align=8 - base size=16 base align=8 -QLocalServer (0x0x7f5a236daea0) 0 - vptr=((& QLocalServer::_ZTV12QLocalServer) + 16u) - QObject (0x0x7f5a23713e40) 0 - primary-for QLocalServer (0x0x7f5a236daea0) - -Class QLocalSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QLocalSocket::QPrivateSignal (0x0x7f5a233ba120) 0 empty - -Vtable for QLocalSocket -QLocalSocket::_ZTV12QLocalSocket: 30u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QLocalSocket) -16 (int (*)(...))QLocalSocket::metaObject -24 (int (*)(...))QLocalSocket::qt_metacast -32 (int (*)(...))QLocalSocket::qt_metacall -40 (int (*)(...))QLocalSocket::~QLocalSocket -48 (int (*)(...))QLocalSocket::~QLocalSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QLocalSocket::isSequential -120 (int (*)(...))QLocalSocket::open -128 (int (*)(...))QLocalSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QIODevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QLocalSocket::bytesAvailable -184 (int (*)(...))QLocalSocket::bytesToWrite -192 (int (*)(...))QLocalSocket::canReadLine -200 (int (*)(...))QLocalSocket::waitForReadyRead -208 (int (*)(...))QLocalSocket::waitForBytesWritten -216 (int (*)(...))QLocalSocket::readData -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QLocalSocket::writeData - -Class QLocalSocket - size=16 align=8 - base size=16 base align=8 -QLocalSocket (0x0x7f5a233bb068) 0 - vptr=((& QLocalSocket::_ZTV12QLocalSocket) + 16u) - QIODevice (0x0x7f5a233bb0d0) 0 - primary-for QLocalSocket (0x0x7f5a233bb068) - QObject (0x0x7f5a233ba0c0) 0 - primary-for QIODevice (0x0x7f5a233bb0d0) - -Class QSslConfiguration - size=8 align=8 - base size=8 base align=8 -QSslConfiguration (0x0x7f5a233ba180) 0 - -Class QSslPreSharedKeyAuthenticator - size=8 align=8 - base size=8 base align=8 -QSslPreSharedKeyAuthenticator (0x0x7f5a233ba960) 0 - -Class QNetworkAccessManager::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkAccessManager::QPrivateSignal (0x0x7f5a2347e2a0) 0 empty - -Vtable for QNetworkAccessManager -QNetworkAccessManager::_ZTV21QNetworkAccessManager: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QNetworkAccessManager) -16 (int (*)(...))QNetworkAccessManager::metaObject -24 (int (*)(...))QNetworkAccessManager::qt_metacast -32 (int (*)(...))QNetworkAccessManager::qt_metacall -40 (int (*)(...))QNetworkAccessManager::~QNetworkAccessManager -48 (int (*)(...))QNetworkAccessManager::~QNetworkAccessManager -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkAccessManager::createRequest - -Class QNetworkAccessManager - size=16 align=8 - base size=16 base align=8 -QNetworkAccessManager (0x0x7f5a233bbd68) 0 - vptr=((& QNetworkAccessManager::_ZTV21QNetworkAccessManager) + 16u) - QObject (0x0x7f5a2347e240) 0 - primary-for QNetworkAccessManager (0x0x7f5a233bbd68) - -Class QNetworkConfiguration - size=8 align=8 - base size=8 base align=8 -QNetworkConfiguration (0x0x7f5a2347e300) 0 - -Class QNetworkConfigurationManager::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkConfigurationManager::QPrivateSignal (0x0x7f5a2347e780) 0 empty - -Vtable for QNetworkConfigurationManager -QNetworkConfigurationManager::_ZTV28QNetworkConfigurationManager: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI28QNetworkConfigurationManager) -16 (int (*)(...))QNetworkConfigurationManager::metaObject -24 (int (*)(...))QNetworkConfigurationManager::qt_metacast -32 (int (*)(...))QNetworkConfigurationManager::qt_metacall -40 (int (*)(...))QNetworkConfigurationManager::~QNetworkConfigurationManager -48 (int (*)(...))QNetworkConfigurationManager::~QNetworkConfigurationManager -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QNetworkConfigurationManager - size=16 align=8 - base size=16 base align=8 -QNetworkConfigurationManager (0x0x7f5a233bbf70) 0 - vptr=((& QNetworkConfigurationManager::_ZTV28QNetworkConfigurationManager) + 16u) - QObject (0x0x7f5a2347e720) 0 - primary-for QNetworkConfigurationManager (0x0x7f5a233bbf70) - -Class QNetworkCookie - size=8 align=8 - base size=8 base align=8 -QNetworkCookie (0x0x7f5a2347eae0) 0 - -Class QNetworkCookieJar::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkCookieJar::QPrivateSignal (0x0x7f5a23556300) 0 empty - -Vtable for QNetworkCookieJar -QNetworkCookieJar::_ZTV17QNetworkCookieJar: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QNetworkCookieJar) -16 (int (*)(...))QNetworkCookieJar::metaObject -24 (int (*)(...))QNetworkCookieJar::qt_metacast -32 (int (*)(...))QNetworkCookieJar::qt_metacall -40 (int (*)(...))QNetworkCookieJar::~QNetworkCookieJar -48 (int (*)(...))QNetworkCookieJar::~QNetworkCookieJar -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkCookieJar::cookiesForUrl -120 (int (*)(...))QNetworkCookieJar::setCookiesFromUrl -128 (int (*)(...))QNetworkCookieJar::insertCookie -136 (int (*)(...))QNetworkCookieJar::updateCookie -144 (int (*)(...))QNetworkCookieJar::deleteCookie -152 (int (*)(...))QNetworkCookieJar::validateCookie - -Class QNetworkCookieJar - size=16 align=8 - base size=16 base align=8 -QNetworkCookieJar (0x0x7f5a234ec7b8) 0 - vptr=((& QNetworkCookieJar::_ZTV17QNetworkCookieJar) + 16u) - QObject (0x0x7f5a235562a0) 0 - primary-for QNetworkCookieJar (0x0x7f5a234ec7b8) - -Class QNetworkDatagram - size=8 align=8 - base size=8 base align=8 -QNetworkDatagram (0x0x7f5a23556360) 0 - -Class QNetworkDiskCache::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkDiskCache::QPrivateSignal (0x0x7f5a23202360) 0 empty - -Vtable for QNetworkDiskCache -QNetworkDiskCache::_ZTV17QNetworkDiskCache: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QNetworkDiskCache) -16 (int (*)(...))QNetworkDiskCache::metaObject -24 (int (*)(...))QNetworkDiskCache::qt_metacast -32 (int (*)(...))QNetworkDiskCache::qt_metacall -40 (int (*)(...))QNetworkDiskCache::~QNetworkDiskCache -48 (int (*)(...))QNetworkDiskCache::~QNetworkDiskCache -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkDiskCache::metaData -120 (int (*)(...))QNetworkDiskCache::updateMetaData -128 (int (*)(...))QNetworkDiskCache::data -136 (int (*)(...))QNetworkDiskCache::remove -144 (int (*)(...))QNetworkDiskCache::cacheSize -152 (int (*)(...))QNetworkDiskCache::prepare -160 (int (*)(...))QNetworkDiskCache::insert -168 (int (*)(...))QNetworkDiskCache::clear -176 (int (*)(...))QNetworkDiskCache::expire - -Class QNetworkDiskCache - size=16 align=8 - base size=16 base align=8 -QNetworkDiskCache (0x0x7f5a231fc208) 0 - vptr=((& QNetworkDiskCache::_ZTV17QNetworkDiskCache) + 16u) - QAbstractNetworkCache (0x0x7f5a231fc270) 0 - primary-for QNetworkDiskCache (0x0x7f5a231fc208) - QObject (0x0x7f5a23202300) 0 - primary-for QAbstractNetworkCache (0x0x7f5a231fc270) - -Class QNetworkAddressEntry - size=8 align=8 - base size=8 base align=8 -QNetworkAddressEntry (0x0x7f5a232023c0) 0 - -Class QNetworkInterface - size=8 align=8 - base size=8 base align=8 -QNetworkInterface (0x0x7f5a23202a80) 0 - -Class QNetworkProxyQuery - size=8 align=8 - base size=8 base align=8 -QNetworkProxyQuery (0x0x7f5a232ac180) 0 - -Class QNetworkProxy - size=8 align=8 - base size=8 base align=8 -QNetworkProxy (0x0x7f5a232ac7e0) 0 - -Vtable for QNetworkProxyFactory -QNetworkProxyFactory::_ZTV20QNetworkProxyFactory: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QNetworkProxyFactory) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QNetworkProxyFactory - size=8 align=8 - base size=8 base align=8 -QNetworkProxyFactory (0x0x7f5a23345000) 0 nearly-empty - vptr=((& QNetworkProxyFactory::_ZTV20QNetworkProxyFactory) + 16u) - -Class QNetworkReply::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkReply::QPrivateSignal (0x0x7f5a233451e0) 0 empty - -Vtable for QNetworkReply -QNetworkReply::_ZTV13QNetworkReply: 36u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QNetworkReply) -16 (int (*)(...))QNetworkReply::metaObject -24 (int (*)(...))QNetworkReply::qt_metacast -32 (int (*)(...))QNetworkReply::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QNetworkReply::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QNetworkReply::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QIODevice::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QIODevice::bytesAvailable -184 (int (*)(...))QIODevice::bytesToWrite -192 (int (*)(...))QIODevice::canReadLine -200 (int (*)(...))QIODevice::waitForReadyRead -208 (int (*)(...))QIODevice::waitForBytesWritten -216 (int (*)(...))__cxa_pure_virtual -224 (int (*)(...))QIODevice::readLineData -232 (int (*)(...))QNetworkReply::writeData -240 (int (*)(...))QNetworkReply::setReadBufferSize -248 (int (*)(...))__cxa_pure_virtual -256 (int (*)(...))QNetworkReply::ignoreSslErrors -264 (int (*)(...))QNetworkReply::sslConfigurationImplementation -272 (int (*)(...))QNetworkReply::setSslConfigurationImplementation -280 (int (*)(...))QNetworkReply::ignoreSslErrorsImplementation - -Class QNetworkReply - size=16 align=8 - base size=16 base align=8 -QNetworkReply (0x0x7f5a232e18f0) 0 - vptr=((& QNetworkReply::_ZTV13QNetworkReply) + 16u) - QIODevice (0x0x7f5a232e1958) 0 - primary-for QNetworkReply (0x0x7f5a232e18f0) - QObject (0x0x7f5a23345180) 0 - primary-for QIODevice (0x0x7f5a232e1958) - -Class QNetworkSession::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QNetworkSession::QPrivateSignal (0x0x7f5a233453c0) 0 empty - -Vtable for QNetworkSession -QNetworkSession::_ZTV15QNetworkSession: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QNetworkSession) -16 (int (*)(...))QNetworkSession::metaObject -24 (int (*)(...))QNetworkSession::qt_metacast -32 (int (*)(...))QNetworkSession::qt_metacall -40 (int (*)(...))QNetworkSession::~QNetworkSession -48 (int (*)(...))QNetworkSession::~QNetworkSession -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QNetworkSession::connectNotify -104 (int (*)(...))QNetworkSession::disconnectNotify - -Class QNetworkSession - size=24 align=8 - base size=24 base align=8 -QNetworkSession (0x0x7f5a232e19c0) 0 - vptr=((& QNetworkSession::_ZTV15QNetworkSession) + 16u) - QObject (0x0x7f5a23345360) 0 - primary-for QNetworkSession (0x0x7f5a232e19c0) - -Class QTcpServer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QTcpServer::QPrivateSignal (0x0x7f5a23345960) 0 empty - -Vtable for QTcpServer -QTcpServer::_ZTV10QTcpServer: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QTcpServer) -16 (int (*)(...))QTcpServer::metaObject -24 (int (*)(...))QTcpServer::qt_metacast -32 (int (*)(...))QTcpServer::qt_metacall -40 (int (*)(...))QTcpServer::~QTcpServer -48 (int (*)(...))QTcpServer::~QTcpServer -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QTcpServer::hasPendingConnections -120 (int (*)(...))QTcpServer::nextPendingConnection -128 (int (*)(...))QTcpServer::incomingConnection - -Class QTcpServer - size=16 align=8 - base size=16 base align=8 -QTcpServer (0x0x7f5a232e1af8) 0 - vptr=((& QTcpServer::_ZTV10QTcpServer) + 16u) - QObject (0x0x7f5a23345900) 0 - primary-for QTcpServer (0x0x7f5a232e1af8) - -Class QSslCertificateExtension - size=8 align=8 - base size=8 base align=8 -QSslCertificateExtension (0x0x7f5a233459c0) 0 - -Class QSslCipher - size=8 align=8 - base size=8 base align=8 -QSslCipher (0x0x7f5a23345cc0) 0 - -Class QSslDiffieHellmanParameters - size=8 align=8 - base size=8 base align=8 -QSslDiffieHellmanParameters (0x0x7f5a230104e0) 0 - -Class QSslEllipticCurve - size=4 align=4 - base size=4 base align=4 -QSslEllipticCurve (0x0x7f5a230af000) 0 - -Class QSslKey - size=8 align=8 - base size=8 base align=8 -QSslKey (0x0x7f5a230af720) 0 - -Class QUdpSocket::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QUdpSocket::QPrivateSignal (0x0x7f5a230afa80) 0 empty - -Vtable for QUdpSocket -QUdpSocket::_ZTV10QUdpSocket: 41u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QUdpSocket) -16 (int (*)(...))QUdpSocket::metaObject -24 (int (*)(...))QUdpSocket::qt_metacast -32 (int (*)(...))QUdpSocket::qt_metacall -40 (int (*)(...))QUdpSocket::~QUdpSocket -48 (int (*)(...))QUdpSocket::~QUdpSocket -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QAbstractSocket::isSequential -120 (int (*)(...))QIODevice::open -128 (int (*)(...))QAbstractSocket::close -136 (int (*)(...))QIODevice::pos -144 (int (*)(...))QIODevice::size -152 (int (*)(...))QIODevice::seek -160 (int (*)(...))QAbstractSocket::atEnd -168 (int (*)(...))QIODevice::reset -176 (int (*)(...))QAbstractSocket::bytesAvailable -184 (int (*)(...))QAbstractSocket::bytesToWrite -192 (int (*)(...))QAbstractSocket::canReadLine -200 (int (*)(...))QAbstractSocket::waitForReadyRead -208 (int (*)(...))QAbstractSocket::waitForBytesWritten -216 (int (*)(...))QAbstractSocket::readData -224 (int (*)(...))QAbstractSocket::readLineData -232 (int (*)(...))QAbstractSocket::writeData -240 (int (*)(...))QAbstractSocket::resume -248 (int (*)(...))QAbstractSocket::connectToHost -256 (int (*)(...))QAbstractSocket::connectToHost -264 (int (*)(...))QAbstractSocket::disconnectFromHost -272 (int (*)(...))QAbstractSocket::setReadBufferSize -280 (int (*)(...))QAbstractSocket::socketDescriptor -288 (int (*)(...))QAbstractSocket::setSocketDescriptor -296 (int (*)(...))QAbstractSocket::setSocketOption -304 (int (*)(...))QAbstractSocket::socketOption -312 (int (*)(...))QAbstractSocket::waitForConnected -320 (int (*)(...))QAbstractSocket::waitForDisconnected - -Class QUdpSocket - size=16 align=8 - base size=16 base align=8 -QUdpSocket (0x0x7f5a230f00d0) 0 - vptr=((& QUdpSocket::_ZTV10QUdpSocket) + 16u) - QAbstractSocket (0x0x7f5a230f0138) 0 - primary-for QUdpSocket (0x0x7f5a230f00d0) - QIODevice (0x0x7f5a230f01a0) 0 - primary-for QAbstractSocket (0x0x7f5a230f0138) - QObject (0x0x7f5a230afa20) 0 - primary-for QIODevice (0x0x7f5a230f01a0) - -Class QJSValue - size=8 align=8 - base size=8 base align=8 -QJSValue (0x0x7f5a230afae0) 0 - -Class QQmlDebuggingEnabler - size=1 align=1 - base size=0 base align=1 -QQmlDebuggingEnabler (0x0x7f5a230afd80) 0 empty - -Class QJSEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QJSEngine::QPrivateSignal (0x0x7f5a230afe40) 0 empty - -Vtable for QJSEngine -QJSEngine::_ZTV9QJSEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QJSEngine) -16 (int (*)(...))QJSEngine::metaObject -24 (int (*)(...))QJSEngine::qt_metacast -32 (int (*)(...))QJSEngine::qt_metacall -40 (int (*)(...))QJSEngine::~QJSEngine -48 (int (*)(...))QJSEngine::~QJSEngine -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QJSEngine - size=24 align=8 - base size=24 base align=8 -QJSEngine (0x0x7f5a230f02d8) 0 - vptr=((& QJSEngine::_ZTV9QJSEngine) + 16u) - QObject (0x0x7f5a230afde0) 0 - primary-for QJSEngine (0x0x7f5a230f02d8) - -Class QJSValueIterator - size=8 align=8 - base size=8 base align=8 -QJSValueIterator (0x0x7f5a23182060) 0 - -Class QQmlPrivate::RegisterType - size=128 align=8 - base size=124 base align=8 -QQmlPrivate::RegisterType (0x0x7f5a23182540) 0 - -Class QQmlPrivate::RegisterInterface - size=24 align=8 - base size=24 base align=8 -QQmlPrivate::RegisterInterface (0x0x7f5a231825a0) 0 - -Class QQmlPrivate::RegisterAutoParent - size=16 align=8 - base size=16 base align=8 -QQmlPrivate::RegisterAutoParent (0x0x7f5a23182600) 0 - -Class QQmlPrivate::RegisterSingletonType - size=64 align=8 - base size=64 base align=8 -QQmlPrivate::RegisterSingletonType (0x0x7f5a23182660) 0 - -Class QQmlPrivate::RegisterCompositeType - size=32 align=8 - base size=32 base align=8 -QQmlPrivate::RegisterCompositeType (0x0x7f5a231826c0) 0 - -Class QQmlPrivate::RegisterCompositeSingletonType - size=32 align=8 - base size=32 base align=8 -QQmlPrivate::RegisterCompositeSingletonType (0x0x7f5a23182720) 0 - -Class QQmlPrivate::CachedQmlUnit - size=24 align=8 - base size=24 base align=8 -QQmlPrivate::CachedQmlUnit (0x0x7f5a23182780) 0 - -Class QQmlPrivate::RegisterQmlUnitCacheHook - size=16 align=8 - base size=16 base align=8 -QQmlPrivate::RegisterQmlUnitCacheHook (0x0x7f5a231827e0) 0 - -Vtable for QQmlParserStatus -QQmlParserStatus::_ZTV16QQmlParserStatus: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QQmlParserStatus) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QQmlParserStatus - size=16 align=8 - base size=16 base align=8 -QQmlParserStatus (0x0x7f5a23182840) 0 - vptr=((& QQmlParserStatus::_ZTV16QQmlParserStatus) + 16u) - -Vtable for QQmlPropertyValueSource -QQmlPropertyValueSource::_ZTV23QQmlPropertyValueSource: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QQmlPropertyValueSource) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlPropertyValueSource - size=8 align=8 - base size=8 base align=8 -QQmlPropertyValueSource (0x0x7f5a23182900) 0 nearly-empty - vptr=((& QQmlPropertyValueSource::_ZTV23QQmlPropertyValueSource) + 16u) - -Class QQmlListReference - size=8 align=8 - base size=8 base align=8 -QQmlListReference (0x0x7f5a23182a20) 0 - -Vtable for QQmlAbstractUrlInterceptor -QQmlAbstractUrlInterceptor::_ZTV26QQmlAbstractUrlInterceptor: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI26QQmlAbstractUrlInterceptor) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlAbstractUrlInterceptor - size=8 align=8 - base size=8 base align=8 -QQmlAbstractUrlInterceptor (0x0x7f5a22e880c0) 0 nearly-empty - vptr=((& QQmlAbstractUrlInterceptor::_ZTV26QQmlAbstractUrlInterceptor) + 16u) - -Class QQmlError - size=8 align=8 - base size=8 base align=8 -QQmlError (0x0x7f5a22e88120) 0 - -Vtable for QQmlImageProviderBase -QQmlImageProviderBase::_ZTV21QQmlImageProviderBase: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QQmlImageProviderBase) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QQmlImageProviderBase - size=8 align=8 - base size=8 base align=8 -QQmlImageProviderBase (0x0x7f5a22e883c0) 0 nearly-empty - vptr=((& QQmlImageProviderBase::_ZTV21QQmlImageProviderBase) + 16u) - -Class QQmlEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlEngine::QPrivateSignal (0x0x7f5a22e88600) 0 empty - -Vtable for QQmlEngine -QQmlEngine::_ZTV10QQmlEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QQmlEngine) -16 (int (*)(...))QQmlEngine::metaObject -24 (int (*)(...))QQmlEngine::qt_metacast -32 (int (*)(...))QQmlEngine::qt_metacall -40 (int (*)(...))QQmlEngine::~QQmlEngine -48 (int (*)(...))QQmlEngine::~QQmlEngine -56 (int (*)(...))QQmlEngine::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlEngine - size=24 align=8 - base size=24 base align=8 -QQmlEngine (0x0x7f5a230f08f0) 0 - vptr=((& QQmlEngine::_ZTV10QQmlEngine) + 16u) - QJSEngine (0x0x7f5a230f0958) 0 - primary-for QQmlEngine (0x0x7f5a230f08f0) - QObject (0x0x7f5a22e885a0) 0 - primary-for QJSEngine (0x0x7f5a230f0958) - -Class QQmlApplicationEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlApplicationEngine::QPrivateSignal (0x0x7f5a22e886c0) 0 empty - -Vtable for QQmlApplicationEngine -QQmlApplicationEngine::_ZTV21QQmlApplicationEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI21QQmlApplicationEngine) -16 (int (*)(...))QQmlApplicationEngine::metaObject -24 (int (*)(...))QQmlApplicationEngine::qt_metacast -32 (int (*)(...))QQmlApplicationEngine::qt_metacall -40 (int (*)(...))QQmlApplicationEngine::~QQmlApplicationEngine -48 (int (*)(...))QQmlApplicationEngine::~QQmlApplicationEngine -56 (int (*)(...))QQmlEngine::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlApplicationEngine - size=24 align=8 - base size=24 base align=8 -QQmlApplicationEngine (0x0x7f5a230f0a28) 0 - vptr=((& QQmlApplicationEngine::_ZTV21QQmlApplicationEngine) + 16u) - QQmlEngine (0x0x7f5a230f0a90) 0 - primary-for QQmlApplicationEngine (0x0x7f5a230f0a28) - QJSEngine (0x0x7f5a230f0af8) 0 - primary-for QQmlEngine (0x0x7f5a230f0a90) - QObject (0x0x7f5a22e88660) 0 - primary-for QJSEngine (0x0x7f5a230f0af8) - -Class QQmlComponent::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlComponent::QPrivateSignal (0x0x7f5a22e88780) 0 empty - -Vtable for QQmlComponent -QQmlComponent::_ZTV13QQmlComponent: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QQmlComponent) -16 (int (*)(...))QQmlComponent::metaObject -24 (int (*)(...))QQmlComponent::qt_metacast -32 (int (*)(...))QQmlComponent::qt_metacall -40 (int (*)(...))QQmlComponent::~QQmlComponent -48 (int (*)(...))QQmlComponent::~QQmlComponent -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQmlComponent::create -120 (int (*)(...))QQmlComponent::beginCreate -128 (int (*)(...))QQmlComponent::completeCreate - -Class QQmlComponent - size=16 align=8 - base size=16 base align=8 -QQmlComponent (0x0x7f5a230f0b60) 0 - vptr=((& QQmlComponent::_ZTV13QQmlComponent) + 16u) - QObject (0x0x7f5a22e88720) 0 - primary-for QQmlComponent (0x0x7f5a230f0b60) - -Class QQmlContext::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlContext::QPrivateSignal (0x0x7f5a22f51000) 0 empty - -Class QQmlContext::PropertyPair - size=24 align=8 - base size=24 base align=8 -QQmlContext::PropertyPair (0x0x7f5a22f51060) 0 - -Vtable for QQmlContext -QQmlContext::_ZTV11QQmlContext: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QQmlContext) -16 (int (*)(...))QQmlContext::metaObject -24 (int (*)(...))QQmlContext::qt_metacast -32 (int (*)(...))QQmlContext::qt_metacall -40 (int (*)(...))QQmlContext::~QQmlContext -48 (int (*)(...))QQmlContext::~QQmlContext -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlContext - size=16 align=8 - base size=16 base align=8 -QQmlContext (0x0x7f5a22f490d0) 0 - vptr=((& QQmlContext::_ZTV11QQmlContext) + 16u) - QObject (0x0x7f5a22e88f60) 0 - primary-for QQmlContext (0x0x7f5a22f490d0) - -Class QQmlScriptString - size=8 align=8 - base size=8 base align=8 -QQmlScriptString (0x0x7f5a22f511e0) 0 - -Class QQmlExpression::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlExpression::QPrivateSignal (0x0x7f5a22f51420) 0 empty - -Vtable for QQmlExpression -QQmlExpression::_ZTV14QQmlExpression: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QQmlExpression) -16 (int (*)(...))QQmlExpression::metaObject -24 (int (*)(...))QQmlExpression::qt_metacast -32 (int (*)(...))QQmlExpression::qt_metacall -40 (int (*)(...))QQmlExpression::~QQmlExpression -48 (int (*)(...))QQmlExpression::~QQmlExpression -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlExpression - size=16 align=8 - base size=16 base align=8 -QQmlExpression (0x0x7f5a22f49138) 0 - vptr=((& QQmlExpression::_ZTV14QQmlExpression) + 16u) - QObject (0x0x7f5a22f513c0) 0 - primary-for QQmlExpression (0x0x7f5a22f49138) - -Vtable for QQmlTypesExtensionInterface -QQmlTypesExtensionInterface::_ZTV27QQmlTypesExtensionInterface: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI27QQmlTypesExtensionInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlTypesExtensionInterface - size=8 align=8 - base size=8 base align=8 -QQmlTypesExtensionInterface (0x0x7f5a22f51480) 0 nearly-empty - vptr=((& QQmlTypesExtensionInterface::_ZTV27QQmlTypesExtensionInterface) + 16u) - -Vtable for QQmlExtensionInterface -QQmlExtensionInterface::_ZTV22QQmlExtensionInterface: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QQmlExtensionInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual - -Class QQmlExtensionInterface - size=8 align=8 - base size=8 base align=8 -QQmlExtensionInterface (0x0x7f5a22f491a0) 0 nearly-empty - vptr=((& QQmlExtensionInterface::_ZTV22QQmlExtensionInterface) + 16u) - QQmlTypesExtensionInterface (0x0x7f5a22f514e0) 0 nearly-empty - primary-for QQmlExtensionInterface (0x0x7f5a22f491a0) - -Class QQmlExtensionPlugin::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlExtensionPlugin::QPrivateSignal (0x0x7f5a22f516c0) 0 empty - -Vtable for QQmlExtensionPlugin -QQmlExtensionPlugin::_ZTV19QQmlExtensionPlugin: 22u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQmlExtensionPlugin) -16 (int (*)(...))QQmlExtensionPlugin::metaObject -24 (int (*)(...))QQmlExtensionPlugin::qt_metacast -32 (int (*)(...))QQmlExtensionPlugin::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QQmlExtensionPlugin::initializeEngine -128 (int (*)(...))-16 -136 (int (*)(...))(& _ZTI19QQmlExtensionPlugin) -144 0u -152 0u -160 (int (*)(...))__cxa_pure_virtual -168 (int (*)(...))QQmlExtensionPlugin::_ZThn16_N19QQmlExtensionPlugin16initializeEngineEP10QQmlEnginePKc - -Class QQmlExtensionPlugin - size=24 align=8 - base size=24 base align=8 -QQmlExtensionPlugin (0x0x7f5a22ba8540) 0 - vptr=((& QQmlExtensionPlugin::_ZTV19QQmlExtensionPlugin) + 16u) - QObject (0x0x7f5a22f51600) 0 - primary-for QQmlExtensionPlugin (0x0x7f5a22ba8540) - QQmlExtensionInterface (0x0x7f5a22f49208) 16 nearly-empty - vptr=((& QQmlExtensionPlugin::_ZTV19QQmlExtensionPlugin) + 144u) - QQmlTypesExtensionInterface (0x0x7f5a22f51660) 16 nearly-empty - primary-for QQmlExtensionInterface (0x0x7f5a22f49208) - -Class QQmlFile - size=8 align=8 - base size=8 base align=8 -QQmlFile (0x0x7f5a22f51720) 0 - -Class QQmlFileSelector::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlFileSelector::QPrivateSignal (0x0x7f5a22f517e0) 0 empty - -Vtable for QQmlFileSelector -QQmlFileSelector::_ZTV16QQmlFileSelector: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QQmlFileSelector) -16 (int (*)(...))QQmlFileSelector::metaObject -24 (int (*)(...))QQmlFileSelector::qt_metacast -32 (int (*)(...))QQmlFileSelector::qt_metacall -40 (int (*)(...))QQmlFileSelector::~QQmlFileSelector -48 (int (*)(...))QQmlFileSelector::~QQmlFileSelector -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQmlFileSelector - size=16 align=8 - base size=16 base align=8 -QQmlFileSelector (0x0x7f5a22f492d8) 0 - vptr=((& QQmlFileSelector::_ZTV16QQmlFileSelector) + 16u) - QObject (0x0x7f5a22f51780) 0 - primary-for QQmlFileSelector (0x0x7f5a22f492d8) - -Vtable for QQmlIncubator -QQmlIncubator::_ZTV13QQmlIncubator: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QQmlIncubator) -16 (int (*)(...))QQmlIncubator::~QQmlIncubator -24 (int (*)(...))QQmlIncubator::~QQmlIncubator -32 (int (*)(...))QQmlIncubator::statusChanged -40 (int (*)(...))QQmlIncubator::setInitialState - -Class QQmlIncubator - size=16 align=8 - base size=16 base align=8 -QQmlIncubator (0x0x7f5a22f51840) 0 - vptr=((& QQmlIncubator::_ZTV13QQmlIncubator) + 16u) - -Vtable for QQmlIncubationController -QQmlIncubationController::_ZTV24QQmlIncubationController: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QQmlIncubationController) -16 (int (*)(...))QQmlIncubationController::~QQmlIncubationController -24 (int (*)(...))QQmlIncubationController::~QQmlIncubationController -32 (int (*)(...))QQmlIncubationController::incubatingObjectCountChanged - -Class QQmlIncubationController - size=16 align=8 - base size=16 base align=8 -QQmlIncubationController (0x0x7f5a22f518a0) 0 - vptr=((& QQmlIncubationController::_ZTV24QQmlIncubationController) + 16u) - -Class QQmlInfo - size=16 align=8 - base size=16 base align=8 -QQmlInfo (0x0x7f5a22f49340) 0 - QDebug (0x0x7f5a22f51900) 0 - -Vtable for QQmlNetworkAccessManagerFactory -QQmlNetworkAccessManagerFactory::_ZTV31QQmlNetworkAccessManagerFactory: 5u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI31QQmlNetworkAccessManagerFactory) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual - -Class QQmlNetworkAccessManagerFactory - size=8 align=8 - base size=8 base align=8 -QQmlNetworkAccessManagerFactory (0x0x7f5a22c2c120) 0 nearly-empty - vptr=((& QQmlNetworkAccessManagerFactory::_ZTV31QQmlNetworkAccessManagerFactory) + 16u) - -Class QQmlProperty - size=8 align=8 - base size=8 base align=8 -QQmlProperty (0x0x7f5a22c2c180) 0 - -Class QQmlPropertyMap::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQmlPropertyMap::QPrivateSignal (0x0x7f5a22c2ccc0) 0 empty - -Vtable for QQmlPropertyMap -QQmlPropertyMap::_ZTV15QQmlPropertyMap: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QQmlPropertyMap) -16 (int (*)(...))QQmlPropertyMap::metaObject -24 (int (*)(...))QQmlPropertyMap::qt_metacast -32 (int (*)(...))QQmlPropertyMap::qt_metacall -40 (int (*)(...))QQmlPropertyMap::~QQmlPropertyMap -48 (int (*)(...))QQmlPropertyMap::~QQmlPropertyMap -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQmlPropertyMap::updateValue - -Class QQmlPropertyMap - size=16 align=8 - base size=16 base align=8 -QQmlPropertyMap (0x0x7f5a22c4e8f0) 0 - vptr=((& QQmlPropertyMap::_ZTV15QQmlPropertyMap) + 16u) - QObject (0x0x7f5a22c2cc60) 0 - primary-for QQmlPropertyMap (0x0x7f5a22c4e8f0) - -Class QQuickTransform::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickTransform::QPrivateSignal (0x0x7f5a22c2cd80) 0 empty - -Vtable for QQuickTransform -QQuickTransform::_ZTV15QQuickTransform: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QQuickTransform) -16 (int (*)(...))QQuickTransform::metaObject -24 (int (*)(...))QQuickTransform::qt_metacast -32 (int (*)(...))QQuickTransform::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QQuickTransform - size=16 align=8 - base size=16 base align=8 -QQuickTransform (0x0x7f5a22c4e958) 0 - vptr=((& QQuickTransform::_ZTV15QQuickTransform) + 16u) - QObject (0x0x7f5a22c2cd20) 0 - primary-for QQuickTransform (0x0x7f5a22c4e958) - -Class QQuickItem::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickItem::QPrivateSignal (0x0x7f5a22c2cea0) 0 empty - -Class QQuickItem::ItemChangeData - size=8 align=8 - base size=8 base align=8 -QQuickItem::ItemChangeData (0x0x7f5a22c2cf00) 0 - -Class QQuickItem::UpdatePaintNodeData - size=8 align=8 - base size=8 base align=8 -QQuickItem::UpdatePaintNodeData (0x0x7f5a22c2cf60) 0 - -Vtable for QQuickItem -QQuickItem::_ZTV10QQuickItem: 55u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QQuickItem) -16 (int (*)(...))QQuickItem::metaObject -24 (int (*)(...))QQuickItem::qt_metacast -32 (int (*)(...))QQuickItem::qt_metacall -40 (int (*)(...))QQuickItem::~QQuickItem -48 (int (*)(...))QQuickItem::~QQuickItem -56 (int (*)(...))QQuickItem::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickItem::boundingRect -120 (int (*)(...))QQuickItem::clipRect -128 (int (*)(...))QQuickItem::contains -136 (int (*)(...))QQuickItem::inputMethodQuery -144 (int (*)(...))QQuickItem::isTextureProvider -152 (int (*)(...))QQuickItem::textureProvider -160 (int (*)(...))QQuickItem::itemChange -168 (int (*)(...))QQuickItem::classBegin -176 (int (*)(...))QQuickItem::componentComplete -184 (int (*)(...))QQuickItem::keyPressEvent -192 (int (*)(...))QQuickItem::keyReleaseEvent -200 (int (*)(...))QQuickItem::inputMethodEvent -208 (int (*)(...))QQuickItem::focusInEvent -216 (int (*)(...))QQuickItem::focusOutEvent -224 (int (*)(...))QQuickItem::mousePressEvent -232 (int (*)(...))QQuickItem::mouseMoveEvent -240 (int (*)(...))QQuickItem::mouseReleaseEvent -248 (int (*)(...))QQuickItem::mouseDoubleClickEvent -256 (int (*)(...))QQuickItem::mouseUngrabEvent -264 (int (*)(...))QQuickItem::touchUngrabEvent -272 (int (*)(...))QQuickItem::wheelEvent -280 (int (*)(...))QQuickItem::touchEvent -288 (int (*)(...))QQuickItem::hoverEnterEvent -296 (int (*)(...))QQuickItem::hoverMoveEvent -304 (int (*)(...))QQuickItem::hoverLeaveEvent -312 (int (*)(...))QQuickItem::dragEnterEvent -320 (int (*)(...))QQuickItem::dragMoveEvent -328 (int (*)(...))QQuickItem::dragLeaveEvent -336 (int (*)(...))QQuickItem::dropEvent -344 (int (*)(...))QQuickItem::childMouseEventFilter -352 (int (*)(...))QQuickItem::windowDeactivateEvent -360 (int (*)(...))QQuickItem::geometryChanged -368 (int (*)(...))QQuickItem::updatePaintNode -376 (int (*)(...))QQuickItem::releaseResources -384 (int (*)(...))QQuickItem::updatePolish -392 (int (*)(...))-16 -400 (int (*)(...))(& _ZTI10QQuickItem) -408 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItemD1Ev -416 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItemD0Ev -424 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem10classBeginEv -432 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem17componentCompleteEv - -Class QQuickItem - size=32 align=8 - base size=32 base align=8 -QQuickItem (0x0x7f5a22c6e380) 0 - vptr=((& QQuickItem::_ZTV10QQuickItem) + 16u) - QObject (0x0x7f5a22c2cde0) 0 - primary-for QQuickItem (0x0x7f5a22c6e380) - QQmlParserStatus (0x0x7f5a22c2ce40) 16 - vptr=((& QQuickItem::_ZTV10QQuickItem) + 408u) - -Class QQuickFramebufferObject::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickFramebufferObject::QPrivateSignal (0x0x7f5a22ccc780) 0 empty - -Vtable for QQuickFramebufferObject::Renderer -QQuickFramebufferObject::Renderer::_ZTVN23QQuickFramebufferObject8RendererE: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN23QQuickFramebufferObject8RendererE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QQuickFramebufferObject::Renderer::createFramebufferObject -48 (int (*)(...))QQuickFramebufferObject::Renderer::synchronize - -Class QQuickFramebufferObject::Renderer - size=16 align=8 - base size=16 base align=8 -QQuickFramebufferObject::Renderer (0x0x7f5a22ccc7e0) 0 - vptr=((& QQuickFramebufferObject::Renderer::_ZTVN23QQuickFramebufferObject8RendererE) + 16u) - -Vtable for QQuickFramebufferObject -QQuickFramebufferObject::_ZTV23QQuickFramebufferObject: 56u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI23QQuickFramebufferObject) -16 (int (*)(...))QQuickFramebufferObject::metaObject -24 (int (*)(...))QQuickFramebufferObject::qt_metacast -32 (int (*)(...))QQuickFramebufferObject::qt_metacall -40 0u -48 0u -56 (int (*)(...))QQuickItem::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickItem::boundingRect -120 (int (*)(...))QQuickItem::clipRect -128 (int (*)(...))QQuickItem::contains -136 (int (*)(...))QQuickItem::inputMethodQuery -144 (int (*)(...))QQuickFramebufferObject::isTextureProvider -152 (int (*)(...))QQuickFramebufferObject::textureProvider -160 (int (*)(...))QQuickItem::itemChange -168 (int (*)(...))QQuickItem::classBegin -176 (int (*)(...))QQuickItem::componentComplete -184 (int (*)(...))QQuickItem::keyPressEvent -192 (int (*)(...))QQuickItem::keyReleaseEvent -200 (int (*)(...))QQuickItem::inputMethodEvent -208 (int (*)(...))QQuickItem::focusInEvent -216 (int (*)(...))QQuickItem::focusOutEvent -224 (int (*)(...))QQuickItem::mousePressEvent -232 (int (*)(...))QQuickItem::mouseMoveEvent -240 (int (*)(...))QQuickItem::mouseReleaseEvent -248 (int (*)(...))QQuickItem::mouseDoubleClickEvent -256 (int (*)(...))QQuickItem::mouseUngrabEvent -264 (int (*)(...))QQuickItem::touchUngrabEvent -272 (int (*)(...))QQuickItem::wheelEvent -280 (int (*)(...))QQuickItem::touchEvent -288 (int (*)(...))QQuickItem::hoverEnterEvent -296 (int (*)(...))QQuickItem::hoverMoveEvent -304 (int (*)(...))QQuickItem::hoverLeaveEvent -312 (int (*)(...))QQuickItem::dragEnterEvent -320 (int (*)(...))QQuickItem::dragMoveEvent -328 (int (*)(...))QQuickItem::dragLeaveEvent -336 (int (*)(...))QQuickItem::dropEvent -344 (int (*)(...))QQuickItem::childMouseEventFilter -352 (int (*)(...))QQuickItem::windowDeactivateEvent -360 (int (*)(...))QQuickFramebufferObject::geometryChanged -368 (int (*)(...))QQuickFramebufferObject::updatePaintNode -376 (int (*)(...))QQuickFramebufferObject::releaseResources -384 (int (*)(...))QQuickItem::updatePolish -392 (int (*)(...))__cxa_pure_virtual -400 (int (*)(...))-16 -408 (int (*)(...))(& _ZTI23QQuickFramebufferObject) -416 0u -424 0u -432 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem10classBeginEv -440 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem17componentCompleteEv - -Class QQuickFramebufferObject - size=32 align=8 - base size=32 base align=8 -QQuickFramebufferObject (0x0x7f5a22c4ea90) 0 - vptr=((& QQuickFramebufferObject::_ZTV23QQuickFramebufferObject) + 16u) - QQuickItem (0x0x7f5a22d11c40) 0 - primary-for QQuickFramebufferObject (0x0x7f5a22c4ea90) - QObject (0x0x7f5a22ccc6c0) 0 - primary-for QQuickItem (0x0x7f5a22d11c40) - QQmlParserStatus (0x0x7f5a22ccc720) 16 - vptr=((& QQuickFramebufferObject::_ZTV23QQuickFramebufferObject) + 416u) - -Class QQuickTextureFactory::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickTextureFactory::QPrivateSignal (0x0x7f5a22ccc8a0) 0 empty - -Vtable for QQuickTextureFactory -QQuickTextureFactory::_ZTV20QQuickTextureFactory: 18u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QQuickTextureFactory) -16 (int (*)(...))QQuickTextureFactory::metaObject -24 (int (*)(...))QQuickTextureFactory::qt_metacast -32 (int (*)(...))QQuickTextureFactory::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))QQuickTextureFactory::image - -Class QQuickTextureFactory - size=16 align=8 - base size=16 base align=8 -QQuickTextureFactory (0x0x7f5a22c4eaf8) 0 - vptr=((& QQuickTextureFactory::_ZTV20QQuickTextureFactory) + 16u) - QObject (0x0x7f5a22ccc840) 0 - primary-for QQuickTextureFactory (0x0x7f5a22c4eaf8) - -Class QQuickImageResponse::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickImageResponse::QPrivateSignal (0x0x7f5a22ccc960) 0 empty - -Vtable for QQuickImageResponse -QQuickImageResponse::_ZTV19QQuickImageResponse: 17u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQuickImageResponse) -16 (int (*)(...))QQuickImageResponse::metaObject -24 (int (*)(...))QQuickImageResponse::qt_metacast -32 (int (*)(...))QQuickImageResponse::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))QQuickImageResponse::errorString -128 (int (*)(...))QQuickImageResponse::cancel - -Class QQuickImageResponse - size=16 align=8 - base size=16 base align=8 -QQuickImageResponse (0x0x7f5a22c4eb60) 0 - vptr=((& QQuickImageResponse::_ZTV19QQuickImageResponse) + 16u) - QObject (0x0x7f5a22ccc900) 0 - primary-for QQuickImageResponse (0x0x7f5a22c4eb60) - -Vtable for QQuickImageProvider -QQuickImageProvider::_ZTV19QQuickImageProvider: 9u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQuickImageProvider) -16 (int (*)(...))QQuickImageProvider::~QQuickImageProvider -24 (int (*)(...))QQuickImageProvider::~QQuickImageProvider -32 (int (*)(...))QQuickImageProvider::imageType -40 (int (*)(...))QQuickImageProvider::flags -48 (int (*)(...))QQuickImageProvider::requestImage -56 (int (*)(...))QQuickImageProvider::requestPixmap -64 (int (*)(...))QQuickImageProvider::requestTexture - -Class QQuickImageProvider - size=16 align=8 - base size=16 base align=8 -QQuickImageProvider (0x0x7f5a22c4ebc8) 0 - vptr=((& QQuickImageProvider::_ZTV19QQuickImageProvider) + 16u) - QQmlImageProviderBase (0x0x7f5a22ccc9c0) 0 nearly-empty - primary-for QQuickImageProvider (0x0x7f5a22c4ebc8) - -Vtable for QQuickAsyncImageProvider -QQuickAsyncImageProvider::_ZTV24QQuickAsyncImageProvider: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QQuickAsyncImageProvider) -16 0u -24 0u -32 (int (*)(...))QQuickImageProvider::imageType -40 (int (*)(...))QQuickImageProvider::flags -48 (int (*)(...))QQuickImageProvider::requestImage -56 (int (*)(...))QQuickImageProvider::requestPixmap -64 (int (*)(...))QQuickImageProvider::requestTexture -72 (int (*)(...))__cxa_pure_virtual - -Class QQuickAsyncImageProvider - size=24 align=8 - base size=24 base align=8 -QQuickAsyncImageProvider (0x0x7f5a22c4ec30) 0 - vptr=((& QQuickAsyncImageProvider::_ZTV24QQuickAsyncImageProvider) + 16u) - QQuickImageProvider (0x0x7f5a22c4ec98) 0 - primary-for QQuickAsyncImageProvider (0x0x7f5a22c4ec30) - QQmlImageProviderBase (0x0x7f5a22ccca20) 0 nearly-empty - primary-for QQuickImageProvider (0x0x7f5a22c4ec98) - -Class QQuickItemGrabResult::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickItemGrabResult::QPrivateSignal (0x0x7f5a22cccae0) 0 empty - -Vtable for QQuickItemGrabResult -QQuickItemGrabResult::_ZTV20QQuickItemGrabResult: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QQuickItemGrabResult) -16 (int (*)(...))QQuickItemGrabResult::metaObject -24 (int (*)(...))QQuickItemGrabResult::qt_metacast -32 (int (*)(...))QQuickItemGrabResult::qt_metacall -40 (int (*)(...))QQuickItemGrabResult::~QQuickItemGrabResult -48 (int (*)(...))QQuickItemGrabResult::~QQuickItemGrabResult -56 (int (*)(...))QQuickItemGrabResult::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQuickItemGrabResult - size=16 align=8 - base size=16 base align=8 -QQuickItemGrabResult (0x0x7f5a22c4ed00) 0 - vptr=((& QQuickItemGrabResult::_ZTV20QQuickItemGrabResult) + 16u) - QObject (0x0x7f5a22ccca80) 0 - primary-for QQuickItemGrabResult (0x0x7f5a22c4ed00) - -Class QQuickPaintedItem::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickPaintedItem::QPrivateSignal (0x0x7f5a22cccc00) 0 empty - -Vtable for QQuickPaintedItem -QQuickPaintedItem::_ZTV17QQuickPaintedItem: 56u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QQuickPaintedItem) -16 (int (*)(...))QQuickPaintedItem::metaObject -24 (int (*)(...))QQuickPaintedItem::qt_metacast -32 (int (*)(...))QQuickPaintedItem::qt_metacall -40 0u -48 0u -56 (int (*)(...))QQuickItem::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickItem::boundingRect -120 (int (*)(...))QQuickItem::clipRect -128 (int (*)(...))QQuickItem::contains -136 (int (*)(...))QQuickItem::inputMethodQuery -144 (int (*)(...))QQuickPaintedItem::isTextureProvider -152 (int (*)(...))QQuickPaintedItem::textureProvider -160 (int (*)(...))QQuickPaintedItem::itemChange -168 (int (*)(...))QQuickItem::classBegin -176 (int (*)(...))QQuickItem::componentComplete -184 (int (*)(...))QQuickItem::keyPressEvent -192 (int (*)(...))QQuickItem::keyReleaseEvent -200 (int (*)(...))QQuickItem::inputMethodEvent -208 (int (*)(...))QQuickItem::focusInEvent -216 (int (*)(...))QQuickItem::focusOutEvent -224 (int (*)(...))QQuickItem::mousePressEvent -232 (int (*)(...))QQuickItem::mouseMoveEvent -240 (int (*)(...))QQuickItem::mouseReleaseEvent -248 (int (*)(...))QQuickItem::mouseDoubleClickEvent -256 (int (*)(...))QQuickItem::mouseUngrabEvent -264 (int (*)(...))QQuickItem::touchUngrabEvent -272 (int (*)(...))QQuickItem::wheelEvent -280 (int (*)(...))QQuickItem::touchEvent -288 (int (*)(...))QQuickItem::hoverEnterEvent -296 (int (*)(...))QQuickItem::hoverMoveEvent -304 (int (*)(...))QQuickItem::hoverLeaveEvent -312 (int (*)(...))QQuickItem::dragEnterEvent -320 (int (*)(...))QQuickItem::dragMoveEvent -328 (int (*)(...))QQuickItem::dragLeaveEvent -336 (int (*)(...))QQuickItem::dropEvent -344 (int (*)(...))QQuickItem::childMouseEventFilter -352 (int (*)(...))QQuickItem::windowDeactivateEvent -360 (int (*)(...))QQuickItem::geometryChanged -368 (int (*)(...))QQuickPaintedItem::updatePaintNode -376 (int (*)(...))QQuickPaintedItem::releaseResources -384 (int (*)(...))QQuickItem::updatePolish -392 (int (*)(...))__cxa_pure_virtual -400 (int (*)(...))-16 -408 (int (*)(...))(& _ZTI17QQuickPaintedItem) -416 0u -424 0u -432 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem10classBeginEv -440 (int (*)(...))QQuickItem::_ZThn16_N10QQuickItem17componentCompleteEv - -Class QQuickPaintedItem - size=32 align=8 - base size=32 base align=8 -QQuickPaintedItem (0x0x7f5a22c4ed68) 0 - vptr=((& QQuickPaintedItem::_ZTV17QQuickPaintedItem) + 16u) - QQuickItem (0x0x7f5a22d4caf0) 0 - primary-for QQuickPaintedItem (0x0x7f5a22c4ed68) - QObject (0x0x7f5a22cccb40) 0 - primary-for QQuickItem (0x0x7f5a22d4caf0) - QQmlParserStatus (0x0x7f5a22cccba0) 16 - vptr=((& QQuickPaintedItem::_ZTV17QQuickPaintedItem) + 416u) - -Class QQuickRenderControl::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickRenderControl::QPrivateSignal (0x0x7f5a22ccce40) 0 empty - -Vtable for QQuickRenderControl -QQuickRenderControl::_ZTV19QQuickRenderControl: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QQuickRenderControl) -16 (int (*)(...))QQuickRenderControl::metaObject -24 (int (*)(...))QQuickRenderControl::qt_metacast -32 (int (*)(...))QQuickRenderControl::qt_metacall -40 (int (*)(...))QQuickRenderControl::~QQuickRenderControl -48 (int (*)(...))QQuickRenderControl::~QQuickRenderControl -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QQuickRenderControl::renderWindow - -Class QQuickRenderControl - size=16 align=8 - base size=16 base align=8 -QQuickRenderControl (0x0x7f5a22c4ef08) 0 - vptr=((& QQuickRenderControl::_ZTV19QQuickRenderControl) + 16u) - QObject (0x0x7f5a22cccde0) 0 - primary-for QQuickRenderControl (0x0x7f5a22c4ef08) - -Class QQuickTextDocument::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickTextDocument::QPrivateSignal (0x0x7f5a22cccf00) 0 empty - -Vtable for QQuickTextDocument -QQuickTextDocument::_ZTV18QQuickTextDocument: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QQuickTextDocument) -16 (int (*)(...))QQuickTextDocument::metaObject -24 (int (*)(...))QQuickTextDocument::qt_metacast -32 (int (*)(...))QQuickTextDocument::qt_metacall -40 (int (*)(...))QQuickTextDocument::~QQuickTextDocument -48 (int (*)(...))QQuickTextDocument::~QQuickTextDocument -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QQuickTextDocument - size=16 align=8 - base size=16 base align=8 -QQuickTextDocument (0x0x7f5a22c4ef70) 0 - vptr=((& QQuickTextDocument::_ZTV18QQuickTextDocument) + 16u) - QObject (0x0x7f5a22cccea0) 0 - primary-for QQuickTextDocument (0x0x7f5a22c4ef70) - -Class QSGGeometry::Attribute - size=16 align=4 - base size=16 base align=4 -QSGGeometry::Attribute (0x0x7f5a347c6060) 0 - -Class QSGGeometry::AttributeSet - size=16 align=8 - base size=16 base align=8 -QSGGeometry::AttributeSet (0x0x7f5a347c60c0) 0 - -Class QSGGeometry::Point2D - size=8 align=4 - base size=8 base align=4 -QSGGeometry::Point2D (0x0x7f5a347c6120) 0 - -Class QSGGeometry::TexturedPoint2D - size=16 align=4 - base size=16 base align=4 -QSGGeometry::TexturedPoint2D (0x0x7f5a347c6180) 0 - -Class QSGGeometry::ColoredPoint2D - size=12 align=4 - base size=12 base align=4 -QSGGeometry::ColoredPoint2D (0x0x7f5a347c6660) 0 - -Vtable for QSGGeometry -QSGGeometry::_ZTV11QSGGeometry: 4u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGGeometry) -16 (int (*)(...))QSGGeometry::~QSGGeometry -24 (int (*)(...))QSGGeometry::~QSGGeometry - -Class QSGGeometry - size=128 align=8 - base size=128 base align=8 -QSGGeometry (0x0x7f5a34750660) 0 - vptr=((& QSGGeometry::_ZTV11QSGGeometry) + 16u) - -Vtable for QSGNode -QSGNode::_ZTV7QSGNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7QSGNode) -16 (int (*)(...))QSGNode::~QSGNode -24 (int (*)(...))QSGNode::~QSGNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGNode - size=80 align=8 - base size=80 base align=8 -QSGNode (0x0x7f5a2cd3a120) 0 - vptr=((& QSGNode::_ZTV7QSGNode) + 16u) - -Vtable for QSGBasicGeometryNode -QSGBasicGeometryNode::_ZTV20QSGBasicGeometryNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGBasicGeometryNode) -16 (int (*)(...))QSGBasicGeometryNode::~QSGBasicGeometryNode -24 (int (*)(...))QSGBasicGeometryNode::~QSGBasicGeometryNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGBasicGeometryNode - size=112 align=8 - base size=112 base align=8 -QSGBasicGeometryNode (0x0x7f5a2daabd00) 0 - vptr=((& QSGBasicGeometryNode::_ZTV20QSGBasicGeometryNode) + 16u) - QSGNode (0x0x7f5a2cd5cae0) 0 - primary-for QSGBasicGeometryNode (0x0x7f5a2daabd00) - -Vtable for QSGGeometryNode -QSGGeometryNode::_ZTV15QSGGeometryNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI15QSGGeometryNode) -16 (int (*)(...))QSGGeometryNode::~QSGGeometryNode -24 (int (*)(...))QSGGeometryNode::~QSGGeometryNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGGeometryNode - size=144 align=8 - base size=144 base align=8 -QSGGeometryNode (0x0x7f5a2daabd68) 0 - vptr=((& QSGGeometryNode::_ZTV15QSGGeometryNode) + 16u) - QSGBasicGeometryNode (0x0x7f5a2d2777b8) 0 - primary-for QSGGeometryNode (0x0x7f5a2daabd68) - QSGNode (0x0x7f5a2cd5cb40) 0 - primary-for QSGBasicGeometryNode (0x0x7f5a2d2777b8) - -Vtable for QSGClipNode -QSGClipNode::_ZTV11QSGClipNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGClipNode) -16 (int (*)(...))QSGClipNode::~QSGClipNode -24 (int (*)(...))QSGClipNode::~QSGClipNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGClipNode - size=152 align=8 - base size=152 base align=8 -QSGClipNode (0x0x7f5a2d277820) 0 - vptr=((& QSGClipNode::_ZTV11QSGClipNode) + 16u) - QSGBasicGeometryNode (0x0x7f5a2ccd7af8) 0 - primary-for QSGClipNode (0x0x7f5a2d277820) - QSGNode (0x0x7f5a2cd5cea0) 0 - primary-for QSGBasicGeometryNode (0x0x7f5a2ccd7af8) - -Vtable for QSGTransformNode -QSGTransformNode::_ZTV16QSGTransformNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QSGTransformNode) -16 (int (*)(...))QSGTransformNode::~QSGTransformNode -24 (int (*)(...))QSGTransformNode::~QSGTransformNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGTransformNode - size=216 align=8 - base size=216 base align=8 -QSGTransformNode (0x0x7f5a2ccd7b60) 0 - vptr=((& QSGTransformNode::_ZTV16QSGTransformNode) + 16u) - QSGNode (0x0x7f5a2cd5cf00) 0 - primary-for QSGTransformNode (0x0x7f5a2ccd7b60) - -Vtable for QSGRootNode -QSGRootNode::_ZTV11QSGRootNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGRootNode) -16 (int (*)(...))QSGRootNode::~QSGRootNode -24 (int (*)(...))QSGRootNode::~QSGRootNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGRootNode - size=88 align=8 - base size=88 base align=8 -QSGRootNode (0x0x7f5a2cd51068) 0 - vptr=((& QSGRootNode::_ZTV11QSGRootNode) + 16u) - QSGNode (0x0x7f5a2cd7b600) 0 - primary-for QSGRootNode (0x0x7f5a2cd51068) - -Vtable for QSGOpacityNode -QSGOpacityNode::_ZTV14QSGOpacityNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QSGOpacityNode) -16 (int (*)(...))QSGOpacityNode::~QSGOpacityNode -24 (int (*)(...))QSGOpacityNode::~QSGOpacityNode -32 (int (*)(...))QSGOpacityNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGOpacityNode - size=96 align=8 - base size=96 base align=8 -QSGOpacityNode (0x0x7f5a2cd74888) 0 - vptr=((& QSGOpacityNode::_ZTV14QSGOpacityNode) + 16u) - QSGNode (0x0x7f5a2cb2e1e0) 0 - primary-for QSGOpacityNode (0x0x7f5a2cd74888) - -Vtable for QSGNodeVisitor -QSGNodeVisitor::_ZTV14QSGNodeVisitor: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI14QSGNodeVisitor) -16 (int (*)(...))QSGNodeVisitor::~QSGNodeVisitor -24 (int (*)(...))QSGNodeVisitor::~QSGNodeVisitor -32 (int (*)(...))QSGNodeVisitor::enterTransformNode -40 (int (*)(...))QSGNodeVisitor::leaveTransformNode -48 (int (*)(...))QSGNodeVisitor::enterClipNode -56 (int (*)(...))QSGNodeVisitor::leaveClipNode -64 (int (*)(...))QSGNodeVisitor::enterGeometryNode -72 (int (*)(...))QSGNodeVisitor::leaveGeometryNode -80 (int (*)(...))QSGNodeVisitor::enterOpacityNode -88 (int (*)(...))QSGNodeVisitor::leaveOpacityNode -96 (int (*)(...))QSGNodeVisitor::visitNode -104 (int (*)(...))QSGNodeVisitor::visitChildren - -Class QSGNodeVisitor - size=8 align=8 - base size=8 base align=8 -QSGNodeVisitor (0x0x7f5a2cb2e240) 0 nearly-empty - vptr=((& QSGNodeVisitor::_ZTV14QSGNodeVisitor) + 16u) - -Vtable for QSGRendererInterface -QSGRendererInterface::_ZTV20QSGRendererInterface: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGRendererInterface) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))QSGRendererInterface::getResource -48 (int (*)(...))QSGRendererInterface::getResource -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual - -Class QSGRendererInterface - size=8 align=8 - base size=8 base align=8 -QSGRendererInterface (0x0x7f5a2cb2e300) 0 nearly-empty - vptr=((& QSGRendererInterface::_ZTV20QSGRendererInterface) + 16u) - -Class QQuickWindow::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickWindow::QPrivateSignal (0x0x7f5a2c8640c0) 0 empty - -Vtable for QQuickWindow -QQuickWindow::_ZTV12QQuickWindow: 45u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QQuickWindow) -16 (int (*)(...))QQuickWindow::metaObject -24 (int (*)(...))QQuickWindow::qt_metacast -32 (int (*)(...))QQuickWindow::qt_metacall -40 (int (*)(...))QQuickWindow::~QQuickWindow -48 (int (*)(...))QQuickWindow::~QQuickWindow -56 (int (*)(...))QQuickWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QQuickWindow::accessibleRoot -144 (int (*)(...))QQuickWindow::focusObject -152 (int (*)(...))QQuickWindow::exposeEvent -160 (int (*)(...))QQuickWindow::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QQuickWindow::focusInEvent -184 (int (*)(...))QQuickWindow::focusOutEvent -192 (int (*)(...))QQuickWindow::showEvent -200 (int (*)(...))QQuickWindow::hideEvent -208 (int (*)(...))QQuickWindow::keyPressEvent -216 (int (*)(...))QQuickWindow::keyReleaseEvent -224 (int (*)(...))QQuickWindow::mousePressEvent -232 (int (*)(...))QQuickWindow::mouseReleaseEvent -240 (int (*)(...))QQuickWindow::mouseDoubleClickEvent -248 (int (*)(...))QQuickWindow::mouseMoveEvent -256 (int (*)(...))QQuickWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))-16 -304 (int (*)(...))(& _ZTI12QQuickWindow) -312 (int (*)(...))QQuickWindow::_ZThn16_N12QQuickWindowD1Ev -320 (int (*)(...))QQuickWindow::_ZThn16_N12QQuickWindowD0Ev -328 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -336 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -344 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv - -Class QQuickWindow - size=40 align=8 - base size=40 base align=8 -QQuickWindow (0x0x7f5a2c9575b0) 0 - vptr=((& QQuickWindow::_ZTV12QQuickWindow) + 16u) - QWindow (0x0x7f5a2faed380) 0 - primary-for QQuickWindow (0x0x7f5a2c9575b0) - QObject (0x0x7f5a2c864000) 0 - primary-for QWindow (0x0x7f5a2faed380) - QSurface (0x0x7f5a2c864060) 16 - vptr=((& QQuickWindow::_ZTV12QQuickWindow) + 312u) - -Class QQuickView::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QQuickView::QPrivateSignal (0x0x7f5a2c5f67e0) 0 empty - -Vtable for QQuickView -QQuickView::_ZTV10QQuickView: 45u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QQuickView) -16 (int (*)(...))QQuickView::metaObject -24 (int (*)(...))QQuickView::qt_metacast -32 (int (*)(...))QQuickView::qt_metacall -40 (int (*)(...))QQuickView::~QQuickView -48 (int (*)(...))QQuickView::~QQuickView -56 (int (*)(...))QQuickWindow::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QQuickView::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))QWindow::surfaceType -120 (int (*)(...))QWindow::format -128 (int (*)(...))QWindow::size -136 (int (*)(...))QQuickWindow::accessibleRoot -144 (int (*)(...))QQuickWindow::focusObject -152 (int (*)(...))QQuickWindow::exposeEvent -160 (int (*)(...))QQuickView::resizeEvent -168 (int (*)(...))QWindow::moveEvent -176 (int (*)(...))QQuickWindow::focusInEvent -184 (int (*)(...))QQuickWindow::focusOutEvent -192 (int (*)(...))QQuickWindow::showEvent -200 (int (*)(...))QQuickWindow::hideEvent -208 (int (*)(...))QQuickView::keyPressEvent -216 (int (*)(...))QQuickView::keyReleaseEvent -224 (int (*)(...))QQuickView::mousePressEvent -232 (int (*)(...))QQuickView::mouseReleaseEvent -240 (int (*)(...))QQuickWindow::mouseDoubleClickEvent -248 (int (*)(...))QQuickView::mouseMoveEvent -256 (int (*)(...))QQuickWindow::wheelEvent -264 (int (*)(...))QWindow::touchEvent -272 (int (*)(...))QWindow::tabletEvent -280 (int (*)(...))QWindow::nativeEvent -288 (int (*)(...))QWindow::surfaceHandle -296 (int (*)(...))-16 -304 (int (*)(...))(& _ZTI10QQuickView) -312 (int (*)(...))QQuickView::_ZThn16_N10QQuickViewD1Ev -320 (int (*)(...))QQuickView::_ZThn16_N10QQuickViewD0Ev -328 (int (*)(...))QWindow::_ZThn16_NK7QWindow6formatEv -336 (int (*)(...))QWindow::_ZThn16_NK7QWindow13surfaceHandleEv -344 (int (*)(...))QWindow::_ZThn16_NK7QWindow11surfaceTypeEv -352 (int (*)(...))QWindow::_ZThn16_NK7QWindow4sizeEv - -Class QQuickView - size=40 align=8 - base size=40 base align=8 -QQuickView (0x0x7f5a2c76e2d8) 0 - vptr=((& QQuickView::_ZTV10QQuickView) + 16u) - QQuickWindow (0x0x7f5a2c76e340) 0 - primary-for QQuickView (0x0x7f5a2c76e2d8) - QWindow (0x0x7f5a2fb0a9a0) 0 - primary-for QQuickWindow (0x0x7f5a2c76e340) - QObject (0x0x7f5a2c5f66c0) 0 - primary-for QWindow (0x0x7f5a2fb0a9a0) - QSurface (0x0x7f5a2c5f6720) 16 - vptr=((& QQuickView::_ZTV10QQuickView) + 312u) - -Class QSGAbstractRenderer::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGAbstractRenderer::QPrivateSignal (0x0x7f5a2c4868a0) 0 empty - -Vtable for QSGAbstractRenderer -QSGAbstractRenderer::_ZTV19QSGAbstractRenderer: 16u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI19QSGAbstractRenderer) -16 (int (*)(...))QSGAbstractRenderer::metaObject -24 (int (*)(...))QSGAbstractRenderer::qt_metacast -32 (int (*)(...))QSGAbstractRenderer::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual - -Class QSGAbstractRenderer - size=16 align=8 - base size=16 base align=8 -QSGAbstractRenderer (0x0x7f5a2c76e3a8) 0 - vptr=((& QSGAbstractRenderer::_ZTV19QSGAbstractRenderer) + 16u) - QObject (0x0x7f5a2c5f6840) 0 - primary-for QSGAbstractRenderer (0x0x7f5a2c76e3a8) - -Class QSGEngine::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGEngine::QPrivateSignal (0x0x7f5a2c1587e0) 0 empty - -Vtable for QSGEngine -QSGEngine::_ZTV9QSGEngine: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9QSGEngine) -16 (int (*)(...))QSGEngine::metaObject -24 (int (*)(...))QSGEngine::qt_metacast -32 (int (*)(...))QSGEngine::qt_metacall -40 (int (*)(...))QSGEngine::~QSGEngine -48 (int (*)(...))QSGEngine::~QSGEngine -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - -Class QSGEngine - size=16 align=8 - base size=16 base align=8 -QSGEngine (0x0x7f5a2c76e4e0) 0 - vptr=((& QSGEngine::_ZTV9QSGEngine) + 16u) - QObject (0x0x7f5a2c158780) 0 - primary-for QSGEngine (0x0x7f5a2c76e4e0) - -Class QSGMaterialShader::RenderState - size=16 align=8 - base size=16 base align=8 -QSGMaterialShader::RenderState (0x0x7f5a2c1a9300) 0 - -Vtable for QSGMaterialShader -QSGMaterialShader::_ZTV17QSGMaterialShader: 12u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSGMaterialShader) -16 0u -24 0u -32 (int (*)(...))QSGMaterialShader::activate -40 (int (*)(...))QSGMaterialShader::deactivate -48 (int (*)(...))QSGMaterialShader::updateState -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))QSGMaterialShader::compile -72 (int (*)(...))QSGMaterialShader::initialize -80 (int (*)(...))QSGMaterialShader::vertexShader -88 (int (*)(...))QSGMaterialShader::fragmentShader - -Class QSGMaterialShader - size=32 align=8 - base size=32 base align=8 -QSGMaterialShader (0x0x7f5a2c180ae0) 0 - vptr=((& QSGMaterialShader::_ZTV17QSGMaterialShader) + 16u) - -Class QSGMaterialType - size=1 align=1 - base size=0 base align=1 -QSGMaterialType (0x0x7f5a2bcf6ba0) 0 empty - -Vtable for QSGMaterial -QSGMaterial::_ZTV11QSGMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QSGMaterial) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))QSGMaterial::compare - -Class QSGMaterial - size=24 align=8 - base size=24 base align=8 -QSGMaterial (0x0x7f5a2bad8000) 0 - vptr=((& QSGMaterial::_ZTV11QSGMaterial) + 16u) - -Vtable for QSGFlatColorMaterial -QSGFlatColorMaterial::_ZTV20QSGFlatColorMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGFlatColorMaterial) -16 (int (*)(...))QSGFlatColorMaterial::~QSGFlatColorMaterial -24 (int (*)(...))QSGFlatColorMaterial::~QSGFlatColorMaterial -32 (int (*)(...))QSGFlatColorMaterial::type -40 (int (*)(...))QSGFlatColorMaterial::createShader -48 (int (*)(...))QSGFlatColorMaterial::compare - -Class QSGFlatColorMaterial - size=40 align=8 - base size=40 base align=8 -QSGFlatColorMaterial (0x0x7f5a2c76e820) 0 - vptr=((& QSGFlatColorMaterial::_ZTV20QSGFlatColorMaterial) + 16u) - QSGMaterial (0x0x7f5a2bad85a0) 0 - primary-for QSGFlatColorMaterial (0x0x7f5a2c76e820) - -Class QSGTexture::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGTexture::QPrivateSignal (0x0x7f5a2bad8720) 0 empty - -Vtable for QSGTexture -QSGTexture::_ZTV10QSGTexture: 22u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10QSGTexture) -16 (int (*)(...))QSGTexture::metaObject -24 (int (*)(...))QSGTexture::qt_metacast -32 (int (*)(...))QSGTexture::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))QSGTexture::normalizedTextureSubRect -152 (int (*)(...))QSGTexture::isAtlasTexture -160 (int (*)(...))QSGTexture::removedFromAtlas -168 (int (*)(...))__cxa_pure_virtual - -Class QSGTexture - size=16 align=8 - base size=16 base align=8 -QSGTexture (0x0x7f5a2c76e888) 0 - vptr=((& QSGTexture::_ZTV10QSGTexture) + 16u) - QObject (0x0x7f5a2bad8660) 0 - primary-for QSGTexture (0x0x7f5a2c76e888) - -Class QSGDynamicTexture::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGDynamicTexture::QPrivateSignal (0x0x7f5a2bafd360) 0 empty - -Vtable for QSGDynamicTexture -QSGDynamicTexture::_ZTV17QSGDynamicTexture: 23u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSGDynamicTexture) -16 (int (*)(...))QSGDynamicTexture::metaObject -24 (int (*)(...))QSGDynamicTexture::qt_metacast -32 (int (*)(...))QSGDynamicTexture::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))QSGTexture::normalizedTextureSubRect -152 (int (*)(...))QSGTexture::isAtlasTexture -160 (int (*)(...))QSGTexture::removedFromAtlas -168 (int (*)(...))__cxa_pure_virtual -176 (int (*)(...))__cxa_pure_virtual - -Class QSGDynamicTexture - size=16 align=8 - base size=16 base align=8 -QSGDynamicTexture (0x0x7f5a2c76e8f0) 0 - vptr=((& QSGDynamicTexture::_ZTV17QSGDynamicTexture) + 16u) - QSGTexture (0x0x7f5a2c76e958) 0 - primary-for QSGDynamicTexture (0x0x7f5a2c76e8f0) - QObject (0x0x7f5a2bad8780) 0 - primary-for QSGTexture (0x0x7f5a2c76e958) - -Vtable for QSGImageNode -QSGImageNode::_ZTV12QSGImageNode: 20u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12QSGImageNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual -88 (int (*)(...))__cxa_pure_virtual -96 (int (*)(...))__cxa_pure_virtual -104 (int (*)(...))__cxa_pure_virtual -112 (int (*)(...))__cxa_pure_virtual -120 (int (*)(...))__cxa_pure_virtual -128 (int (*)(...))__cxa_pure_virtual -136 (int (*)(...))__cxa_pure_virtual -144 (int (*)(...))__cxa_pure_virtual -152 (int (*)(...))__cxa_pure_virtual - -Class QSGImageNode - size=144 align=8 - base size=144 base align=8 -QSGImageNode (0x0x7f5a2c76e9c0) 0 - vptr=((& QSGImageNode::_ZTV12QSGImageNode) + 16u) - QSGGeometryNode (0x0x7f5a2c76ea28) 0 - primary-for QSGImageNode (0x0x7f5a2c76e9c0) - QSGBasicGeometryNode (0x0x7f5a2c76ea90) 0 - primary-for QSGGeometryNode (0x0x7f5a2c76ea28) - QSGNode (0x0x7f5a2bafd3c0) 0 - primary-for QSGBasicGeometryNode (0x0x7f5a2c76ea90) - -Vtable for QSGNinePatchNode -QSGNinePatchNode::_ZTV16QSGNinePatchNode: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QSGNinePatchNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))__cxa_pure_virtual - -Class QSGNinePatchNode - size=144 align=8 - base size=144 base align=8 -QSGNinePatchNode (0x0x7f5a2c863000) 0 - vptr=((& QSGNinePatchNode::_ZTV16QSGNinePatchNode) + 16u) - QSGGeometryNode (0x0x7f5a2c8630d0) 0 - primary-for QSGNinePatchNode (0x0x7f5a2c863000) - QSGBasicGeometryNode (0x0x7f5a2c863138) 0 - primary-for QSGGeometryNode (0x0x7f5a2c8630d0) - QSGNode (0x0x7f5a2afbe4e0) 0 - primary-for QSGBasicGeometryNode (0x0x7f5a2c863138) - -Vtable for QSGRectangleNode -QSGRectangleNode::_ZTV16QSGRectangleNode: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI16QSGRectangleNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual - -Class QSGRectangleNode - size=144 align=8 - base size=144 base align=8 -QSGRectangleNode (0x0x7f5a2c8631a0) 0 - vptr=((& QSGRectangleNode::_ZTV16QSGRectangleNode) + 16u) - QSGGeometryNode (0x0x7f5a2c863208) 0 - primary-for QSGRectangleNode (0x0x7f5a2c8631a0) - QSGBasicGeometryNode (0x0x7f5a2c863270) 0 - primary-for QSGGeometryNode (0x0x7f5a2c863208) - QSGNode (0x0x7f5a2afbe540) 0 - primary-for QSGBasicGeometryNode (0x0x7f5a2c863270) - -Vtable for QSGRenderNode::RenderState -QSGRenderNode::RenderState::_ZTVN13QSGRenderNode11RenderStateE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN13QSGRenderNode11RenderStateE) -16 0u -24 0u -32 (int (*)(...))__cxa_pure_virtual -40 (int (*)(...))__cxa_pure_virtual -48 (int (*)(...))__cxa_pure_virtual -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))__cxa_pure_virtual -72 (int (*)(...))__cxa_pure_virtual -80 (int (*)(...))QSGRenderNode::RenderState::get - -Class QSGRenderNode::RenderState - size=8 align=8 - base size=8 base align=8 -QSGRenderNode::RenderState (0x0x7f5a2afbe9c0) 0 nearly-empty - vptr=((& QSGRenderNode::RenderState::_ZTVN13QSGRenderNode11RenderStateE) + 16u) - -Vtable for QSGRenderNode -QSGRenderNode::_ZTV13QSGRenderNode: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI13QSGRenderNode) -16 0u -24 0u -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess -48 (int (*)(...))QSGRenderNode::changedStates -56 (int (*)(...))__cxa_pure_virtual -64 (int (*)(...))QSGRenderNode::releaseResources -72 (int (*)(...))QSGRenderNode::flags -80 (int (*)(...))QSGRenderNode::rect - -Class QSGRenderNode - size=88 align=8 - base size=88 base align=8 -QSGRenderNode (0x0x7f5a2c8632d8) 0 - vptr=((& QSGRenderNode::_ZTV13QSGRenderNode) + 16u) - QSGNode (0x0x7f5a2afbe960) 0 - primary-for QSGRenderNode (0x0x7f5a2c8632d8) - -Vtable for QSGSimpleRectNode -QSGSimpleRectNode::_ZTV17QSGSimpleRectNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI17QSGSimpleRectNode) -16 (int (*)(...))QSGSimpleRectNode::~QSGSimpleRectNode -24 (int (*)(...))QSGSimpleRectNode::~QSGSimpleRectNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGSimpleRectNode - size=320 align=8 - base size=320 base align=8 -QSGSimpleRectNode (0x0x7f5a2c729680) 0 - vptr=((& QSGSimpleRectNode::_ZTV17QSGSimpleRectNode) + 16u) - QSGGeometryNode (0x0x7f5a2c729958) 0 - primary-for QSGSimpleRectNode (0x0x7f5a2c729680) - QSGBasicGeometryNode (0x0x7f5a2c7299c0) 0 - primary-for QSGGeometryNode (0x0x7f5a2c729958) - QSGNode (0x0x7f5a2b090660) 0 - primary-for QSGBasicGeometryNode (0x0x7f5a2c7299c0) - -Vtable for QSGOpaqueTextureMaterial -QSGOpaqueTextureMaterial::_ZTV24QSGOpaqueTextureMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI24QSGOpaqueTextureMaterial) -16 (int (*)(...))QSGOpaqueTextureMaterial::~QSGOpaqueTextureMaterial -24 (int (*)(...))QSGOpaqueTextureMaterial::~QSGOpaqueTextureMaterial -32 (int (*)(...))QSGOpaqueTextureMaterial::type -40 (int (*)(...))QSGOpaqueTextureMaterial::createShader -48 (int (*)(...))QSGOpaqueTextureMaterial::compare - -Class QSGOpaqueTextureMaterial - size=40 align=8 - base size=36 base align=8 -QSGOpaqueTextureMaterial (0x0x7f5a2c729bc8) 0 - vptr=((& QSGOpaqueTextureMaterial::_ZTV24QSGOpaqueTextureMaterial) + 16u) - QSGMaterial (0x0x7f5a2b0906c0) 0 - primary-for QSGOpaqueTextureMaterial (0x0x7f5a2c729bc8) - -Vtable for QSGTextureMaterial -QSGTextureMaterial::_ZTV18QSGTextureMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QSGTextureMaterial) -16 (int (*)(...))QSGTextureMaterial::~QSGTextureMaterial -24 (int (*)(...))QSGTextureMaterial::~QSGTextureMaterial -32 (int (*)(...))QSGTextureMaterial::type -40 (int (*)(...))QSGTextureMaterial::createShader -48 (int (*)(...))QSGOpaqueTextureMaterial::compare - -Class QSGTextureMaterial - size=40 align=8 - base size=36 base align=8 -QSGTextureMaterial (0x0x7f5a2c729c30) 0 - vptr=((& QSGTextureMaterial::_ZTV18QSGTextureMaterial) + 16u) - QSGOpaqueTextureMaterial (0x0x7f5a2c729c98) 0 - primary-for QSGTextureMaterial (0x0x7f5a2c729c30) - QSGMaterial (0x0x7f5a2ad40840) 0 - primary-for QSGOpaqueTextureMaterial (0x0x7f5a2c729c98) - -Vtable for QSGSimpleTextureNode -QSGSimpleTextureNode::_ZTV20QSGSimpleTextureNode: 6u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI20QSGSimpleTextureNode) -16 (int (*)(...))QSGSimpleTextureNode::~QSGSimpleTextureNode -24 (int (*)(...))QSGSimpleTextureNode::~QSGSimpleTextureNode -32 (int (*)(...))QSGNode::isSubtreeBlocked -40 (int (*)(...))QSGNode::preprocess - -Class QSGSimpleTextureNode - size=384 align=8 - base size=384 base align=8 -QSGSimpleTextureNode (0x0x7f5a2c729d00) 0 - vptr=((& QSGSimpleTextureNode::_ZTV20QSGSimpleTextureNode) + 16u) - QSGGeometryNode (0x0x7f5a2c429e38) 0 - primary-for QSGSimpleTextureNode (0x0x7f5a2c729d00) - QSGBasicGeometryNode (0x0x7f5a2c429ea0) 0 - primary-for QSGGeometryNode (0x0x7f5a2c429e38) - QSGNode (0x0x7f5a2ad408a0) 0 - primary-for QSGBasicGeometryNode (0x0x7f5a2c429ea0) - -Class QSGTextureProvider::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QSGTextureProvider::QPrivateSignal (0x0x7f5a2aa63720) 0 empty - -Vtable for QSGTextureProvider -QSGTextureProvider::_ZTV18QSGTextureProvider: 15u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI18QSGTextureProvider) -16 (int (*)(...))QSGTextureProvider::metaObject -24 (int (*)(...))QSGTextureProvider::qt_metacast -32 (int (*)(...))QSGTextureProvider::qt_metacall -40 0u -48 0u -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify -112 (int (*)(...))__cxa_pure_virtual - -Class QSGTextureProvider - size=16 align=8 - base size=16 base align=8 -QSGTextureProvider (0x0x7f5a2c429958) 0 - vptr=((& QSGTextureProvider::_ZTV18QSGTextureProvider) + 16u) - QObject (0x0x7f5a2aa636c0) 0 - primary-for QSGTextureProvider (0x0x7f5a2c429958) - -Vtable for QSGVertexColorMaterial -QSGVertexColorMaterial::_ZTV22QSGVertexColorMaterial: 7u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI22QSGVertexColorMaterial) -16 (int (*)(...))QSGVertexColorMaterial::~QSGVertexColorMaterial -24 (int (*)(...))QSGVertexColorMaterial::~QSGVertexColorMaterial -32 (int (*)(...))QSGVertexColorMaterial::type -40 (int (*)(...))QSGVertexColorMaterial::createShader -48 (int (*)(...))QSGVertexColorMaterial::compare - -Class QSGVertexColorMaterial - size=24 align=8 - base size=24 base align=8 -QSGVertexColorMaterial (0x0x7f5a2c4299c0) 0 - vptr=((& QSGVertexColorMaterial::_ZTV22QSGVertexColorMaterial) + 16u) - QSGMaterial (0x0x7f5a2aaec240) 0 - primary-for QSGVertexColorMaterial (0x0x7f5a2c4299c0) - -Class QQuickStyle - size=1 align=1 - base size=0 base align=1 -QQuickStyle (0x0x7f5a2aaec2a0) 0 empty - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/calendar/data/tst_calendarmodel.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/calendar/data/tst_calendarmodel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/calendar/data/tst_calendarmodel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/calendar/data/tst_calendarmodel.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import QtQml 2.2 import Qt.labs.calendar 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/calendar/data/tst_dayofweekrow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/calendar/data/tst_dayofweekrow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/calendar/data/tst_dayofweekrow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/calendar/data/tst_dayofweekrow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.calendar 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/calendar/data/tst_monthgrid.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/calendar/data/tst_monthgrid.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/calendar/data/tst_monthgrid.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/calendar/data/tst_monthgrid.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.calendar 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/calendar/data/tst_weeknumbercolumn.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/calendar/data/tst_weeknumbercolumn.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/calendar/data/tst_weeknumbercolumn.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/calendar/data/tst_weeknumbercolumn.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.calendar 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/controls.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/controls.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/controls.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/controls.pro 2018-03-21 07:59:29.000000000 +0000 @@ -1,7 +1,5 @@ TEMPLATE = subdirs SUBDIRS += \ default \ - fusion \ - imagine \ material \ universal diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/SignalSequenceSpy.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/SignalSequenceSpy.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/SignalSequenceSpy.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/SignalSequenceSpy.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.5 QtObject { property QtObject target: null @@ -72,15 +72,10 @@ property var __connections: [] onExpectedSequenceChanged: reset() + onTargetChanged: __setup() + onSignalsChanged: __setup() - // We may call __setup from onTargetChanged and as we would read the signals property - // inside __setup, we may be initializing the binding for signals for the first time, which - // will write the value to the property and trigger onSignalsChanged and call __setup - // again. One easy way to protect against it is to evaluate those two dependencies upfront - onTargetChanged: __setup(target, signals) - onSignalsChanged: __setup(target, signals) - - function __setup(target, signals) { + function __setup() { if (__oldTarget) { __connections.forEach(function (cx) { __oldTarget[cx.name].disconnect(cx.method) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/TestItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/TestItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/TestItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/TestItem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.5 Item { id: item diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_abstractbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_abstractbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_abstractbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_abstractbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -71,11 +71,6 @@ } Component { - id: action - Action { } - } - - Component { id: signalSpy SignalSpy { } } @@ -119,113 +114,6 @@ compare(control.implicitHeight, 220) } - function test_pressPoint_data() { - return [ - { tag: "mouse", mouse: true }, - { tag: "touch", touch: true } - ] - } - - function test_pressPoint(data) { - var control = createTemporaryObject(button, testCase, {width: 100, height: 40}) - verify(control) - - var pressXChanges = 0 - var pressYChanges = 0 - - var pressXSpy = signalSpy.createObject(control, {target: control, signalName: "pressXChanged"}) - verify(pressXSpy.valid) - - var pressYSpy = signalSpy.createObject(control, {target: control, signalName: "pressYChanged"}) - verify(pressYSpy.valid) - - compare(control.pressX, 0) - compare(control.pressY, 0) - - var touch = data.touch ? touchEvent(control) : null - - if (data.touch) - touch.press(0, control, control.width / 2, control.height / 2).commit() - else - mousePress(control, control.width / 2, control.height / 2) - compare(control.pressX, control.width / 2) - compare(control.pressY, control.height / 2) - compare(pressXSpy.count, ++pressXChanges) - compare(pressYSpy.count, ++pressYChanges) - - if (data.touch) - touch.move(0, control, control.width / 2, control.height / 2).commit() - else - mouseMove(control, control.width / 2, control.height / 2) - compare(control.pressX, control.width / 2) - compare(control.pressY, control.height / 2) - compare(pressXSpy.count, pressXChanges) - compare(pressYSpy.count, pressYChanges) - - if (data.touch) - touch.move(0, control, control.width / 4, control.height / 4).commit() - else - mouseMove(control, control.width / 4, control.height / 4) - compare(control.pressX, control.width / 4) - compare(control.pressY, control.height / 4) - compare(pressXSpy.count, ++pressXChanges) - compare(pressYSpy.count, ++pressYChanges) - - if (data.touch) - touch.move(0, control, 0, 0).commit() - else - mouseMove(control, 0, 0) - compare(control.pressX, 0) - compare(control.pressY, 0) - compare(pressXSpy.count, ++pressXChanges) - compare(pressYSpy.count, ++pressYChanges) - - if (data.touch) - touch.move(0, control, -control.width / 2, -control.height / 2).commit() - else - mouseMove(control, -control.width / 2, -control.height / 2) - compare(control.pressX, -control.width / 2) - compare(control.pressY, -control.height / 2) - compare(pressXSpy.count, ++pressXChanges) - compare(pressYSpy.count, ++pressYChanges) - - if (data.touch) - touch.release(0, control, -control.width / 2, -control.height / 2).commit() - else - mouseRelease(control, -control.width / 2, -control.height / 2) - compare(control.pressX, -control.width / 2) - compare(control.pressY, -control.height / 2) - compare(pressXSpy.count, pressXChanges) - compare(pressYSpy.count, pressYChanges) - - if (data.touch) - touch.press(0, control, control.width - 1, control.height - 1).commit() - else - mousePress(control, control.width - 1, control.height - 1) - compare(control.pressX, control.width - 1) - compare(control.pressY, control.height - 1) - compare(pressXSpy.count, ++pressXChanges) - compare(pressYSpy.count, ++pressYChanges) - - if (data.touch) - touch.move(0, control, control.width + 1, control.height + 1).commit() - else - mousePress(control, control.width + 1, control.height + 1) - compare(control.pressX, control.width + 1) - compare(control.pressY, control.height + 1) - compare(pressXSpy.count, ++pressXChanges) - compare(pressYSpy.count, ++pressYChanges) - - if (data.touch) - touch.release(0, control, control.width + 2, control.height + 2).commit() - else - mouseRelease(control, control.width + 2, control.height + 2) - compare(control.pressX, control.width + 2) - compare(control.pressY, control.height + 2) - compare(pressXSpy.count, ++pressXChanges) - compare(pressYSpy.count, ++pressYChanges) - } - function test_pressAndHold() { var control = createTemporaryObject(button, testCase, {checkable: true}) verify(control) @@ -274,611 +162,4 @@ keyRelease(data.key) compare(container.lastKeyRelease, data.result) } - - function test_icon() { - var control = createTemporaryObject(button, testCase) - verify(control) - compare(control.icon.name, "") - compare(control.icon.source, "") - compare(control.icon.width, 0) - compare(control.icon.height, 0) - compare(control.icon.color, "#00000000") - - var iconSpy = signalSpy.createObject(control, { target: control, signalName: "iconChanged"} ) - verify(iconSpy.valid) - - control.icon.name = "test-name" - compare(control.icon.name, "test-name") - compare(iconSpy.count, 1) - - control.icon.source = "qrc:/test-source" - compare(control.icon.source, "qrc:/test-source") - compare(iconSpy.count, 2) - - control.icon.width = 32 - compare(control.icon.width, 32) - compare(iconSpy.count, 3) - - control.icon.height = 32 - compare(control.icon.height, 32) - compare(iconSpy.count, 4) - - control.icon.color = "#ff0000" - compare(control.icon.color, "#ff0000") - compare(iconSpy.count, 5) - } - - function test_action_data() { - return [ - { tag: "implicit text", property: "text", - initButton: undefined, initAction: "Action", - assignExpected: "Action", assignChanged: true, - resetExpected: "", resetChanged: true }, - { tag: "explicit text", property: "text", - initButton: "Button", initAction: "Action", - assignExpected: "Button", assignChanged: false, - resetExpected: "Button", resetChanged: false }, - { tag: "empty button text", property: "text", - initButton: "", initAction: "Action", - assignExpected: "", assignChanged: false, - resetExpected: "", resetChanged: false }, - { tag: "empty action text", property: "text", - initButton: "Button", initAction: "", - assignExpected: "Button", assignChanged: false, - resetExpected: "Button", resetChanged: false }, - { tag: "empty both text", property: "text", - initButton: undefined, initAction: "", - assignExpected: "", assignChanged: false, - resetExpected: "", resetChanged: false }, - - { tag: "modify button text", property: "text", - initButton: undefined, initAction: "Action", - assignExpected: "Action", assignChanged: true, - modifyButton: "Button2", - modifyButtonExpected: "Button2", modifyButtonChanged: true, - resetExpected: "Button2", resetChanged: false }, - { tag: "modify implicit action text", property: "text", - initButton: undefined, initAction: "Action", - assignExpected: "Action", assignChanged: true, - modifyAction: "Action2", - modifyActionExpected: "Action2", modifyActionChanged: true, - resetExpected: "", resetChanged: true }, - { tag: "modify explicit action text", property: "text", - initButton: "Button", initAction: "Action", - assignExpected: "Button", assignChanged: false, - modifyAction: "Action2", - modifyActionExpected: "Button", modifyActionChanged: false, - resetExpected: "Button", resetChanged: false }, - ] - } - - function test_action(data) { - var control = createTemporaryObject(button, testCase) - verify(control) - control[data.property] = data.initButton - - var act = action.createObject(control) - act[data.property] = data.initAction - - var spy = signalSpy.createObject(control, {target: control, signalName: data.property + "Changed"}) - verify(spy.valid) - - // assign action - spy.clear() - control.action = act - compare(control[data.property], data.assignExpected) - compare(spy.count, data.assignChanged ? 1 : 0) - - // modify button - if (data.hasOwnProperty("modifyButton")) { - spy.clear() - control[data.property] = data.modifyButton - compare(control[data.property], data.modifyButtonExpected) - compare(spy.count, data.modifyButtonChanged ? 1 : 0) - } - - // modify action - if (data.hasOwnProperty("modifyAction")) { - spy.clear() - act[data.property] = data.modifyAction - compare(control[data.property], data.modifyActionExpected) - compare(spy.count, data.modifyActionChanged ? 1 : 0) - } - - // reset action - spy.clear() - control.action = null - compare(control[data.property], data.resetExpected) - compare(spy.count, data.resetChanged ? 1 : 0) - } - - function test_actionIcon_data() { - var data = [] - - // Save duplicating the rows by reusing them with different properties of the same type. - // This means that the first loop will test icon.name and the second one will test icon.source. - var stringPropertyValueSuffixes = [ - { propertyName: "name", valueSuffix: "IconName" }, - { propertyName: "source", valueSuffix: "IconSource" } - ] - - for (var i = 0; i < stringPropertyValueSuffixes.length; ++i) { - var propertyName = stringPropertyValueSuffixes[i].propertyName - var valueSuffix = stringPropertyValueSuffixes[i].valueSuffix - - var buttonPropertyValue = "Button" + valueSuffix - var buttonPropertyValue2 = "Button" + valueSuffix + "2" - var actionPropertyValue = "Action" + valueSuffix - var actionPropertyValue2 = "Action" + valueSuffix + "2" - - data.push({ tag: "implicit " + propertyName, property: propertyName, - initButton: undefined, initAction: actionPropertyValue, - assignExpected: actionPropertyValue, assignChanged: true, - resetExpected: "", resetChanged: true }) - data.push({ tag: "explicit " + propertyName, property: propertyName, - initButton: buttonPropertyValue, initAction: actionPropertyValue, - assignExpected: buttonPropertyValue, assignChanged: false, - resetExpected: buttonPropertyValue, resetChanged: false }) - data.push({ tag: "empty button " + propertyName, property: propertyName, - initButton: "", initAction: actionPropertyValue, - assignExpected: "", assignChanged: false, - resetExpected: "", resetChanged: false }) - data.push({ tag: "empty action " + propertyName, property: propertyName, - initButton: buttonPropertyValue, initAction: "", - assignExpected: buttonPropertyValue, assignChanged: false, - resetExpected: buttonPropertyValue, resetChanged: false }) - data.push({ tag: "empty both " + propertyName, property: propertyName, - initButton: undefined, initAction: "", - assignExpected: "", assignChanged: false, - resetExpected: "", resetChanged: false }) - data.push({ tag: "modify button " + propertyName, property: propertyName, - initButton: undefined, initAction: actionPropertyValue, - assignExpected: actionPropertyValue, assignChanged: true, - modifyButton: buttonPropertyValue2, - modifyButtonExpected: buttonPropertyValue2, modifyButtonChanged: true, - resetExpected: buttonPropertyValue2, resetChanged: false }) - data.push({ tag: "modify implicit action " + propertyName, property: propertyName, - initButton: undefined, initAction: actionPropertyValue, - assignExpected: actionPropertyValue, assignChanged: true, - modifyAction: actionPropertyValue2, - modifyActionExpected: actionPropertyValue2, modifyActionChanged: true, - resetExpected: "", resetChanged: true }) - data.push({ tag: "modify explicit action " + propertyName, property: propertyName, - initButton: buttonPropertyValue, initAction: actionPropertyValue, - assignExpected: buttonPropertyValue, assignChanged: false, - modifyAction: actionPropertyValue2, - modifyActionExpected: buttonPropertyValue, modifyActionChanged: false, - resetExpected: buttonPropertyValue, resetChanged: false }) - } - - var intPropertyNames = [ - "width", - "height", - ] - - for (i = 0; i < intPropertyNames.length; ++i) { - propertyName = intPropertyNames[i] - - buttonPropertyValue = 20 - buttonPropertyValue2 = 21 - actionPropertyValue = 40 - actionPropertyValue2 = 41 - var defaultValue = 0 - - data.push({ tag: "implicit " + propertyName, property: propertyName, - initButton: undefined, initAction: actionPropertyValue, - assignExpected: actionPropertyValue, assignChanged: true, - resetExpected: defaultValue, resetChanged: true }) - data.push({ tag: "explicit " + propertyName, property: propertyName, - initButton: buttonPropertyValue, initAction: actionPropertyValue, - assignExpected: buttonPropertyValue, assignChanged: false, - resetExpected: buttonPropertyValue, resetChanged: false }) - data.push({ tag: "default button " + propertyName, property: propertyName, - initButton: defaultValue, initAction: actionPropertyValue, - assignExpected: defaultValue, assignChanged: false, - resetExpected: defaultValue, resetChanged: false }) - data.push({ tag: "default action " + propertyName, property: propertyName, - initButton: buttonPropertyValue, initAction: defaultValue, - assignExpected: buttonPropertyValue, assignChanged: false, - resetExpected: buttonPropertyValue, resetChanged: false }) - data.push({ tag: "default both " + propertyName, property: propertyName, - initButton: undefined, initAction: defaultValue, - assignExpected: defaultValue, assignChanged: false, - resetExpected: defaultValue, resetChanged: false }) - data.push({ tag: "modify button " + propertyName, property: propertyName, - initButton: undefined, initAction: actionPropertyValue, - assignExpected: actionPropertyValue, assignChanged: true, - modifyButton: buttonPropertyValue2, - modifyButtonExpected: buttonPropertyValue2, modifyButtonChanged: true, - resetExpected: buttonPropertyValue2, resetChanged: false }) - data.push({ tag: "modify implicit action " + propertyName, property: propertyName, - initButton: undefined, initAction: actionPropertyValue, - assignExpected: actionPropertyValue, assignChanged: true, - modifyAction: actionPropertyValue2, - modifyActionExpected: actionPropertyValue2, modifyActionChanged: true, - resetExpected: defaultValue, resetChanged: true }) - data.push({ tag: "modify explicit action " + propertyName, property: propertyName, - initButton: buttonPropertyValue, initAction: actionPropertyValue, - assignExpected: buttonPropertyValue, assignChanged: false, - modifyAction: actionPropertyValue2, - modifyActionExpected: buttonPropertyValue, modifyActionChanged: false, - resetExpected: buttonPropertyValue, resetChanged: false }) - } - - propertyName = "color" - buttonPropertyValue = "#aa0000" - buttonPropertyValue2 = "#ff0000" - actionPropertyValue = "#0000aa" - actionPropertyValue2 = "#0000ff" - defaultValue = "#00000000" - - data.push({ tag: "implicit " + propertyName, property: propertyName, - initButton: undefined, initAction: actionPropertyValue, - assignExpected: actionPropertyValue, assignChanged: true, - resetExpected: defaultValue, resetChanged: true }) - data.push({ tag: "explicit " + propertyName, property: propertyName, - initButton: buttonPropertyValue, initAction: actionPropertyValue, - assignExpected: buttonPropertyValue, assignChanged: false, - resetExpected: buttonPropertyValue, resetChanged: false }) - data.push({ tag: "default button " + propertyName, property: propertyName, - initButton: defaultValue, initAction: actionPropertyValue, - assignExpected: defaultValue, assignChanged: false, - resetExpected: defaultValue, resetChanged: false }) - data.push({ tag: "default action " + propertyName, property: propertyName, - initButton: buttonPropertyValue, initAction: defaultValue, - assignExpected: buttonPropertyValue, assignChanged: false, - resetExpected: buttonPropertyValue, resetChanged: false }) - data.push({ tag: "default both " + propertyName, property: propertyName, - initButton: undefined, initAction: defaultValue, - assignExpected: defaultValue, assignChanged: false, - resetExpected: defaultValue, resetChanged: false }) - data.push({ tag: "modify button " + propertyName, property: propertyName, - initButton: undefined, initAction: actionPropertyValue, - assignExpected: actionPropertyValue, assignChanged: true, - modifyButton: buttonPropertyValue2, - modifyButtonExpected: buttonPropertyValue2, modifyButtonChanged: true, - resetExpected: buttonPropertyValue2, resetChanged: false }) - data.push({ tag: "modify implicit action " + propertyName, property: propertyName, - initButton: undefined, initAction: actionPropertyValue, - assignExpected: actionPropertyValue, assignChanged: true, - modifyAction: actionPropertyValue2, - modifyActionExpected: actionPropertyValue2, modifyActionChanged: true, - resetExpected: defaultValue, resetChanged: true }) - data.push({ tag: "modify explicit action " + propertyName, property: propertyName, - initButton: buttonPropertyValue, initAction: actionPropertyValue, - assignExpected: buttonPropertyValue, assignChanged: false, - modifyAction: actionPropertyValue2, - modifyActionExpected: buttonPropertyValue, modifyActionChanged: false, - resetExpected: buttonPropertyValue, resetChanged: false }) - - return data; - } - - function test_actionIcon(data) { - var control = createTemporaryObject(button, testCase) - verify(control) - control.icon[data.property] = data.initButton - - var act = action.createObject(control) - act.icon[data.property] = data.initAction - - var spy = signalSpy.createObject(control, {target: control, signalName: "iconChanged"}) - verify(spy.valid) - - // assign action - spy.clear() - control.action = act - compare(control.icon[data.property], data.assignExpected) - compare(spy.count, data.assignChanged ? 1 : 0) - - // modify button - if (data.hasOwnProperty("modifyButton")) { - spy.clear() - control.icon[data.property] = data.modifyButton - compare(control.icon[data.property], data.modifyButtonExpected) - compare(spy.count, data.modifyButtonChanged ? 1 : 0) - } - - // modify action - if (data.hasOwnProperty("modifyAction")) { - spy.clear() - act.icon[data.property] = data.modifyAction - compare(control.icon[data.property], data.modifyActionExpected) - compare(spy.count, data.modifyActionChanged ? 1 : 0) - } - - // reset action - spy.clear() - control.action = null - compare(control.icon[data.property], data.resetExpected) - compare(spy.count, data.resetChanged ? 1 : 0) - } - - Component { - id: actionButton - AbstractButton { - action: Action { - text: "Default" - icon.name: "default" - icon.source: "qrc:/icons/default.png" - checkable: true - checked: true - enabled: false - } - } - } - - function test_actionButton() { - var control = createTemporaryObject(actionButton, testCase) - verify(control) - - // initial values - compare(control.text, "Default") - compare(control.checkable, true) - compare(control.checked, true) - compare(control.enabled, false) - - var textSpy = signalSpy.createObject(control, { target: control, signalName: "textChanged" }) - verify(textSpy.valid) - - // changes via action - control.action.text = "Action" - control.action.checkable = false - control.action.checked = false - control.action.enabled = true - compare(control.text, "Action") // propagates - compare(control.checkable, false) // propagates - compare(control.checked, false) // propagates - compare(control.enabled, true) // propagates - compare(textSpy.count, 1) - - // changes via button - control.text = "Button" - control.checkable = true - control.checked = true - control.enabled = false - compare(control.text, "Button") - compare(control.checkable, true) - compare(control.checked, true) - compare(control.enabled, false) - compare(control.action.text, "Action") // does NOT propagate - compare(control.action.checkable, true) // propagates - compare(control.action.checked, true) // propagates - compare(control.action.enabled, true) // does NOT propagate - compare(textSpy.count, 2) - - // remove the action so that only the button's properties are left - control.action = null - compare(control.text, "Button") - compare(textSpy.count, 2) - - // setting an action while button has a particular property set - // shouldn't cause a change in the button's effective property value - var secondAction = createTemporaryObject(action, testCase) - verify(secondAction) - secondAction.text = "SecondAction" - control.action = secondAction - compare(control.text, "Button") - compare(textSpy.count, 2) - - // test setting an action whose properties aren't set - var thirdAction = createTemporaryObject(action, testCase) - verify(thirdAction) - control.action = thirdAction - compare(control.text, "Button") - compare(textSpy.count, 2) - } - - Component { - id: checkableButton - AbstractButton { - checkable: true - action: Action {} - } - } - - function test_checkable_button() { - var control = createTemporaryObject(checkableButton, testCase) - verify(control) - control.checked = false - control.forceActiveFocus() - verify(control.activeFocus) - verify(!control.checked) - verify(!control.action.checked) - - keyPress(Qt.Key_Space) - keyRelease(Qt.Key_Space) - - compare(control.action.checked, true) - compare(control.checked, true) - - keyPress(Qt.Key_Space) - - compare(control.action.checked, true) - compare(control.checked, true) - - keyRelease(Qt.Key_Space) - - compare(control.action.checked, false) - compare(control.checked, false) - - var checkedSpy = signalSpy.createObject(control, {target: control.action, signalName: "checkedChanged"}) - var toggledSpy = signalSpy.createObject(control, {target: control, signalName: "toggled"}) - var actionToggledSpy = signalSpy.createObject(control, {target: control.action, signalName: "toggled"}) - - verify(checkedSpy.valid) - verify(toggledSpy.valid) - verify(actionToggledSpy.valid) - - mousePress(control) - - compare(control.action.checked, false) - compare(control.checked, false) - - mouseRelease(control) - - checkedSpy.wait() - compare(checkedSpy.count, 1) - compare(actionToggledSpy.count, 1) - compare(toggledSpy.count, 1) - - compare(control.action.checked, true) - compare(control.checked, true) - - mousePress(control) - mouseRelease(control) - - compare(control.checked, false) - compare(control.action.checked, false) - } - - function test_trigger_data() { - return [ - {tag: "click", click: true, button: true, action: true, clicked: true, triggered: true}, - {tag: "click disabled button", click: true, button: false, action: true, clicked: false, triggered: false}, - {tag: "click disabled action", click: true, button: true, action: false, clicked: true, triggered: false}, - {tag: "trigger", trigger: true, button: true, action: true, clicked: true, triggered: true}, - {tag: "trigger disabled button", trigger: true, button: false, action: true, clicked: false, triggered: true}, - {tag: "trigger disabled action", trigger: true, button: true, action: false, clicked: false, triggered: false} - ] - } - - function test_trigger(data) { - var control = createTemporaryObject(actionButton, testCase, {"action.enabled": data.action, "enabled": data.button}) - verify(control) - - compare(control.enabled, data.button) - compare(control.action.enabled, data.action) - - var buttonSpy = signalSpy.createObject(control, {target: control, signalName: "clicked"}) - verify(buttonSpy.valid) - - var actionSpy = signalSpy.createObject(control, {target: control.action, signalName: "triggered"}) - verify(actionSpy.valid) - - if (data.click) - mouseClick(control) - else if (data.trigger) - control.action.trigger() - - compare(buttonSpy.count, data.clicked ? 1 : 0) - compare(actionSpy.count, data.triggered ? 1 : 0) - } - - function test_mnemonic() { - if (Qt.platform.os === "osx" || Qt.platform.os === "macos") - skip("Mnemonics are not used on macOS") - - var control = createTemporaryObject(button, testCase) - verify(control) - - control.text = "&Hello" - compare(control.text, "&Hello") - - var clickSpy = signalSpy.createObject(control, {target: control, signalName: "clicked"}) - verify(clickSpy.valid) - - keyClick(Qt.Key_H, Qt.AltModifier) - compare(clickSpy.count, 1) - - control.visible = false - keyClick(Qt.Key_H, Qt.AltModifier) - compare(clickSpy.count, 1) - - control.visible = true - keyClick(Qt.Key_H, Qt.AltModifier) - compare(clickSpy.count, 2) - - control.text = "Te&st" - compare(control.text, "Te&st") - - keyClick(Qt.Key_H, Qt.AltModifier) - compare(clickSpy.count, 2) - - keyClick(Qt.Key_S, Qt.AltModifier) - compare(clickSpy.count, 3) - - control.visible = false - control.text = "&Hidden" - keyClick(Qt.Key_H, Qt.AltModifier) - compare(clickSpy.count, 3) - - control.visible = true - keyClick(Qt.Key_H, Qt.AltModifier) - compare(clickSpy.count, 4) - - control.text = undefined - control.action = action.createObject(control, {text: "&Action"}) - - var actionSpy = signalSpy.createObject(control, {target: control.action, signalName: "triggered"}) - verify(actionSpy.valid) - - keyClick(Qt.Key_A, Qt.AltModifier) - compare(actionSpy.count, 1) - compare(clickSpy.count, 5) - - // ungrab on destruction (don't crash) - control.Component.onDestruction.connect(function() { control = null }) - control.destroy() - wait(0) - verify(!control) - keyClick(Qt.Key_H, Qt.AltModifier) - } - - Component { - id: actionGroup - ActionGroup { - Action { id: action1; checkable: true; checked: true } - Action { id: action2; checkable: true } - Action { id: action3; checkable: true } - } - } - - function test_actionGroup() { - var group = createTemporaryObject(actionGroup, testCase) - verify(group) - - var button1 = createTemporaryObject(button, testCase, {action: group.actions[0], width: 10, height: 10}) - var button2 = createTemporaryObject(button, testCase, {action: group.actions[1], width: 10, height: 10, y: 10}) - var button3 = createTemporaryObject(button, testCase, {action: group.actions[2], width: 10, height: 10, y: 20}) - - verify(button1) - compare(button1.checked, true) - compare(button1.action.checked, true) - - verify(button2) - compare(button2.checked, false) - compare(button2.action.checked, false) - - verify(button3) - compare(button3.checked, false) - compare(button3.action.checked, false) - - mouseClick(button2) - - compare(button1.checked, false) - compare(button1.action.checked, false) - - compare(button2.checked, true) - compare(button2.action.checked, true) - - compare(button3.checked, false) - compare(button3.action.checked, false) - } - - function test_clickedAfterLongPress() { - var control = createTemporaryObject(button, testCase, { text: "Hello" }) - verify(control) - - var clickedSpy = signalSpy.createObject(control, { target: control, signalName: "clicked" }) - verify(clickedSpy.valid) - - mousePress(control) - // Ensure that clicked is emitted when no handler is defined for the pressAndHold() signal. - // Note that even though signal spies aren't considered in QObject::isSignalConnected(), - // we can't use one here to check for pressAndHold(), because otherwise clicked() won't be emitted. - wait(Qt.styleHints.mousePressAndHoldInterval + 100) - mouseRelease(control) - compare(clickedSpy.count, 1) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_actiongroup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_actiongroup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_actiongroup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_actiongroup.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,400 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 - -TestCase { - id: testCase - width: 200 - height: 200 - visible: true - when: windowShown - name: "ActionGroup" - - Component { - id: actionGroup - ActionGroup { } - } - - Component { - id: nonExclusiveGroup - ActionGroup { exclusive: false } - } - - Component { - id: declarativeGroup - ActionGroup { - Action { text: "First" } - Action { text: "Second" } - Action { text: "Third" } - } - } - - Component { - id: signalSpy - SignalSpy { } - } - - function test_null() { - var group = createTemporaryObject(actionGroup, testCase) - verify(group) - - group.addAction(null) - group.removeAction(null) - } - - Component { - id: action - Action { } - } - - function test_defaults() { - var group = createTemporaryObject(actionGroup, testCase) - verify(group) - compare(group.actions.length, 0) - compare(group.checkedAction, null) - compare(group.exclusive, true) - } - - function test_current() { - var group = createTemporaryObject(actionGroup, testCase) - verify(group) - - var checkedActionSpy = createTemporaryObject(signalSpy, testCase, {target: group, signalName: "checkedActionChanged"}) - verify(checkedActionSpy.valid) - verify(!group.checkedAction) - - var action1 = createTemporaryObject(action, testCase, {checked: true}) - var action2 = createTemporaryObject(action, testCase, {checked: false}) - var action3 = createTemporaryObject(action, testCase, {checked: true, objectName: "3"}) - - // add checked - group.addAction(action1) - compare(group.checkedAction, action1) - compare(action1.checked, true) - compare(action2.checked, false) - compare(action3.checked, true) - compare(checkedActionSpy.count, 1) - - // add non-checked - group.addAction(action2) - compare(group.checkedAction, action1) - compare(action1.checked, true) - compare(action2.checked, false) - compare(action3.checked, true) - compare(checkedActionSpy.count, 1) - - // add checked - group.addAction(action3) - compare(group.checkedAction, action3) - compare(action1.checked, false) - compare(action2.checked, false) - compare(action3.checked, true) - compare(checkedActionSpy.count, 2) - - // change current - group.checkedAction = action2 - compare(group.checkedAction, action2) - compare(action1.checked, false) - compare(action2.checked, true) - compare(action3.checked, false) - compare(checkedActionSpy.count, 3) - - // check - action1.checked = true - compare(group.checkedAction, action1) - compare(action1.checked, true) - compare(action2.checked, false) - compare(action3.checked, false) - compare(checkedActionSpy.count, 4) - - // remove non-checked - group.removeAction(action2) - compare(group.checkedAction, action1) - compare(action1.checked, true) - compare(action2.checked, false) - compare(action3.checked, false) - compare(checkedActionSpy.count, 4) - - // remove checked - group.removeAction(action1) - verify(!group.checkedAction) - compare(action1.checked, false) - compare(action2.checked, false) - compare(action3.checked, false) - compare(checkedActionSpy.count, 5) - } - - function test_actions() { - var group = createTemporaryObject(actionGroup, testCase) - verify(group) - - var actionsSpy = createTemporaryObject(signalSpy, testCase, {target: group, signalName: "actionsChanged"}) - verify(actionsSpy.valid) - - compare(group.actions.length, 0) - compare(group.checkedAction, null) - - var action1 = createTemporaryObject(action, testCase, {checked: true}) - var action2 = createTemporaryObject(action, testCase, {checked: false}) - - group.actions = [action1, action2] - compare(group.actions.length, 2) - compare(group.actions[0], action1) - compare(group.actions[1], action2) - compare(group.checkedAction, action1) - compare(actionsSpy.count, 2) - - var action3 = createTemporaryObject(action, testCase, {checked: true}) - - group.addAction(action3) - compare(group.actions.length, 3) - compare(group.actions[0], action1) - compare(group.actions[1], action2) - compare(group.actions[2], action3) - compare(group.checkedAction, action3) - compare(actionsSpy.count, 3) - - group.removeAction(action1) - compare(group.actions.length, 2) - compare(group.actions[0], action2) - compare(group.actions[1], action3) - compare(group.checkedAction, action3) - compare(actionsSpy.count, 4) - - group.actions = [] - compare(group.actions.length, 0) - tryCompare(group, "checkedAction", null) - compare(actionsSpy.count, 5) - } - - function test_declarative() { - var group = createTemporaryObject(declarativeGroup, testCase) - verify(group) - - compare(group.actions.length, 3) - compare(group.actions[0].text, "First") - compare(group.actions[1].text, "Second") - compare(group.actions[2].text, "Third") - } - - function test_triggered_data() { - return [ - {tag: "exclusive", exclusive: true}, - {tag: "non-exclusive", exclusive: false} - ] - } - - function test_triggered(data) { - var group = createTemporaryObject(actionGroup, testCase, {exclusive: data.exclusive}) - verify(group) - - var triggeredSpy = createTemporaryObject(signalSpy, testCase, {target: group, signalName: "triggered"}) - verify(triggeredSpy.valid) - - var action1 = createTemporaryObject(action, testCase) - var action2 = createTemporaryObject(action, testCase) - - group.addAction(action1) - group.addAction(action2) - - action1.triggered() - compare(triggeredSpy.count, 1) - compare(triggeredSpy.signalArguments[0][0], action1) - - action2.triggered() - compare(triggeredSpy.count, 2) - compare(triggeredSpy.signalArguments[1][0], action2) - } - - Component { - id: attachedGroup - Item { - property ActionGroup group: ActionGroup { id: group } - property Action action1: Action { ActionGroup.group: group } - property Action action2: Action { ActionGroup.group: group } - property Action action3: Action { ActionGroup.group: group } - } - } - - function test_attached() { - var container = createTemporaryObject(attachedGroup, testCase) - verify(container) - - verify(!container.group.checkedAction) - - container.action1.checked = true - compare(container.group.checkedAction, container.action1) - compare(container.action1.checked, true) - compare(container.action2.checked, false) - compare(container.action3.checked, false) - - container.action2.checked = true - compare(container.group.checkedAction, container.action2) - compare(container.action1.checked, false) - compare(container.action2.checked, true) - compare(container.action3.checked, false) - - container.action3.checked = true - compare(container.group.checkedAction, container.action3) - compare(container.action1.checked, false) - compare(container.action2.checked, false) - compare(container.action3.checked, true) - } - - function test_actionDestroyed() { - var group = createTemporaryObject(actionGroup, testCase) - verify(group) - - var actionsSpy = createTemporaryObject(signalSpy, testCase, {target: group, signalName: "actionsChanged"}) - verify(actionsSpy.valid) - - var action1 = createTemporaryObject(action, testCase, {objectName: "action1", checked: true}) - - group.addAction(action1) - compare(group.actions.length, 1) - compare(group.actions[0], action1) - compare(group.checkedAction, action1) - compare(actionsSpy.count, 1) - - action1.destroy() - wait(0) - compare(group.actions.length, 0) - compare(group.checkedAction, null) - compare(actionsSpy.count, 2) - } - - function test_nonExclusive() { - var group = createTemporaryObject(nonExclusiveGroup, testCase) - verify(group) - - var action1 = createTemporaryObject(action, testCase, {checked: true}) - group.addAction(action1) - compare(action1.checked, true) - compare(group.checkedAction, null) - - var action2 = createTemporaryObject(action, testCase, {checked: true}) - group.addAction(action2) - compare(action1.checked, true) - compare(action2.checked, true) - compare(group.checkedAction, null) - - action1.checked = false - compare(action1.checked, false) - compare(action2.checked, true) - compare(group.checkedAction, null) - - action2.checked = false - compare(action1.checked, false) - compare(action2.checked, false) - compare(group.checkedAction, null) - - action1.checked = true - compare(action1.checked, true) - compare(action2.checked, false) - compare(group.checkedAction, null) - - action2.checked = true - compare(action1.checked, true) - compare(action2.checked, true) - compare(group.checkedAction, null) - } - - function test_enabled() { - var group = createTemporaryObject(actionGroup, testCase) - verify(group) - - compare(group.enabled, true) - - var action1 = createTemporaryObject(action, testCase) - var action2 = createTemporaryObject(action, testCase) - compare(action1.enabled, true) - compare(action2.enabled, true) - - var action1Spy = createTemporaryObject(signalSpy, testCase, {target: action1, signalName: "enabledChanged"}) - var action2Spy = createTemporaryObject(signalSpy, testCase, {target: action2, signalName: "enabledChanged"}) - verify(action1Spy.valid && action2Spy.valid) - - group.addAction(action1) - compare(action1.enabled, true) - compare(action2.enabled, true) - compare(action1Spy.count, 0) - compare(action2Spy.count, 0) - - group.enabled = false - compare(action1.enabled, false) - compare(action2.enabled, true) - compare(action1Spy.count, 1) - compare(action1Spy.signalArguments[0][0], false) - compare(action2Spy.count, 0) - - group.addAction(action2) - compare(action1.enabled, false) - compare(action2.enabled, false) - compare(action1Spy.count, 1) - compare(action2Spy.count, 1) - compare(action2Spy.signalArguments[0][0], false) - - action1.enabled = false - compare(action1.enabled, false) - compare(action1Spy.count, 2) - compare(action1Spy.signalArguments[1][0], false) - compare(action2Spy.count, 1) - - group.enabled = true - compare(action1.enabled, false) - compare(action2.enabled, true) - compare(action1Spy.count, 2) - compare(action2Spy.count, 2) - compare(action2Spy.signalArguments[1][0], true) - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_action.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_action.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_action.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_action.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,197 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T - -TestCase { - id: testCase - width: 400 - height: 400 - visible: true - when: windowShown - name: "Action" - - Component { - id: component - Action { } - } - - Component { - id: signalSpy - SignalSpy { } - } - - function test_enabled() { - var action = createTemporaryObject(component, testCase) - verify(action) - - var spy = createTemporaryObject(signalSpy, testCase, {target: action, signalName: "triggered"}) - verify(spy.valid) - - action.trigger() - compare(spy.count, 1) - - action.enabled = false - action.trigger() - compare(spy.count, 1) - - action.enabled = undefined // reset - action.trigger() - compare(spy.count, 2) - } - - Component { - id: buttonAndMenu - Item { - property alias button: button - property alias menu: menu - property alias menuItem: menuItem - property alias action: sharedAction - property var lastSource - Action { - id: sharedAction - text: "Shared" - shortcut: "Ctrl+B" - onTriggered: lastSource = source - } - Button { - id: button - action: sharedAction - Menu { - id: menu - MenuItem { - id: menuItem - action: sharedAction - } - } - } - } - } - - function test_shared() { - var container = createTemporaryObject(buttonAndMenu, testCase) - verify(container) - - keyClick(Qt.Key_B, Qt.ControlModifier) - compare(container.lastSource, container.button) - - container.menu.open() - keyClick(Qt.Key_B, Qt.ControlModifier) - compare(container.lastSource, container.menuItem) - - tryVerify(function() { return !container.menu.visible }) - keyClick(Qt.Key_B, Qt.ControlModifier) - compare(container.lastSource, container.button) - - container.button.visible = false - keyClick(Qt.Key_B, Qt.ControlModifier) - compare(container.lastSource, container.action) - } - - Component { - id: actionAndRepeater - Item { - property alias action: testAction - Action { - id: testAction - shortcut: "Ctrl+A" - } - Repeater { - model: 1 - Button { - action: testAction - } - } - } - } - - function test_repeater() { - var container = createTemporaryObject(actionAndRepeater, testCase) - verify(container) - - var spy = signalSpy.createObject(container, {target: container.action, signalName: "triggered"}) - verify(spy.valid) - - keyClick(Qt.Key_A, Qt.ControlModifier) - compare(spy.count, 1) - } - - Component { - id: shortcutBinding - Item { - Action { - id: action - shortcut: StandardKey.Copy - } - - Shortcut { - id: indirectShortcut - sequence: action.shortcut - } - - Shortcut { - id: directShortcut - sequence: StandardKey.Copy - } - - property alias indirect: indirectShortcut; - property alias direct: directShortcut - } - } - - function test_shortcutBinding() { - var container = createTemporaryObject(shortcutBinding, testCase); - verify(container) - compare(container.indirect.nativeText, container.direct.nativeText); - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_busyindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_busyindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_busyindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_busyindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_buttongroup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_buttongroup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_buttongroup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_buttongroup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -66,11 +66,6 @@ } Component { - id: nonExclusiveGroup - ButtonGroup { exclusive: false } - } - - Component { id: signalSpy SignalSpy { } } @@ -93,15 +88,6 @@ QtObject { } } - function test_defaults() { - var group = createTemporaryObject(buttonGroup, testCase) - verify(group) - compare(group.buttons.length, 0) - compare(group.checkedButton, null) - compare(group.exclusive, true) - compare(group.checkState, Qt.Unchecked) - } - function test_current() { var group = createTemporaryObject(buttonGroup, testCase) verify(group) @@ -214,15 +200,8 @@ compare(buttonsSpy.count, 5) } - function test_clicked_data() { - return [ - {tag: "exclusive", exclusive: true}, - {tag: "non-exclusive", exclusive: false} - ] - } - - function test_clicked(data) { - var group = createTemporaryObject(buttonGroup, testCase, {exclusive: data.exclusive}) + function test_clicked() { + var group = createTemporaryObject(buttonGroup, testCase) verify(group) var clickedSpy = createTemporaryObject(signalSpy, testCase, {target: group, signalName: "clicked"}) @@ -368,69 +347,6 @@ compare(container.group.checkedButton.objectName, "0") } - function test_nonExclusive() { - var group = createTemporaryObject(nonExclusiveGroup, testCase) - verify(group) - - compare(group.checkState, Qt.Unchecked) - - var button1 = createTemporaryObject(button, testCase, {checked: true}) - group.addButton(button1) - compare(button1.checked, true) - compare(group.checkedButton, null) - compare(group.checkState, Qt.Checked) - - var button2 = createTemporaryObject(button, testCase, {checked: true}) - group.addButton(button2) - compare(button1.checked, true) - compare(button2.checked, true) - compare(group.checkedButton, null) - compare(group.checkState, Qt.Checked) - - var button3 = createTemporaryObject(button, testCase, {checked: false}) - group.addButton(button3) - compare(button1.checked, true) - compare(button2.checked, true) - compare(button3.checked, false) - compare(group.checkedButton, null) - compare(group.checkState, Qt.PartiallyChecked) - - button1.checked = false - compare(button1.checked, false) - compare(button2.checked, true) - compare(button3.checked, false) - compare(group.checkedButton, null) - compare(group.checkState, Qt.PartiallyChecked) - - button2.checked = false - compare(button1.checked, false) - compare(button2.checked, false) - compare(button3.checked, false) - compare(group.checkedButton, null) - compare(group.checkState, Qt.Unchecked) - - button1.checked = true - compare(button1.checked, true) - compare(button2.checked, false) - compare(button3.checked, false) - compare(group.checkedButton, null) - compare(group.checkState, Qt.PartiallyChecked) - - button2.checked = true - compare(button1.checked, true) - compare(button2.checked, true) - compare(button3.checked, false) - compare(group.checkedButton, null) - compare(group.checkState, Qt.PartiallyChecked) - - button3.checked = true - compare(button1.checked, true) - compare(button2.checked, true) - compare(button3.checked, true) - compare(group.checkedButton, null) - compare(group.checkState, Qt.Checked) - } - Component { id: checkedButtonColumn Column { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -430,83 +430,4 @@ control.highlighted = true verify(control.highlighted) } - - function test_spacing() { - var control = createTemporaryObject(button, testCase, { text: "Some long, long, long text" }) - verify(control) - verify(control.contentItem.implicitWidth + control.leftPadding + control.rightPadding > control.background.implicitWidth) - - var textLabel = findChild(control.contentItem, "label") - verify(textLabel) - - // The implicitWidth of the IconLabel that all buttons use as their contentItem - // should be equal to the implicitWidth of the Text while no icon is set. - compare(control.contentItem.implicitWidth, textLabel.implicitWidth) - - // That means that spacing shouldn't affect it. - control.spacing += 100 - compare(control.contentItem.implicitWidth, textLabel.implicitWidth) - - // The implicitWidth of the Button itself should, therefore, also never include spacing while no icon is set. - compare(control.implicitWidth, textLabel.implicitWidth + control.leftPadding + control.rightPadding) - } - - function test_display_data() { - return [ - { "tag": "IconOnly", display: Button.IconOnly }, - { "tag": "TextOnly", display: Button.TextOnly }, - { "tag": "TextUnderIcon", display: Button.TextUnderIcon }, - { "tag": "TextBesideIcon", display: Button.TextBesideIcon }, - { "tag": "IconOnly, mirrored", display: Button.IconOnly, mirrored: true }, - { "tag": "TextOnly, mirrored", display: Button.TextOnly, mirrored: true }, - { "tag": "TextUnderIcon, mirrored", display: Button.TextUnderIcon, mirrored: true }, - { "tag": "TextBesideIcon, mirrored", display: Button.TextBesideIcon, mirrored: true } - ] - } - - function test_display(data) { - var control = createTemporaryObject(button, testCase, { - text: "Button", - display: data.display, - "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png", - "LayoutMirroring.enabled": !!data.mirrored - }) - verify(control) - compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png") - - var iconImage = findChild(control.contentItem, "image") - var textLabel = findChild(control.contentItem, "label") - - switch (control.display) { - case Button.IconOnly: - verify(iconImage) - verify(!textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - break; - case Button.TextOnly: - verify(!iconImage) - verify(textLabel) - compare(textLabel.x, (control.availableWidth - textLabel.width) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - case Button.TextUnderIcon: - verify(iconImage) - verify(textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(textLabel.x, (control.availableWidth - textLabel.width) / 2) - verify(iconImage.y < textLabel.y) - break; - case Button.TextBesideIcon: - verify(iconImage) - verify(textLabel) - if (control.mirrored) - verify(textLabel.x < iconImage.x) - else - verify(iconImage.x < textLabel.x) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_checkbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_checkbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_checkbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_checkbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -382,19 +382,17 @@ compare(container.cb2.tristate, false) container.cb1.checkState = Qt.PartiallyChecked - compare(container.cb1.checked, false) + compare(container.cb1.checked, true) compare(container.cb1.checkState, Qt.PartiallyChecked) - compare(container.cb2.checked, false) + compare(container.cb2.checked, true) compare(container.cb2.checkState, Qt.PartiallyChecked) - // note: since Qt Quick Controls 2.4 (Qt 5.11), CheckBox does not - // force tristate when checkState is set to Qt.PartiallyChecked - compare(container.cb1.tristate, false) - compare(container.cb2.tristate, false) + compare(container.cb1.tristate, true) + compare(container.cb2.tristate, true) } function test_tristate() { - var control = createTemporaryObject(checkBox, testCase, {tristate: true}) + var control = createTemporaryObject(checkBox, testCase) var sequenceSpy = signalSequenceSpy.createObject(control, {target: control}) @@ -402,22 +400,23 @@ control.forceActiveFocus() verify(control.activeFocus) - compare(control.tristate, true) + compare(control.tristate, false) compare(control.checked, false) compare(control.checkState, Qt.Unchecked) - sequenceSpy.expectedSequence = [["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.PartiallyChecked }]] + sequenceSpy.expectedSequence = [["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], + ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }]] control.checkState = Qt.PartiallyChecked - compare(control.checked, false) + compare(control.tristate, true) + compare(control.checked, true) compare(control.checkState, Qt.PartiallyChecked) verify(sequenceSpy.success) // key: partial -> checked - sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.PartiallyChecked }], + sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true, "checkState": Qt.PartiallyChecked }], "pressed", - ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.PartiallyChecked }], + ["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], - ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], "released", "clicked"] keyClick(Qt.Key_Space) @@ -442,20 +441,20 @@ sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.Unchecked }], "pressed", ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }], - ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.PartiallyChecked }], + ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], + ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], "released", "clicked"] keyClick(Qt.Key_Space) - compare(control.checked, false) + compare(control.checked, true) compare(control.checkState, Qt.PartiallyChecked) verify(sequenceSpy.success) // mouse: partial -> checked - sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.PartiallyChecked }], + sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true, "checkState": Qt.PartiallyChecked }], "pressed", - ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.PartiallyChecked }], + ["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], - ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], "released", "clicked"] mouseClick(control) @@ -480,11 +479,12 @@ sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.Unchecked }], "pressed", ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }], - ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.PartiallyChecked }], + ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], + ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], "released", "clicked"] mouseClick(control) - compare(control.checked, false) + compare(control.checked, true) compare(control.checkState, Qt.PartiallyChecked) verify(sequenceSpy.success) } @@ -494,51 +494,4 @@ verify(control) compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset) } - - Component { - id: nextCheckStateBox - CheckBox { - tristate: true - nextCheckState: function() { - if (checkState === Qt.Checked) - return Qt.Unchecked - else - return Qt.Checked - } - } - } - - function test_nextCheckState_data() { - return [ - { tag: "unchecked", checkState: Qt.Unchecked, expectedState: Qt.Checked }, - { tag: "partially-checked", checkState: Qt.PartiallyChecked, expectedState: Qt.Checked }, - { tag: "checked", checkState: Qt.Checked, expectedState: Qt.Unchecked } - ] - } - - function test_nextCheckState(data) { - var control = createTemporaryObject(nextCheckStateBox, testCase) - verify(control) - - // mouse - control.checkState = data.checkState - compare(control.checkState, data.checkState) - mouseClick(control) - compare(control.checkState, data.expectedState) - - // touch - control.checkState = data.checkState - compare(control.checkState, data.checkState) - var touch = touchEvent(control) - touch.press(0, control).commit().release(0, control).commit() - compare(control.checkState, data.expectedState) - - // keyboard - control.forceActiveFocus() - tryCompare(control, "activeFocus", true) - control.checkState = data.checkState - compare(control.checkState, data.checkState) - keyClick(Qt.Key_Space) - compare(control.checkState, data.expectedState) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_checkdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_checkdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_checkdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_checkdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -89,132 +89,4 @@ verify(control); compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset); } - - function test_spacing() { - var control = createTemporaryObject(checkDelegate, testCase, { text: "Some long, long, long text" }) - verify(control) - verify(control.contentItem.implicitWidth + control.leftPadding + control.rightPadding > control.background.implicitWidth) - - var textLabel = findChild(control.contentItem, "label") - verify(textLabel) - - // The implicitWidth of the IconLabel that all buttons use as their contentItem should be - // equal to the implicitWidth of the Text and the check indicator + spacing while no icon is set. - compare(control.contentItem.implicitWidth, textLabel.implicitWidth + control.indicator.width + control.spacing) - - control.spacing += 100 - compare(control.contentItem.implicitWidth, textLabel.implicitWidth + control.indicator.width + control.spacing) - - compare(control.implicitWidth, textLabel.implicitWidth + control.indicator.width + control.spacing + control.leftPadding + control.rightPadding) - } - - function test_display_data() { - return [ - { "tag": "IconOnly", display: CheckDelegate.IconOnly }, - { "tag": "TextOnly", display: CheckDelegate.TextOnly }, - { "tag": "TextUnderIcon", display: CheckDelegate.TextUnderIcon }, - { "tag": "TextBesideIcon", display: CheckDelegate.TextBesideIcon }, - { "tag": "IconOnly, mirrored", display: CheckDelegate.IconOnly, mirrored: true }, - { "tag": "TextOnly, mirrored", display: CheckDelegate.TextOnly, mirrored: true }, - { "tag": "TextUnderIcon, mirrored", display: CheckDelegate.TextUnderIcon, mirrored: true }, - { "tag": "TextBesideIcon, mirrored", display: CheckDelegate.TextBesideIcon, mirrored: true } - ] - } - - function test_display(data) { - var control = createTemporaryObject(checkDelegate, testCase, { - text: "CheckDelegate", - display: data.display, - width: 400, - "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png", - "LayoutMirroring.enabled": !!data.mirrored - }) - verify(control) - compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png") - - var iconImage = findChild(control.contentItem, "image") - var textLabel = findChild(control.contentItem, "label") - - var availableWidth = control.availableWidth - control.indicator.width - control.spacing - var indicatorOffset = control.mirrored ? control.indicator.width + control.spacing : 0 - - switch (control.display) { - case CheckDelegate.IconOnly: - verify(iconImage) - verify(!textLabel) - compare(iconImage.x, indicatorOffset + (availableWidth - iconImage.width) / 2) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - break; - case CheckDelegate.TextOnly: - verify(!iconImage) - verify(textLabel) - compare(textLabel.x, control.mirrored ? control.availableWidth - textLabel.width : 0) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - case CheckDelegate.TextUnderIcon: - verify(iconImage) - verify(textLabel) - compare(iconImage.x, indicatorOffset + (availableWidth - iconImage.width) / 2) - compare(textLabel.x, indicatorOffset + (availableWidth - textLabel.width) / 2) - verify(iconImage.y < textLabel.y) - break; - case CheckDelegate.TextBesideIcon: - verify(iconImage) - verify(textLabel) - if (control.mirrored) - verify(textLabel.x < iconImage.x) - else - verify(iconImage.x < textLabel.x) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - } - } - - Component { - id: nextCheckStateDelegate - CheckDelegate { - tristate: true - nextCheckState: function() { - if (checkState === Qt.Checked) - return Qt.Unchecked - else - return Qt.Checked - } - } - } - - function test_nextCheckState_data() { - return [ - { tag: "unchecked", checkState: Qt.Unchecked, expectedState: Qt.Checked }, - { tag: "partially-checked", checkState: Qt.PartiallyChecked, expectedState: Qt.Checked }, - { tag: "checked", checkState: Qt.Checked, expectedState: Qt.Unchecked } - ] - } - - function test_nextCheckState(data) { - var control = createTemporaryObject(nextCheckStateDelegate, testCase) - verify(control) - - // mouse - control.checkState = data.checkState - compare(control.checkState, data.checkState) - mouseClick(control) - compare(control.checkState, data.expectedState) - - // touch - control.checkState = data.checkState - compare(control.checkState, data.checkState) - var touch = touchEvent(control) - touch.press(0, control).commit().release(0, control).commit() - compare(control.checkState, data.expectedState) - - // keyboard - control.forceActiveFocus() - tryCompare(control, "activeFocus", true) - control.checkState = data.checkState - compare(control.checkState, data.checkState) - keyClick(Qt.Key_Space) - compare(control.checkState, data.expectedState) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_combobox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_combobox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_combobox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_combobox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtQuick.Window 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -80,61 +80,6 @@ } } - Component { - id: mouseArea - MouseArea { } - } - - Component { - id: customPopup - Popup { - width: 100 - implicitHeight: contentItem.implicitHeight - contentItem: TextInput { - anchors.fill: parent - } - } - } - - Component { - id: comboBoxWithShaderEffect - ComboBox { - delegate: Rectangle { - Text { - id: txt - anchors.centerIn: parent - text: "item" + index - font.pixelSize: 20 - color: "red" - } - id: rect - objectName: "rect" - width: parent.width - height: txt.implicitHeight - gradient: Gradient { - GradientStop { color: "lightsteelblue"; position: 0.0 } - GradientStop { color: "blue"; position: 1.0 } - } - layer.enabled: true - layer.effect: ShaderEffect { - objectName: "ShaderFX" - width: rect.width - height: rect.height - fragmentShader: " - uniform lowp sampler2D source; // this item - uniform lowp float qt_Opacity; // inherited opacity of this item - varying highp vec2 qt_TexCoord0; - void main() { - lowp vec4 p = texture2D(source, qt_TexCoord0); - lowp float g = dot(p.xyz, vec3(0.344, 0.5, 0.156)); - gl_FragColor = vec4(g, g, g, p.a) * qt_Opacity; - }" - - } - } - } - } - function init() { // QTBUG-61225: Move the mouse away to avoid QQuickWindowPrivate::flushFrameSynchronousEvents() // delivering interfering hover events based on the last mouse position from earlier tests. For @@ -684,90 +629,36 @@ compare(control.currentIndex, 0) compare(control.currentText, "Banana") - compare(control.highlightedIndex, -1) keyPress(Qt.Key_C) compare(control.currentIndex, 1) compare(control.currentText, "Coco") - compare(control.highlightedIndex, -1) // no match keyPress(Qt.Key_N) compare(control.currentIndex, 1) compare(control.currentText, "Coco") - compare(control.highlightedIndex, -1) keyPress(Qt.Key_C) compare(control.currentIndex, 2) compare(control.currentText, "Coconut") - compare(control.highlightedIndex, -1) keyPress(Qt.Key_C) compare(control.currentIndex, 4) compare(control.currentText, "Cocomuffin") - compare(control.highlightedIndex, -1) // wrap keyPress(Qt.Key_C) compare(control.currentIndex, 1) compare(control.currentText, "Coco") - compare(control.highlightedIndex, -1) keyPress(Qt.Key_A) compare(control.currentIndex, 3) compare(control.currentText, "Apple") - compare(control.highlightedIndex, -1) keyPress(Qt.Key_B) compare(control.currentIndex, 0) compare(control.currentText, "Banana") - compare(control.highlightedIndex, -1) - - // popup - control.popup.open() - tryCompare(control.popup, "opened", true) - - compare(control.currentIndex, 0) - compare(control.highlightedIndex, 0) - - keyClick(Qt.Key_C) - compare(control.highlightedIndex, 1) // "Coco" - compare(control.currentIndex, 0) - - // no match - keyClick(Qt.Key_N) - compare(control.highlightedIndex, 1) - compare(control.currentIndex, 0) - - keyClick(Qt.Key_C) - compare(control.highlightedIndex, 2) // "Coconut" - compare(control.currentIndex, 0) - - keyClick(Qt.Key_C) - compare(control.highlightedIndex, 4) // "Cocomuffin" - compare(control.currentIndex, 0) - - // wrap - keyClick(Qt.Key_C) - compare(control.highlightedIndex, 1) // "Coco" - compare(control.currentIndex, 0) - - keyClick(Qt.Key_B) - compare(control.highlightedIndex, 0) // "Banana" - compare(control.currentIndex, 0) - - keyClick(Qt.Key_A) - compare(control.highlightedIndex, 3) // "Apple" - compare(control.currentIndex, 0) - - verify(control.popup.visible) - - // accept - keyClick(Qt.Key_Return) - tryCompare(control.popup, "visible", false) - compare(control.currentIndex, 3) - compare(control.currentText, "Apple") - compare(control.highlightedIndex, -1) } function test_popup() { @@ -805,12 +696,6 @@ control.x = testCase.width - control.width / 2 compare(control.x, testCase.width - control.width / 2) compare(control.popup.contentItem.parent.x, testCase.width - control.width / 2) - - // close the popup when hidden (QTBUG-67684) - control.popup.open() - tryCompare(control.popup, "opened", true) - control.visible = false - tryCompare(control.popup, "visible", false) } function test_mouse() { @@ -820,6 +705,9 @@ var activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"}) verify(activatedSpy.valid) + var highlightedSpy = signalSpy.createObject(control, {target: control, signalName: "highlighted"}) + verify(highlightedSpy.valid) + mouseClick(control) compare(control.popup.visible, true) @@ -829,19 +717,25 @@ // press - move - release outside - not activated - not closed mousePress(content) compare(activatedSpy.count, 0) + compare(highlightedSpy.count, 0) mouseMove(content, content.width * 2) compare(activatedSpy.count, 0) + compare(highlightedSpy.count, 0) mouseRelease(content, content.width * 2) compare(activatedSpy.count, 0) + compare(highlightedSpy.count, 0) compare(control.popup.visible, true) // press - move - release inside - activated - closed mousePress(content) compare(activatedSpy.count, 0) + compare(highlightedSpy.count, 0) mouseMove(content, content.width / 2 + 1, content.height / 2 + 1) compare(activatedSpy.count, 0) + compare(highlightedSpy.count, 0) mouseRelease(content) compare(activatedSpy.count, 1) + compare(highlightedSpy.count, 1) tryCompare(control.popup, "visible", false) } @@ -1103,34 +997,24 @@ } function test_wheel() { - var ma = createTemporaryObject(mouseArea, testCase, {width: 100, height: 100}) - verify(ma) - - var control = comboBox.createObject(ma, {model: 2, wheelEnabled: true}) + var control = createTemporaryObject(comboBox, testCase, {model: 2, wheelEnabled: true}) verify(control) var delta = 120 - var spy = signalSpy.createObject(ma, {target: ma, signalName: "wheel"}) - verify(spy.valid) - mouseWheel(control, control.width / 2, control.height / 2, -delta, -delta) compare(control.currentIndex, 1) - compare(spy.count, 0) // no propagation // reached bounds -> no change mouseWheel(control, control.width / 2, control.height / 2, -delta, -delta) compare(control.currentIndex, 1) - compare(spy.count, 0) // no propagation mouseWheel(control, control.width / 2, control.height / 2, delta, delta) compare(control.currentIndex, 0) - compare(spy.count, 0) // no propagation // reached bounds -> no change mouseWheel(control, control.width / 2, control.height / 2, delta, delta) compare(control.currentIndex, 0) - compare(spy.count, 0) // no propagation } function test_activation_data() { @@ -1292,58 +1176,6 @@ closedSpy.target = null } - function test_mouseHighlight() { - if ((Qt.platform.pluginName === "offscreen") - || (Qt.platform.pluginName === "minimal")) - skip("Mouse highlight not functional on offscreen/minimal platforms") - var control = createTemporaryObject(comboBox, testCase, {model: 20}) - verify(control) - - compare(control.highlightedIndex, -1) - - var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) - verify(openedSpy.valid) - - control.popup.open() - compare(control.highlightedIndex, 0) - tryCompare(openedSpy, "count", 1) - - var listview = control.popup.contentItem - verify(listview) - waitForRendering(listview) - - // hover-highlight through all visible list items one by one - var hoverIndex = -1 - var prevHoverItem = null - for (var y = 0; y < listview.height; ++y) { - var hoverItem = listview.itemAt(0, listview.contentY + y) - if (!hoverItem || !hoverItem.visible || hoverItem === prevHoverItem) - continue - mouseMove(hoverItem, 0, 0) - tryCompare(control, "highlightedIndex", ++hoverIndex) - prevHoverItem = hoverItem - } - - mouseMove(listview, listview.width / 2, listview.height / 2) - - // wheel-highlight the rest of the items - var delta = 120 - var prevWheelItem = null - while (!listview.atYEnd) { - var prevContentY = listview.contentY - mouseWheel(listview, listview.width / 2, listview.height / 2, -delta, -delta) - tryCompare(listview, "moving", false) - verify(listview.contentY > prevContentY) - - var wheelItem = listview.itemAt(listview.width / 2, listview.contentY + listview.height / 2) - if (!wheelItem || !wheelItem.visible || wheelItem === prevWheelItem) - continue - - tryCompare(control, "highlightedIndex", parseInt(wheelItem.text)) - prevWheelItem = wheelItem - } - } - RegExpValidator { id: regExpValidator regExp: /(red|blue|green)?/ @@ -1585,6 +1417,7 @@ keyPress(Qt.Key_B) verify(control.activeFocus) + expectFail("", "An editable ComboBox does not yet support the Keys attached property.") verify(control.gotit) compare(control.editText, "a") @@ -1648,145 +1481,6 @@ control.model = 0 control.popup.open() tryCompare(control.popup, "visible", true) - compare(control.popup.height, control.popup.topPadding + control.popup.bottomPadding) - } - - Component { - id: keysMonitor - Item { - property int pressedKeys: 0 - property int releasedKeys: 0 - property int lastPressedKey: 0 - property int lastReleasedKey: 0 - property alias comboBox: comboBox - - width: 200 - height: 200 - - Keys.onPressed: { ++pressedKeys; lastPressedKey = event.key } - Keys.onReleased: { ++releasedKeys; lastReleasedKey = event.key } - - ComboBox { - id: comboBox - } - } - } - - function test_keyClose_data() { - return [ - { tag: "Escape", key: Qt.Key_Escape }, - { tag: "Back", key: Qt.Key_Back } - ] - } - - function test_keyClose(data) { - var container = createTemporaryObject(keysMonitor, testCase) - verify(container) - - var control = comboBox.createObject(container) - verify(control) - - control.forceActiveFocus() - verify(control.activeFocus) - - var pressedKeys = 0 - var releasedKeys = 0 - - // popup not visible -> propagates - keyPress(data.key) - compare(container.pressedKeys, ++pressedKeys) - compare(container.lastPressedKey, data.key) - - keyRelease(data.key) - compare(container.releasedKeys, ++releasedKeys) - compare(container.lastReleasedKey, data.key) - - verify(control.activeFocus) - - // popup visible -> handled -> does not propagate - control.popup.open() - tryCompare(control.popup, "opened", true) - - keyPress(data.key) - compare(container.pressedKeys, pressedKeys) - - keyRelease(data.key) - // Popup receives the key release event if it has an exit transition, but - // not if it has been immediately closed on press, without a transition. - // ### TODO: Should Popup somehow always block the key release event? - if (!control.popup.exit) - ++releasedKeys - compare(container.releasedKeys, releasedKeys) - - tryCompare(control.popup, "visible", false) - verify(control.activeFocus) - - // popup not visible -> propagates - keyPress(data.key) - compare(container.pressedKeys, ++pressedKeys) - compare(container.lastPressedKey, data.key) - - keyRelease(data.key) - compare(container.releasedKeys, ++releasedKeys) - compare(container.lastReleasedKey, data.key) - } - - function test_popupFocus_QTBUG_74661() { - var control = createTemporaryObject(comboBox, testCase) - verify(control) - - var popup = createTemporaryObject(customPopup, testCase) - verify(popup) - - control.popup = popup - - var openedSpy = signalSpy.createObject(control, {target: popup, signalName: "opened"}) - verify(openedSpy.valid) - - var closedSpy = signalSpy.createObject(control, {target: popup, signalName: "closed"}) - verify(closedSpy.valid) - - control.forceActiveFocus() - verify(control.activeFocus) - - // show popup - keyClick(Qt.Key_Space) - openedSpy.wait() - compare(openedSpy.count, 1) - - popup.contentItem.forceActiveFocus() - verify(popup.contentItem.activeFocus) - - // type something in the text field - keyClick(Qt.Key_Space) - keyClick(Qt.Key_H) - keyClick(Qt.Key_I) - compare(popup.contentItem.text, " hi") - - compare(closedSpy.count, 0) - - // hide popup - keyClick(Qt.Key_Escape) - closedSpy.wait() - compare(closedSpy.count, 1) - } - - function test_comboBoxWithShaderEffect() { - var control = createTemporaryObject(comboBoxWithShaderEffect, testCase, {model: 9}) - verify(control) - waitForRendering(control) - control.forceActiveFocus() - var openedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "opened"}) - verify(openedSpy.valid) - - var closedSpy = signalSpy.createObject(control, {target: control.popup, signalName: "closed"}) - verify(closedSpy.valid) - - control.popup.open() - openedSpy.wait() - compare(openedSpy.count, 1) - control.popup.close() - closedSpy.wait() - compare(closedSpy.count, 1) + compare(control.popup.height, 0) } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_container.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_container.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_container.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_container.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.2 +import QtQuick.Templates 2.2 as T TestCase { id: testCase @@ -177,46 +177,4 @@ compare(control.itemAt(2).objectName, "2") compare(control.itemAt(3).objectName, "3") } - - function test_removeTakeItem() { - var control = createTemporaryObject(container, testCase) - verify(control) - - var item1 = rectangle.createObject(control) - var item2 = rectangle.createObject(control) - var item3 = rectangle.createObject(control) - - item1.Component.onDestruction.connect(function() { item1 = null }) - item2.Component.onDestruction.connect(function() { item2 = null }) - item3.Component.onDestruction.connect(function() { item3 = null }) - - control.addItem(item1) - control.addItem(item2) - control.addItem(item3) - compare(control.count, 3) - - // takeItem(int) does not destroy - compare(control.takeItem(1), item2) - compare(control.count, 2) - wait(1) - verify(item2) - - // removeItem(Item) destroys - control.removeItem(item1) - compare(control.count, 1) - wait(1) - verify(!item1) - - // removeItem(null) must not call removeItem(0) - control.removeItem(null) - compare(control.count, 1) - wait(1) - verify(item3) - - // deprecated removeItem(int) does not destroy - control.removeItem(0) - compare(control.count, 0) - wait(1) - verify(item3) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_control.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_control.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.2 +import QtQuick.Templates 2.2 as T TestCase { id: testCase @@ -85,42 +85,11 @@ var control = createTemporaryObject(component, testCase) verify(control) - var paddingSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "paddingChanged"}) - verify(paddingSpy.valid) - - var topPaddingSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "topPaddingChanged"}) - verify(topPaddingSpy.valid) - - var leftPaddingSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "leftPaddingChanged"}) - verify(leftPaddingSpy.valid) - - var rightPaddingSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "rightPaddingChanged"}) - verify(rightPaddingSpy.valid) - - var bottomPaddingSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "bottomPaddingChanged"}) - verify(bottomPaddingSpy.valid) - - var horizontalPaddingSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "horizontalPaddingChanged"}) - verify(horizontalPaddingSpy.valid) - - var verticalPaddingSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "verticalPaddingChanged"}) - verify(verticalPaddingSpy.valid) - - var paddingChanges = 0 - var topPaddingChanges = 0 - var leftPaddingChanges = 0 - var rightPaddingChanges = 0 - var bottomPaddingChanges = 0 - var horizontalPaddingChanges = 0 - var verticalPaddingChanges = 0 - compare(control.padding, 0) compare(control.topPadding, 0) compare(control.leftPadding, 0) compare(control.rightPadding, 0) compare(control.bottomPadding, 0) - compare(control.horizontalPadding, 0) - compare(control.verticalPadding, 0) compare(control.availableWidth, 0) compare(control.availableHeight, 0) @@ -133,15 +102,6 @@ compare(control.leftPadding, 10) compare(control.rightPadding, 10) compare(control.bottomPadding, 10) - compare(control.horizontalPadding, 10) - compare(control.verticalPadding, 10) - compare(paddingSpy.count, ++paddingChanges) - compare(topPaddingSpy.count, ++topPaddingChanges) - compare(leftPaddingSpy.count, ++leftPaddingChanges) - compare(rightPaddingSpy.count, ++rightPaddingChanges) - compare(bottomPaddingSpy.count, ++bottomPaddingChanges) - compare(horizontalPaddingSpy.count, ++horizontalPaddingChanges) - compare(verticalPaddingSpy.count, ++verticalPaddingChanges) control.topPadding = 20 compare(control.padding, 10) @@ -149,15 +109,6 @@ compare(control.leftPadding, 10) compare(control.rightPadding, 10) compare(control.bottomPadding, 10) - compare(control.horizontalPadding, 10) - compare(control.verticalPadding, 10) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, ++topPaddingChanges) - compare(leftPaddingSpy.count, leftPaddingChanges) - compare(rightPaddingSpy.count, rightPaddingChanges) - compare(bottomPaddingSpy.count, bottomPaddingChanges) - compare(horizontalPaddingSpy.count, horizontalPaddingChanges) - compare(verticalPaddingSpy.count, verticalPaddingChanges) control.leftPadding = 30 compare(control.padding, 10) @@ -165,15 +116,6 @@ compare(control.leftPadding, 30) compare(control.rightPadding, 10) compare(control.bottomPadding, 10) - compare(control.horizontalPadding, 10) - compare(control.verticalPadding, 10) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, topPaddingChanges) - compare(leftPaddingSpy.count, ++leftPaddingChanges) - compare(rightPaddingSpy.count, rightPaddingChanges) - compare(bottomPaddingSpy.count, bottomPaddingChanges) - compare(horizontalPaddingSpy.count, horizontalPaddingChanges) - compare(verticalPaddingSpy.count, verticalPaddingChanges) control.rightPadding = 40 compare(control.padding, 10) @@ -181,15 +123,6 @@ compare(control.leftPadding, 30) compare(control.rightPadding, 40) compare(control.bottomPadding, 10) - compare(control.horizontalPadding, 10) - compare(control.verticalPadding, 10) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, topPaddingChanges) - compare(leftPaddingSpy.count, leftPaddingChanges) - compare(rightPaddingSpy.count, ++rightPaddingChanges) - compare(bottomPaddingSpy.count, bottomPaddingChanges) - compare(horizontalPaddingSpy.count, horizontalPaddingChanges) - compare(verticalPaddingSpy.count, verticalPaddingChanges) control.bottomPadding = 50 compare(control.padding, 10) @@ -197,15 +130,6 @@ compare(control.leftPadding, 30) compare(control.rightPadding, 40) compare(control.bottomPadding, 50) - compare(control.horizontalPadding, 10) - compare(control.verticalPadding, 10) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, topPaddingChanges) - compare(leftPaddingSpy.count, leftPaddingChanges) - compare(rightPaddingSpy.count, rightPaddingChanges) - compare(bottomPaddingSpy.count, ++bottomPaddingChanges) - compare(horizontalPaddingSpy.count, horizontalPaddingChanges) - compare(verticalPaddingSpy.count, verticalPaddingChanges) control.padding = 60 compare(control.padding, 60) @@ -213,143 +137,6 @@ compare(control.leftPadding, 30) compare(control.rightPadding, 40) compare(control.bottomPadding, 50) - compare(control.horizontalPadding, 60) - compare(control.verticalPadding, 60) - compare(paddingSpy.count, ++paddingChanges) - compare(topPaddingSpy.count, topPaddingChanges) - compare(leftPaddingSpy.count, leftPaddingChanges) - compare(rightPaddingSpy.count, rightPaddingChanges) - compare(bottomPaddingSpy.count, bottomPaddingChanges) - compare(horizontalPaddingSpy.count, ++horizontalPaddingChanges) - compare(verticalPaddingSpy.count, ++verticalPaddingChanges) - - control.horizontalPadding = 80 - compare(control.padding, 60) - compare(control.topPadding, 20) - compare(control.leftPadding, 30) - compare(control.rightPadding, 40) - compare(control.bottomPadding, 50) - compare(control.horizontalPadding, 80) - compare(control.verticalPadding, 60) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, topPaddingChanges) - compare(leftPaddingSpy.count, leftPaddingChanges) - compare(rightPaddingSpy.count, rightPaddingChanges) - compare(bottomPaddingSpy.count, bottomPaddingChanges) - compare(horizontalPaddingSpy.count, ++horizontalPaddingChanges) - compare(verticalPaddingSpy.count, verticalPaddingChanges) - - control.verticalPadding = 90 - compare(control.padding, 60) - compare(control.topPadding, 20) - compare(control.leftPadding, 30) - compare(control.rightPadding, 40) - compare(control.bottomPadding, 50) - compare(control.horizontalPadding, 80) - compare(control.verticalPadding, 90) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, topPaddingChanges) - compare(leftPaddingSpy.count, leftPaddingChanges) - compare(rightPaddingSpy.count, rightPaddingChanges) - compare(bottomPaddingSpy.count, bottomPaddingChanges) - compare(horizontalPaddingSpy.count, horizontalPaddingChanges) - compare(verticalPaddingSpy.count, ++verticalPaddingChanges) - - control.leftPadding = undefined - compare(control.padding, 60) - compare(control.topPadding, 20) - compare(control.leftPadding, 80) - compare(control.rightPadding, 40) - compare(control.bottomPadding, 50) - compare(control.horizontalPadding, 80) - compare(control.verticalPadding, 90) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, topPaddingChanges) - compare(leftPaddingSpy.count, ++leftPaddingChanges) - compare(rightPaddingSpy.count, rightPaddingChanges) - compare(bottomPaddingSpy.count, bottomPaddingChanges) - compare(horizontalPaddingSpy.count, horizontalPaddingChanges) - compare(verticalPaddingSpy.count, verticalPaddingChanges) - - control.rightPadding = undefined - compare(control.padding, 60) - compare(control.topPadding, 20) - compare(control.leftPadding, 80) - compare(control.rightPadding, 80) - compare(control.bottomPadding, 50) - compare(control.horizontalPadding, 80) - compare(control.verticalPadding, 90) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, topPaddingChanges) - compare(leftPaddingSpy.count, leftPaddingChanges) - compare(rightPaddingSpy.count, ++rightPaddingChanges) - compare(bottomPaddingSpy.count, bottomPaddingChanges) - compare(horizontalPaddingSpy.count, horizontalPaddingChanges) - compare(verticalPaddingSpy.count, verticalPaddingChanges) - - control.topPadding = undefined - compare(control.padding, 60) - compare(control.topPadding, 90) - compare(control.leftPadding, 80) - compare(control.rightPadding, 80) - compare(control.bottomPadding, 50) - compare(control.horizontalPadding, 80) - compare(control.verticalPadding, 90) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, ++topPaddingChanges) - compare(leftPaddingSpy.count, leftPaddingChanges) - compare(rightPaddingSpy.count, rightPaddingChanges) - compare(bottomPaddingSpy.count, bottomPaddingChanges) - compare(horizontalPaddingSpy.count, horizontalPaddingChanges) - compare(verticalPaddingSpy.count, verticalPaddingChanges) - - control.bottomPadding = undefined - compare(control.padding, 60) - compare(control.topPadding, 90) - compare(control.leftPadding, 80) - compare(control.rightPadding, 80) - compare(control.bottomPadding, 90) - compare(control.horizontalPadding, 80) - compare(control.verticalPadding, 90) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, topPaddingChanges) - compare(leftPaddingSpy.count, leftPaddingChanges) - compare(rightPaddingSpy.count, rightPaddingChanges) - compare(bottomPaddingSpy.count, ++bottomPaddingChanges) - compare(horizontalPaddingSpy.count, horizontalPaddingChanges) - compare(verticalPaddingSpy.count, verticalPaddingChanges) - - control.horizontalPadding = undefined - compare(control.padding, 60) - compare(control.topPadding, 90) - compare(control.leftPadding, 60) - compare(control.rightPadding, 60) - compare(control.bottomPadding, 90) - compare(control.horizontalPadding, 60) - compare(control.verticalPadding, 90) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, topPaddingChanges) - compare(leftPaddingSpy.count, ++leftPaddingChanges) - compare(rightPaddingSpy.count, ++rightPaddingChanges) - compare(bottomPaddingSpy.count, bottomPaddingChanges) - compare(horizontalPaddingSpy.count, ++horizontalPaddingChanges) - compare(verticalPaddingSpy.count, verticalPaddingChanges) - - control.verticalPadding = undefined - compare(control.padding, 60) - compare(control.topPadding, 60) - compare(control.leftPadding, 60) - compare(control.rightPadding, 60) - compare(control.bottomPadding, 60) - compare(control.horizontalPadding, 60) - compare(control.verticalPadding, 60) - compare(paddingSpy.count, paddingChanges) - compare(topPaddingSpy.count, ++topPaddingChanges) - compare(leftPaddingSpy.count, leftPaddingChanges) - compare(rightPaddingSpy.count, rightPaddingChanges) - compare(bottomPaddingSpy.count, ++bottomPaddingChanges) - compare(horizontalPaddingSpy.count, horizontalPaddingChanges) - compare(verticalPaddingSpy.count, ++verticalPaddingChanges) } function test_availableSize() { @@ -465,12 +252,6 @@ compare(control.background.height, control.height) control.height = 240 - // change implicit size (QTBUG-66455) - control.background.implicitWidth = 160 - control.background.implicitHeight = 120 - compare(control.background.width, control.width) - compare(control.background.height, control.height) - // has width => width does not follow control.background.width /= 2 control.width += 20 @@ -1140,278 +921,19 @@ var control = createTemporaryObject(component, testCase) verify(control) - var implicitWidthSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitWidthChanged"}) - verify(implicitWidthSpy.valid) - - var implicitHeightSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitHeightChanged"}) - verify(implicitHeightSpy.valid) - - var implicitContentWidthSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitContentWidthChanged"}) - verify(implicitContentWidthSpy.valid) - - var implicitContentHeightSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitContentHeightChanged"}) - verify(implicitContentHeightSpy.valid) - - var implicitBackgroundWidthSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitBackgroundWidthChanged"}) - verify(implicitBackgroundWidthSpy.valid) - - var implicitBackgroundHeightSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitBackgroundHeightChanged"}) - verify(implicitBackgroundHeightSpy.valid) - - var implicitWidthChanges = 0 - var implicitHeightChanges = 0 - var implicitContentWidthChanges = 0 - var implicitContentHeightChanges = 0 - var implicitBackgroundWidthChanges = 0 - var implicitBackgroundHeightChanges = 0 - compare(control.implicitWidth, 0) compare(control.implicitHeight, 0) - compare(control.implicitContentWidth, 0) - compare(control.implicitContentHeight, 0) - compare(control.implicitBackgroundWidth, 0) - compare(control.implicitBackgroundHeight, 0) control.contentItem = rectangle.createObject(control, {implicitWidth: 10, implicitHeight: 20}) compare(control.implicitWidth, 10) compare(control.implicitHeight, 20) - compare(control.implicitContentWidth, 10) - compare(control.implicitContentHeight, 20) - compare(control.implicitBackgroundWidth, 0) - compare(control.implicitBackgroundHeight, 0) - compare(implicitWidthSpy.count, ++implicitWidthChanges) - compare(implicitHeightSpy.count, ++implicitHeightChanges) - compare(implicitBackgroundWidthSpy.count, implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, implicitBackgroundHeightChanges) - compare(implicitContentWidthSpy.count, ++implicitContentWidthChanges) - compare(implicitContentHeightSpy.count, ++implicitContentHeightChanges) - - control.contentItem.implicitWidth += 1 - control.contentItem.implicitHeight += 1 - compare(control.implicitWidth, 11) - compare(control.implicitHeight, 21) - compare(control.implicitContentWidth, 11) - compare(control.implicitContentHeight, 21) - compare(control.implicitBackgroundWidth, 0) - compare(control.implicitBackgroundHeight, 0) - compare(implicitWidthSpy.count, ++implicitWidthChanges) - compare(implicitHeightSpy.count, ++implicitHeightChanges) - compare(implicitContentWidthSpy.count, ++implicitContentWidthChanges) - compare(implicitContentHeightSpy.count, ++implicitContentHeightChanges) - compare(implicitBackgroundWidthSpy.count, implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, implicitBackgroundHeightChanges) control.background = rectangle.createObject(control, {implicitWidth: 20, implicitHeight: 30}) compare(control.implicitWidth, 20) compare(control.implicitHeight, 30) - compare(control.implicitContentWidth,11) - compare(control.implicitContentHeight, 21) - compare(control.implicitBackgroundWidth, 20) - compare(control.implicitBackgroundHeight, 30) - compare(implicitWidthSpy.count, ++implicitWidthChanges) - compare(implicitHeightSpy.count, ++implicitHeightChanges) - compare(implicitContentWidthSpy.count, implicitContentWidthChanges) - compare(implicitContentHeightSpy.count, implicitContentHeightChanges) - compare(implicitBackgroundWidthSpy.count, ++implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, ++implicitBackgroundHeightChanges) - - control.background.implicitWidth += 1 - control.background.implicitHeight += 1 - compare(control.implicitWidth, 21) - compare(control.implicitHeight, 31) - compare(control.implicitContentWidth, 11) - compare(control.implicitContentHeight, 21) - compare(control.implicitBackgroundWidth, 21) - compare(control.implicitBackgroundHeight, 31) - compare(implicitWidthSpy.count, ++implicitWidthChanges) - compare(implicitHeightSpy.count, ++implicitHeightChanges) - compare(implicitContentWidthSpy.count, implicitContentWidthChanges) - compare(implicitContentHeightSpy.count, implicitContentHeightChanges) - compare(implicitBackgroundWidthSpy.count, ++implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, ++implicitBackgroundHeightChanges) - } - - function test_baseline() { - var control = createTemporaryObject(component, testCase) - verify(control) - - compare(control.baselineOffset, 0) - - var baselineSpy = signalSpy.createObject(control, {target: control, signalName: "baselineOffsetChanged"}) - verify(baselineSpy.valid) - - control.contentItem = rectangle.createObject(control, {baselineOffset: 12}) - compare(control.baselineOffset, 12) - compare(baselineSpy.count, 1) - control.padding = 6 - compare(control.baselineOffset, 18) - compare(baselineSpy.count, 2) - - control.baselineOffset = 3 - compare(control.baselineOffset, 3) - compare(baselineSpy.count, 3) - - control.padding = 9 - compare(control.baselineOffset, 3) - compare(baselineSpy.count, 3) - - control.baselineOffset = undefined - compare(control.baselineOffset, 21) - compare(baselineSpy.count, 4) - - control.contentItem.baselineOffset = 3 - compare(control.baselineOffset, 12) - compare(baselineSpy.count, 5) - - control.contentItem = null - compare(control.baselineOffset, 0) - compare(baselineSpy.count, 6) - } - - function test_inset() { - var control = createTemporaryObject(component, testCase, {background: rectangle.createObject(control)}) - verify(control) - - var topInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "topInsetChanged"}) - verify(topInsetSpy.valid) - - var leftInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "leftInsetChanged"}) - verify(leftInsetSpy.valid) - - var rightInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "rightInsetChanged"}) - verify(rightInsetSpy.valid) - - var bottomInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "bottomInsetChanged"}) - verify(bottomInsetSpy.valid) - - var topInsetChanges = 0 - var leftInsetChanges = 0 - var rightInsetChanges = 0 - var bottomInsetChanges = 0 - - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - - control.width = 100 - control.height = 100 - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 100) - - control.topInset = 10 - compare(control.topInset, 10) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, ++topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 10) - compare(control.background.width, 100) - compare(control.background.height, 90) - - control.leftInset = 20 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, ++leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 80) - compare(control.background.height, 90) - - control.rightInset = 30 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, ++rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 50) - compare(control.background.height, 90) - - control.bottomInset = 40 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, ++bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 50) - compare(control.background.height, 50) - - control.topInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, ++topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 0) - compare(control.background.width, 50) - compare(control.background.height, 60) - - control.leftInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, ++leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 70) - compare(control.background.height, 60) - - control.rightInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, ++rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 60) - - control.bottomInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, ++bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 100) + control.padding = 100 + compare(control.implicitWidth, 210) + compare(control.implicitHeight, 220) } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_delaybutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_delaybutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_delaybutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_delaybutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_dialogbuttonbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_dialogbuttonbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_dialogbuttonbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_dialogbuttonbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,14 +48,14 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase - width: 600 - height: 400 + width: 200 + height: 200 visible: true when: windowShown name: "DialogButtonBox" @@ -159,10 +159,10 @@ { tag: "Save", standardButton: DialogButtonBox.Save, buttonRole: DialogButtonBox.AcceptRole, signalName: "accepted" }, { tag: "Cancel", standardButton: DialogButtonBox.Cancel, buttonRole: DialogButtonBox.RejectRole, signalName: "rejected" }, { tag: "Close", standardButton: DialogButtonBox.Close, buttonRole: DialogButtonBox.RejectRole, signalName: "rejected" }, - { tag: "Discard", standardButton: DialogButtonBox.Discard, buttonRole: DialogButtonBox.DestructiveRole, signalName: "discarded" }, - { tag: "Apply", standardButton: DialogButtonBox.Apply, buttonRole: DialogButtonBox.ApplyRole, signalName: "applied" }, - { tag: "Reset", standardButton: DialogButtonBox.Reset, buttonRole: DialogButtonBox.ResetRole, signalName: "reset" }, - { tag: "RestoreDefaults", standardButton: DialogButtonBox.RestoreDefaults, buttonRole: DialogButtonBox.ResetRole, signalName: "reset" }, + { tag: "Discard", standardButton: DialogButtonBox.Discard, buttonRole: DialogButtonBox.DestructiveRole }, + { tag: "Apply", standardButton: DialogButtonBox.Apply, buttonRole: DialogButtonBox.ApplyRole }, + { tag: "Reset", standardButton: DialogButtonBox.Reset, buttonRole: DialogButtonBox.ResetRole }, + { tag: "RestoreDefaults", standardButton: DialogButtonBox.RestoreDefaults, buttonRole: DialogButtonBox.ResetRole }, { tag: "Help", standardButton: DialogButtonBox.Help, buttonRole: DialogButtonBox.HelpRole, signalName: "helpRequested" }, { tag: "SaveAll", standardButton: DialogButtonBox.SaveAll, buttonRole: DialogButtonBox.AcceptRole, signalName: "accepted" }, { tag: "Yes", standardButton: DialogButtonBox.Yes, buttonRole: DialogButtonBox.YesRole, signalName: "accepted" }, @@ -188,260 +188,11 @@ var clickedSpy = signalSpy.createObject(control, {target: control, signalName: "clicked"}) verify(clickedSpy.valid) var roleSpy = signalSpy.createObject(control, {target: control, signalName: data.signalName}) - verify(roleSpy.valid) + compare(roleSpy.valid, !!data.signalName) button.clicked() compare(clickedSpy.count, 1) compare(clickedSpy.signalArguments[0][0], button) - compare(roleSpy.count, 1) - } - - function test_buttonLayout_data() { - return [ - { tag: "WinLayout", buttonLayout: DialogButtonBox.WinLayout, button1Role: DialogButtonBox.AcceptRole, button2Role: DialogButtonBox.RejectRole }, - { tag: "MacLayout", buttonLayout: DialogButtonBox.MacLayout, button1Role: DialogButtonBox.RejectRole, button2Role: DialogButtonBox.AcceptRole }, - { tag: "KdeLayout", buttonLayout: DialogButtonBox.KdeLayout, button1Role: DialogButtonBox.AcceptRole, button2Role: DialogButtonBox.RejectRole }, - { tag: "GnomeLayout", buttonLayout: DialogButtonBox.GnomeLayout, button1Role: DialogButtonBox.RejectRole, button2Role: DialogButtonBox.AcceptRole }, - { tag: "AndroidLayout", buttonLayout: DialogButtonBox.AndroidLayout, button1Role: DialogButtonBox.RejectRole, button2Role: DialogButtonBox.AcceptRole } - ] - } - - function test_buttonLayout(data) { - var control = createTemporaryObject(buttonBox, testCase, {buttonLayout: data.buttonLayout, standardButtons: DialogButtonBox.Ok|DialogButtonBox.Cancel}) - verify(control) - - compare(control.count, 2) - - var button1 = control.itemAt(0) - verify(button1) - compare(button1.DialogButtonBox.buttonRole, data.button1Role) - - var button2 = control.itemAt(1) - verify(button2) - compare(button2.DialogButtonBox.buttonRole, data.button2Role) - } - - function test_implicitSize_data() { - return [ - { tag: "Ok", standardButtons: DialogButtonBox.Ok }, - { tag: "Yes|No", standardButtons: DialogButtonBox.Yes | DialogButtonBox.No } - ] - } - - // QTBUG-59719 - function test_implicitSize(data) { - var control = createTemporaryObject(buttonBox, testCase, {standardButtons: data.standardButtons}) - verify(control) - - var listView = control.contentItem - verify(listView && listView.hasOwnProperty("contentWidth")) - waitForRendering(listView) - - var implicitContentWidth = control.leftPadding + control.rightPadding - for (var i = 0; i < listView.contentItem.children.length; ++i) { - var button = listView.contentItem.children[i] - if (!button.hasOwnProperty("text")) - continue - implicitContentWidth += button.implicitWidth - } - - verify(implicitContentWidth > control.leftPadding + control.rightPadding) - verify(control.implicitWidth >= implicitContentWidth, qsTr("implicit width (%1) is less than content width (%2)").arg(control.implicitWidth).arg(implicitContentWidth)) - } - - Component { - id: okCancelBox - DialogButtonBox { - Button { - text: qsTr("OK") - } - Button { - text: qsTr("Cancel") - } - } - } - - function test_buttonSize() { - var control = createTemporaryObject(okCancelBox, testCase) - verify(control) - - var okButton = control.itemAt(0) - verify(okButton) - verify(okButton.width > 0) - - var cancelButton = control.itemAt(1) - verify(cancelButton) - verify(cancelButton.width > 0) - - compare(okButton.width + cancelButton.width, control.availableWidth - control.spacing) - } - - function test_oneButtonInFixedWidthBox() { - var control = createTemporaryObject(buttonBox, testCase, - { width: 400, standardButtons: Dialog.Close }) - verify(control) - - var listView = control.contentItem - waitForRendering(listView) - - var button = control.itemAt(0) - verify(button) - - // The button should never go outside of the box. - tryVerify(function() { return button.mapToItem(control, 0, 0).x >= 0 }, - 1000, "Expected left edge of button to be within left edge of DialogButtonBox (i.e. greater than or equal to 0)" + - ", but it's " + button.mapToItem(control, 0, 0).x) - tryVerify(function() { return button.mapToItem(control, 0, 0).x + button.width <= control.width }, - 1000, "Expected right edge of button to be within right edge of DialogButtonBox (i.e. less than or equal to " + - control.width + "), but it's " + (button.mapToItem(control, 0, 0).x + button.width)) - } - - Component { - id: dialogComponent - // Based on the Default style, where a single button fills - // half the dialog's width and is aligned to the right. - Dialog { - id: control - standardButtons: Dialog.Ok - visible: true - - footer: DialogButtonBox { - id: box - visible: count > 0 - alignment: count === 1 ? Qt.AlignRight : undefined - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - (count === 1 ? implicitContentWidth * 2 : implicitContentWidth) + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - contentWidth: contentItem.contentWidth - - delegate: Button { - width: box.count === 1 ? box.availableWidth / 2 : undefined - } - } - } - } - - // QTBUG-73860 - function test_oneButtonAlignedRightInImplicitWidthBox() { - var dialog = createTemporaryObject(dialogComponent, testCase) - verify(dialog) - - var box = dialog.footer - var listView = box.contentItem - waitForRendering(listView) - - var button = box.itemAt(0) - verify(button) - - // The button should never go outside of the box. - tryVerify(function() { return button.mapToItem(box, 0, 0).x >= 0 }, - 1000, "Expected left edge of button to be within left edge of DialogButtonBox (i.e. greater than or equal to 0)" + - ", but it's " + button.mapToItem(box, 0, 0).x) - tryVerify(function() { return button.mapToItem(box, 0, 0).x + button.width <= box.width }, - 1000, "Expected right edge of button to be within right edge of DialogButtonBox (i.e. less than or equal to " + - box.width + "), but it's " + (button.mapToItem(box, 0, 0).x + button.width)) - compare(box.width, dialog.width) - // There's a single button and we align it to the right. - compare(box.contentItem.width, button.width) - compare(box.contentItem.x, box.width - box.rightPadding - box.contentItem.width) - } - - Component { - id: customButtonBox - - DialogButtonBox { - objectName: "customButtonBox" - alignment: Qt.AlignRight - - property alias okButton: okButton - - Button { - id: okButton - text: "OK" - - DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole - } - } - } - - Component { - id: customButtonBoxTwoButtons - - DialogButtonBox { - objectName: "customButtonBoxTwoButtons" - alignment: Qt.AlignRight - - property alias okButton: okButton - - Button { - id: okButton - text: "OK" - - DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole - } - Button { - text: "Cancel" - - DialogButtonBox.buttonRole: DialogButtonBox.RejectRole - } - } - } - - function test_changeCustomButtonText_data() { - return [ - { tag: "oneButton", component: customButtonBox }, - { tag: "twoButtons", component: customButtonBoxTwoButtons }, - ] - } - - // QTBUG-72886 - function test_changeCustomButtonText(data) { - var control = createTemporaryObject(customButtonBox, testCase, {}) - verify(control) - - var listView = control.contentItem - waitForRendering(listView) - - var button = control.okButton - verify(button) - button.text = "some longer text"; - - // The button should never go outside of the box. - tryVerify(function() { return button.mapToItem(control, 0, 0).x >= 0 }, - 1000, "Expected left edge of button to be within left edge of DialogButtonBox (i.e. greater than or equal to 0)" + - ", but it's " + button.mapToItem(control, 0, 0).x) - tryVerify(function() { return button.mapToItem(control, 0, 0).x + button.width <= control.width }, - 1000, "Expected right edge of button to be within right edge of DialogButtonBox (i.e. less than or equal to " + - control.width + "), but it's " + (button.mapToItem(control, 0, 0).x + button.width)) - } - - Component { - id: noRolesDialog - - Dialog { - footer: DialogButtonBox { - Button { text: "A" } - Button { text: "B" } - Button { text: "C" } - } - } - } - - function test_orderWithNoRoles() { - for (var i = 0; i < 10; ++i) { - var control = createTemporaryObject(noRolesDialog, testCase) - verify(control) - - control.open() - tryCompare(control, "opened", true) - var footer = control.footer - verify(footer) - waitForRendering(footer) - compare(footer.itemAt(0).text, "A") - compare(footer.itemAt(1).text, "B") - compare(footer.itemAt(2).text, "C") - } + compare(roleSpy.count, !!data.signalName ? 1 : 0) } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_dialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.4 import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.2 +import QtQuick.Templates 2.2 as T TestCase { id: testCase @@ -67,14 +67,6 @@ } Component { - id: qtbug71444 - Dialog { - header: null - footer: null - } - } - - Component { id: buttonBox DialogButtonBox { } } @@ -107,14 +99,11 @@ verify(acceptedSpy.valid) control.accept() compare(acceptedSpy.count, 1) - compare(control.result, Dialog.Accepted) tryCompare(control, "visible", false) } function test_reject() { - skip("QTBUG-62549, QTBUG-62628") - var control = createTemporaryObject(dialog, testCase) var openedSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "opened"}) @@ -129,7 +118,6 @@ verify(rejectedSpy.valid) control.reject() compare(rejectedSpy.count, 1) - compare(control.result, Dialog.Rejected) tryCompare(control, "visible", false) @@ -206,11 +194,6 @@ compare(rejectedSpy.count, 1) } - function test_qtbug71444() { - var control = createTemporaryObject(qtbug71444, testCase) - verify(control) - } - function test_standardButtons() { var control = createTemporaryObject(dialog, testCase) @@ -373,42 +356,4 @@ - (data.header ? control.header.height + control.spacing : 0) - (data.footer ? control.footer.height + control.spacing : 0)) } - - function test_signals_data() { - return [ - { tag: "Ok", standardButton: Dialog.Ok, signalName: "accepted" }, - { tag: "Open", standardButton: Dialog.Open, signalName: "accepted" }, - { tag: "Save", standardButton: Dialog.Save, signalName: "accepted" }, - { tag: "Cancel", standardButton: Dialog.Cancel, signalName: "rejected" }, - { tag: "Close", standardButton: Dialog.Close, signalName: "rejected" }, - { tag: "Discard", standardButton: Dialog.Discard, signalName: "discarded" }, - { tag: "Apply", standardButton: Dialog.Apply, signalName: "applied" }, - { tag: "Reset", standardButton: Dialog.Reset, signalName: "reset" }, - { tag: "RestoreDefaults", standardButton: Dialog.RestoreDefaults, signalName: "reset" }, - { tag: "Help", standardButton: Dialog.Help, signalName: "helpRequested" }, - { tag: "SaveAll", standardButton: Dialog.SaveAll, signalName: "accepted" }, - { tag: "Yes", standardButton: Dialog.Yes, signalName: "accepted" }, - { tag: "YesToAll", standardButton: Dialog.YesToAll, signalName: "accepted" }, - { tag: "No", standardButton: Dialog.No, signalName: "rejected" }, - { tag: "NoToAll", standardButton: Dialog.NoToAll, signalName: "rejected" }, - { tag: "Abort", standardButton: Dialog.Abort, signalName: "rejected" }, - { tag: "Retry", standardButton: Dialog.Retry, signalName: "accepted" }, - { tag: "Ignore", standardButton: Dialog.Ignore, signalName: "accepted" } - ] - } - - function test_signals(data) { - var control = createTemporaryObject(dialog, testCase) - verify(control) - - control.standardButtons = data.standardButton - var button = control.standardButton(data.standardButton) - verify(button) - - var buttonSpy = signalSpy.createObject(control.contentItem, {target: control, signalName: data.signalName}) - verify(buttonSpy.valid) - - button.clicked() - compare(buttonSpy.count, 1) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_dial.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_dial.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,25 +48,21 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase - width: 450 - height: 450 + width: 200 + height: 200 visible: true when: windowShown name: "Dial" Component { id: dialComponent - Dial { - width: 100 - height: 100 - anchors.centerIn: parent - } + Dial {} } Component { @@ -596,93 +592,4 @@ mouseRelease(control) compare(control.pressed, false) } - - function move(inputEventType, control, x, y) { - if (inputEventType === "mouseInput") { - mouseMove(control, x, y); - } else { - var touch = touchEvent(control); - touch.move(0, control, x, y).commit(); - } - } - - function press(inputEventType, control, x, y) { - if (inputEventType === "mouseInput") { - mousePress(control, x, y); - } else { - var touch = touchEvent(control); - touch.press(0, control, x, y).commit(); - } - } - - function release(inputEventType, control, x, y) { - if (inputEventType === "mouseInput") { - mouseRelease(control, x, y); - } else { - var touch = touchEvent(control); - touch.release(0, control, x, y).commit(); - } - } - - function test_horizontalAndVertical_data() { - var data = [ - { eventType: "mouseInput", inputMode: Dial.Vertical, moveToX: 0.5, moveToY: 0.25, expectedPosition: 0.125 }, - // Horizontal movement should have no effect on a vertical dial. - { eventType: "mouseInput", inputMode: Dial.Vertical, moveToX: 2.0, moveToY: 0.25, expectedPosition: 0.125 }, - { eventType: "mouseInput", inputMode: Dial.Vertical, moveToX: 0.5, moveToY: 0.0, expectedPosition: 0.25 }, - { eventType: "mouseInput", inputMode: Dial.Vertical, moveToX: 0.5, moveToY: -1.5, expectedPosition: 1.0 }, - // Going above the drag area shouldn't make the position higher than 1.0. - { eventType: "mouseInput", inputMode: Dial.Vertical, moveToX: 0.5, moveToY: -2.0, expectedPosition: 1.0 }, - // Try to decrease the position by moving the mouse down. - // The dial's position is 0 before the press event, so nothing should happen. - { eventType: "mouseInput", inputMode: Dial.Vertical, moveToX: 0.5, moveToY: 1.25, expectedPosition: 0.0 }, - - { eventType: "mouseInput", inputMode: Dial.Horizontal, moveToX: 0.75, moveToY: 0.5, expectedPosition: 0.125 }, - // Vertical movement should have no effect on a horizontal dial. - { eventType: "mouseInput", inputMode: Dial.Horizontal, moveToX: 0.75, moveToY: 2.0, expectedPosition: 0.125 }, - { eventType: "mouseInput", inputMode: Dial.Horizontal, moveToX: 1.0, moveToY: 0.5, expectedPosition: 0.25 }, - { eventType: "mouseInput", inputMode: Dial.Horizontal, moveToX: 1.5, moveToY: 0.5, expectedPosition: 0.5 }, - { eventType: "mouseInput", inputMode: Dial.Horizontal, moveToX: 2.5, moveToY: 0.5, expectedPosition: 1.0 }, - // Going above the drag area shouldn't make the position higher than 1.0. - { eventType: "mouseInput", inputMode: Dial.Horizontal, moveToX: 2.525, moveToY: 0.5, expectedPosition: 1.0 }, - // Try to decrease the position by moving the mouse to the left. - // The dial's position is 0 before the press event, so nothing should happen. - { eventType: "mouseInput", inputMode: Dial.Vertical, moveToX: 0.25, moveToY: 0.5, expectedPosition: 0.0 } - ]; - - // Do the same tests for touch by copying the mouse tests and adding them to the end of the array. - var mouseTestCount = data.length; - for (var i = mouseTestCount; i < mouseTestCount * 2; ++i) { - // Shallow-copy the object. - data[i] = JSON.parse(JSON.stringify(data[i - mouseTestCount])); - data[i].eventType = "touchInput"; - } - - for (i = 0; i < data.length; ++i) { - var row = data[i]; - row.tag = "eventType=" + row.eventType + ", " - + "inputMode=" + (row.inputMode === Dial.Vertical ? "Vertical" : "Horizontal") + ", " - + "moveToX=" + row.moveToX + ", moveToY=" + row.moveToY + ", " - + "expectedPosition=" + row.expectedPosition; - } - - return data; - } - - function test_horizontalAndVertical(data) { - var control = createTemporaryObject(dialComponent, testCase, { inputMode: data.inputMode }); - verify(control); - - press(data.eventType, control); - compare(control.pressed, true); - // The position shouldn't change until the mouse has actually moved. - compare(control.position, 0); - - move(data.eventType, control, control.width * data.moveToX, control.width * data.moveToY); - compare(control.position, data.expectedPosition); - - release(data.eventType, control, control.width * data.moveToX, control.width * data.moveToY); - compare(control.pressed, false); - compare(control.position, data.expectedPosition); - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_drawer.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_drawer.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,118 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite 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$ +** +****************************************************************************/ + +import QtQuick 2.2 +import QtTest 1.0 +import QtQuick.Controls 2.2 + +TestCase { + id: testCase + width: 400 + height: 400 + visible: true + when: windowShown + name: "Drawer" + + Component { + id: drawer + Drawer { } + } + + function test_defaults() { + var control = createTemporaryObject(drawer, testCase) + compare(control.edge, Qt.LeftEdge) + compare(control.position, 0.0) + compare(control.dragMargin, Qt.styleHints.startDragDistance) + compare(control.parent, ApplicationWindow.overlay) + } + + function test_invalidEdge() { + var control = createTemporaryObject(drawer, testCase) + compare(control.edge, Qt.LeftEdge) + + // Test an invalid value - it should warn and ignore it. + ignoreWarning(Qt.resolvedUrl("tst_drawer.qml") + ":65:9: QML Drawer: invalid edge value - valid values are: Qt.TopEdge, Qt.LeftEdge, Qt.RightEdge, Qt.BottomEdge") + control.edge = Drawer.Right + compare(control.edge, Qt.LeftEdge) + } + + Component { + id: rectDrawer + + Drawer { + Rectangle { + width: 200 + height: 400 + color: "steelblue" + } + } + } + + function test_swipeVelocity() { + skip("QTBUG-52003"); + + var control = createTemporaryObject(rectDrawer, testCase) + verify(control.contentItem) + compare(control.edge, Qt.LeftEdge) + compare(control.position, 0.0) + + var dragDistance = Math.max(20, Qt.styleHints.startDragDistance + 5) + var distance = dragDistance * 1.1 + if (distance >= control.width * 0.7) + skip("This test requires a startDragDistance that is less than the opening threshold of the drawer") + + mousePress(control, 0, 0, Qt.LeftButton) + mouseMove(control, distance, 0) + verify(control.position > 0) + tryCompare(control, "position", distance / control.contentItem.width) + mouseRelease(control, distance, 0, Qt.LeftButton) + tryCompare(control, "position", 1.0) + } +} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_frame.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -106,8 +106,6 @@ verify(control.contentItem) compare(control.contentWidth, 0) compare(control.contentHeight, 0) - compare(control.implicitContentWidth, 0) - compare(control.implicitContentHeight, 0) } function test_oneChild() { @@ -116,8 +114,6 @@ compare(control.contentWidth, 100) compare(control.contentHeight, 30) - compare(control.implicitContentWidth, 100) - compare(control.implicitContentHeight, 30) verify(control.implicitWidth > 100) verify(control.implicitHeight > 30) } @@ -128,8 +124,6 @@ compare(control.contentWidth, 0) compare(control.contentHeight, 0) - compare(control.implicitContentWidth, 0) - compare(control.implicitContentHeight, 0) verify(control.implicitWidth > 0) verify(control.implicitHeight > 0) } @@ -140,8 +134,6 @@ compare(control.contentWidth, 100) compare(control.contentHeight, 30) - compare(control.implicitContentWidth, 100) - compare(control.implicitContentHeight, 30) verify(control.implicitWidth > 100) verify(control.implicitHeight > 30) } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_groupbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_groupbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_groupbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_groupbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -106,8 +106,6 @@ verify(control.contentItem) compare(control.contentWidth, 0) compare(control.contentHeight, 0) - compare(control.implicitContentWidth, 0) - compare(control.implicitContentHeight, 0) } function test_oneChild() { @@ -116,8 +114,6 @@ compare(control.contentWidth, 100) compare(control.contentHeight, 30) - compare(control.implicitContentWidth, 100) - compare(control.implicitContentHeight, 30) verify(control.implicitWidth > 100) verify(control.implicitHeight > 30) } @@ -128,8 +124,6 @@ compare(control.contentWidth, 0) compare(control.contentHeight, 0) - compare(control.implicitContentWidth, 0) - compare(control.implicitContentHeight, 0) verify(control.implicitWidth > 0) verify(control.implicitHeight > 0) } @@ -140,8 +134,6 @@ compare(control.contentWidth, 100) compare(control.contentHeight, 30) - compare(control.implicitContentWidth, 100) - compare(control.implicitContentHeight, 30) verify(control.implicitWidth > 100) verify(control.implicitHeight > 30) } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_itemdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_itemdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_itemdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_itemdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -79,84 +79,4 @@ control.highlighted = true verify(control.highlighted) } - - function test_spacing() { - var control = createTemporaryObject(itemDelegate, testCase, { text: "Some long, long, long text" }) - verify(control) - verify(control.contentItem.implicitWidth + control.leftPadding + control.rightPadding > control.background.implicitWidth) - - var textLabel = findChild(control.contentItem, "label") - verify(textLabel) - - // The implicitWidth of the IconLabel that all buttons use as their contentItem - // should be equal to the implicitWidth of the Text while no icon is set. - compare(control.contentItem.implicitWidth, textLabel.implicitWidth) - - // That means that spacing shouldn't affect it. - control.spacing += 100 - compare(control.contentItem.implicitWidth, textLabel.implicitWidth) - - // The implicitWidth of the ItemDelegate itself should, therefore, also never include spacing while no icon is set. - compare(control.implicitWidth, textLabel.implicitWidth + control.leftPadding + control.rightPadding) - } - - function test_display_data() { - return [ - { "tag": "IconOnly", display: ItemDelegate.IconOnly }, - { "tag": "TextOnly", display: ItemDelegate.TextOnly }, - { "tag": "TextUnderIcon", display: ItemDelegate.TextUnderIcon }, - { "tag": "TextBesideIcon", display: ItemDelegate.TextBesideIcon }, - { "tag": "IconOnly, mirrored", display: ItemDelegate.IconOnly, mirrored: true }, - { "tag": "TextOnly, mirrored", display: ItemDelegate.TextOnly, mirrored: true }, - { "tag": "TextUnderIcon, mirrored", display: ItemDelegate.TextUnderIcon, mirrored: true }, - { "tag": "TextBesideIcon, mirrored", display: ItemDelegate.TextBesideIcon, mirrored: true } - ] - } - - function test_display(data) { - var control = createTemporaryObject(itemDelegate, testCase, { - text: "ItemDelegate", - display: data.display, - width: 400, - "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png", - "LayoutMirroring.enabled": !!data.mirrored - }) - verify(control) - compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png") - - var iconImage = findChild(control.contentItem, "image") - var textLabel = findChild(control.contentItem, "label") - - switch (control.display) { - case ItemDelegate.IconOnly: - verify(iconImage) - verify(!textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - break; - case ItemDelegate.TextOnly: - verify(!iconImage) - verify(textLabel) - compare(textLabel.x, control.mirrored ? control.availableWidth - textLabel.width : 0) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - case ItemDelegate.TextUnderIcon: - verify(iconImage) - verify(textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(textLabel.x, (control.availableWidth - textLabel.width) / 2) - verify(iconImage.y < textLabel.y) - break; - case ItemDelegate.TextBesideIcon: - verify(iconImage) - verify(textLabel) - if (control.mirrored) - verify(textLabel.x < iconImage.x) - else - verify(iconImage.x < textLabel.x) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_label.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -66,18 +66,6 @@ } Component { - id: backgroundLabel - Label { - background: Rectangle { } - } - } - - Component { - id: rectangle - Rectangle { } - } - - Component { id: signalSpy SignalSpy { } } @@ -127,168 +115,4 @@ compare(child.font[data.tag], defaultValue) compare(childSpy.count, 0) } - - function test_background() { - var control = createTemporaryObject(backgroundLabel, testCase, {text: "Label"}) - verify(control) - - compare(control.background.width, control.width) - compare(control.background.height, control.height) - - control.background = rectangle.createObject(control) - compare(control.background.width, control.width) - compare(control.background.height, control.height) - - // change implicit size (QTBUG-66455) - control.background.implicitWidth = 160 - control.background.implicitHeight = 120 - compare(control.background.width, control.width) - compare(control.background.height, control.height) - } - - function test_inset() { - var control = createTemporaryObject(label, testCase, {background: rectangle.createObject(control)}) - verify(control) - - var topInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "topInsetChanged"}) - verify(topInsetSpy.valid) - - var leftInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "leftInsetChanged"}) - verify(leftInsetSpy.valid) - - var rightInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "rightInsetChanged"}) - verify(rightInsetSpy.valid) - - var bottomInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "bottomInsetChanged"}) - verify(bottomInsetSpy.valid) - - var topInsetChanges = 0 - var leftInsetChanges = 0 - var rightInsetChanges = 0 - var bottomInsetChanges = 0 - - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - - control.width = 100 - control.height = 100 - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 100) - - control.topInset = 10 - compare(control.topInset, 10) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, ++topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 10) - compare(control.background.width, 100) - compare(control.background.height, 90) - - control.leftInset = 20 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, ++leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 80) - compare(control.background.height, 90) - - control.rightInset = 30 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, ++rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 50) - compare(control.background.height, 90) - - control.bottomInset = 40 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, ++bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 50) - compare(control.background.height, 50) - - control.topInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, ++topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 0) - compare(control.background.width, 50) - compare(control.background.height, 60) - - control.leftInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, ++leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 70) - compare(control.background.height, 60) - - control.rightInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, ++rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 60) - - control.bottomInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, ++bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 100) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_menuitem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_menuitem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_menuitem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_menuitem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -65,11 +65,6 @@ MenuItem { } } - Component { - id: menu - Menu { } - } - function test_baseline() { var control = createTemporaryObject(menuItem, testCase) verify(control) @@ -101,93 +96,4 @@ control.highlighted = true verify(control.highlighted) } - - function test_display_data() { - return [ - { "tag": "IconOnly", display: MenuItem.IconOnly }, - { "tag": "TextOnly", display: MenuItem.TextOnly }, - { "tag": "TextUnderIcon", display: MenuItem.TextUnderIcon }, - { "tag": "TextBesideIcon", display: MenuItem.TextBesideIcon }, - { "tag": "IconOnly, mirrored", display: MenuItem.IconOnly, mirrored: true }, - { "tag": "TextOnly, mirrored", display: MenuItem.TextOnly, mirrored: true }, - { "tag": "TextUnderIcon, mirrored", display: MenuItem.TextUnderIcon, mirrored: true }, - { "tag": "TextBesideIcon, mirrored", display: MenuItem.TextBesideIcon, mirrored: true } - ] - } - - function test_display(data) { - var control = createTemporaryObject(menuItem, testCase, { - text: "MenuItem", - display: data.display, - "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png", - "LayoutMirroring.enabled": !!data.mirrored - }) - verify(control) - compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png") - - var padding = data.mirrored ? control.contentItem.rightPadding : control.contentItem.leftPadding - var iconImage = findChild(control.contentItem, "image") - var textLabel = findChild(control.contentItem, "label") - - switch (control.display) { - case MenuItem.IconOnly: - verify(iconImage) - verify(!textLabel) - compare(iconImage.x, control.mirrored ? control.availableWidth - iconImage.width - padding : padding) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - break; - case MenuItem.TextOnly: - verify(!iconImage) - verify(textLabel) - compare(textLabel.x, control.mirrored ? control.availableWidth - textLabel.width - padding : padding) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - case MenuItem.TextUnderIcon: - verify(iconImage) - verify(textLabel) - compare(iconImage.x, control.mirrored ? control.availableWidth - iconImage.width - (textLabel.width - iconImage.width) / 2 - padding : (textLabel.width - iconImage.width) / 2 + padding) - compare(textLabel.x, control.mirrored ? control.availableWidth - textLabel.width - padding : padding) - verify(iconImage.y < textLabel.y) - break; - case MenuItem.TextBesideIcon: - verify(iconImage) - verify(textLabel) - if (control.mirrored) - verify(textLabel.x < iconImage.x) - else - verify(iconImage.x < textLabel.x) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - } - } - - function test_menu() { - var control = createTemporaryObject(menu, testCase) - verify(control) - - var item1 = createTemporaryObject(menuItem, testCase) - verify(item1) - compare(item1.menu, null) - - var item2 = createTemporaryObject(menuItem, testCase) - verify(item2) - compare(item2.menu, null) - - control.addItem(item1) - compare(item1.menu, control) - compare(item2.menu, null) - - control.insertItem(1, item2) - compare(item1.menu, control) - compare(item2.menu, control) - - control.removeItem(1) - compare(item1.menu, control) - compare(item2.menu, null) - - control.removeItem(0) - compare(item1.menu, null) - compare(item2.menu, null) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_pageindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_pageindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_pageindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_pageindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -96,7 +96,7 @@ } function test_interactive(data) { - var control = createTemporaryObject(pageIndicator, testCase, {count: 5, spacing: 10, topPadding: 10, leftPadding: 10, rightPadding: 10, bottomPadding: 10}) + var control = createTemporaryObject(pageIndicator, testCase, {count: 5, spacing: 10, padding: 10}) verify(control) verify(!control.interactive) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_page.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_page.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -132,8 +132,6 @@ verify(control.contentItem) compare(control.contentWidth, 0) compare(control.contentHeight, 0) - compare(control.implicitContentWidth, 0) - compare(control.implicitContentHeight, 0) } function test_oneChild() { @@ -142,8 +140,6 @@ compare(control.contentWidth, 100) compare(control.contentHeight, 30) - compare(control.implicitContentWidth, 100) - compare(control.implicitContentHeight, 30) compare(control.implicitWidth, 100 + control.leftPadding + control.rightPadding) compare(control.implicitHeight, 30 + control.topPadding + control.bottomPadding) } @@ -154,12 +150,8 @@ compare(control.contentWidth, 0) compare(control.contentHeight, 0) - compare(control.implicitContentWidth, 0) - compare(control.implicitContentHeight, 0) - compare(control.implicitWidth, Math.max(control.leftPadding + control.rightPadding, - control.background ? control.background.implicitWidth : 0)) - compare(control.implicitHeight, Math.max(control.topPadding + control.bottomPadding, - control.background ? control.background.implicitHeight : 0)) + compare(control.implicitWidth, control.leftPadding + control.rightPadding) + compare(control.implicitHeight, control.topPadding + control.bottomPadding) } function test_contentItem() { @@ -168,8 +160,6 @@ compare(control.contentWidth, 100) compare(control.contentHeight, 30) - compare(control.implicitContentWidth, 100) - compare(control.implicitContentHeight, 30) compare(control.implicitWidth, 100 + control.leftPadding + control.rightPadding) compare(control.implicitHeight, 30 + control.topPadding + control.bottomPadding) } @@ -241,13 +231,10 @@ + control.header.implicitHeight + control.footer.implicitHeight + 2 * control.spacing) control.header.implicitWidth = 150 - compare(control.implicitWidth, control.header.implicitWidth) + compare(control.implicitWidth, control.header.implicitWidth + control.leftPadding + control.rightPadding) control.footer.implicitWidth = 160 - compare(control.implicitWidth, control.footer.implicitWidth) - - control.contentItem.implicitWidth = 170 - compare(control.implicitWidth, control.contentItem.implicitWidth + control.leftPadding + control.rightPadding) + compare(control.implicitWidth, control.footer.implicitWidth + control.leftPadding + control.rightPadding) } function test_spacing_data() { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_pane.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -119,8 +119,6 @@ verify(control.contentItem) compare(control.contentWidth, 0) compare(control.contentHeight, 0) - compare(control.implicitContentWidth, 0) - compare(control.implicitContentHeight, 0) } function test_oneChild() { @@ -129,21 +127,8 @@ compare(control.contentWidth, 100) compare(control.contentHeight, 30) - compare(control.implicitContentWidth, 100) - compare(control.implicitContentHeight, 30) verify(control.implicitWidth > 100) verify(control.implicitHeight > 30) - - compare(control.contentChildren.length, 1) - control.contentChildren[0].implicitWidth = 200 - control.contentChildren[0].implicitHeight = 40 - - compare(control.contentWidth, 200) - compare(control.contentHeight, 40) - compare(control.implicitContentWidth, 200) - compare(control.implicitContentHeight, 40) - verify(control.implicitWidth > 200) - verify(control.implicitHeight > 40) } function test_twoChildren() { @@ -152,8 +137,6 @@ compare(control.contentWidth, 0) compare(control.contentHeight, 0) - compare(control.implicitContentWidth, 0) - compare(control.implicitContentHeight, 0) verify(control.implicitWidth > 0) verify(control.implicitHeight > 0) } @@ -164,8 +147,6 @@ compare(control.contentWidth, 100) compare(control.contentHeight, 30) - compare(control.implicitContentWidth, 100) - compare(control.implicitContentHeight, 30) verify(control.implicitWidth > 100) verify(control.implicitHeight > 30) } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_popup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.4 import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.2 +import QtQuick.Templates 2.2 as T TestCase { id: testCase @@ -361,7 +361,7 @@ } function test_margins() { - var control = createTemporaryObject(popupTemplate, testCase, {width: 100, height: 100}) + var control = createTemporaryObject(popupControl, testCase, {width: 100, height: 100}) verify(control) control.open() @@ -944,10 +944,6 @@ compare(openedSpy.count, 1) verify(control.visible) - // remove the background so that it won't affect the implicit size of the popup, - // so the implicit sizes tested below are entirely based on the content size - control.background = null - // implicit size of the content control.contentItem.implicitWidth = 10 compare(control.implicitWidth, 10 + control.leftPadding + control.rightPadding) @@ -1073,7 +1069,6 @@ tryCompare(window, "active", true) compare(window.overlay.children.length, 0) - compare(window.overlay, window.Overlay.overlay) var firstOverlay = findOverlay(window, window.firstDrawer) verify(!firstOverlay) @@ -1183,6 +1178,16 @@ compare(child.ApplicationWindow.window, null) } + SignalSpy { + id: openedSpy + signalName: "opened" + } + + SignalSpy { + id: closedSpy + signalName: "closed" + } + Component { id: pausePopup Popup { @@ -1195,32 +1200,19 @@ var control = createTemporaryObject(pausePopup, testCase) verify(control) - var openedSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "opened"}) - verify(openedSpy.valid) - var closedSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "closed"}) - verify(closedSpy.valid) - var openedChangeSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "openedChanged"}) - verify(openedChangeSpy.valid) + openedSpy.target = control + closedSpy.target = control control.open() compare(control.visible, true) - compare(control.opened, false) - compare(openedChangeSpy.count, 0) compare(openedSpy.count, 0) tryCompare(openedSpy, "count", 1) - compare(control.opened, true) - compare(openedChangeSpy.count, 1) compare(closedSpy.count, 0) control.close() - compare(control.visible, true) - compare(control.opened, false) - compare(openedChangeSpy.count, 2) compare(openedSpy.count, 1) compare(closedSpy.count, 0) tryCompare(closedSpy, "count", 1) - compare(control.opened, false) - compare(openedChangeSpy.count, 2) compare(control.visible, false) } @@ -1266,125 +1258,7 @@ var control = createTemporaryObject(popupControl, testCase, {width: 200, height: 100}) verify(control) - compare(control.background.width, 200 + (control.background.leftInset || 0) + (control.background.rightInset || 0)) - compare(control.background.height, 100 + (control.background.topInset || 0) + (control.background.bottomInset || 0)) - } - - function test_anchors() { - var control = createTemporaryObject(popupControl, applicationWindow.contentItem.Overlay.overlay, - { visible: true, width: 100, height: 100 }) - verify(control) - verify(control.visible) - compare(control.parent, control.Overlay.overlay) - compare(control.x, 0) - compare(control.y, 0) - - var overlay = control.Overlay.overlay - verify(overlay) - - var centerInSpy = createTemporaryObject(signalSpy, testCase, { target: control.anchors, signalName: "centerInChanged" }) - verify(centerInSpy.valid) - - applicationWindow.visible = true - verify(waitForRendering(applicationWindow.contentItem)) - verify(overlay.width > 0) - verify(overlay.height > 0) - - // Center the popup in the window via the overlay. - control.anchors.centerIn = Qt.binding(function() { return control.parent; }) - compare(centerInSpy.count, 1) - compare(control.x, (overlay.width - control.width) / 2) - compare(control.y, (overlay.height - control.height) / 2) - - // Ensure that it warns when trying to set it to an item that's not its parent. - var anotherItem = createTemporaryObject(rect, applicationWindow.contentItem, { x: 100, y: 100, width: 50, height: 50 }) - verify(anotherItem) - - ignoreWarning(Qt.resolvedUrl("tst_popup.qml") + ":77:9: QML Popup: Popup can only be centered within its immediate parent or Overlay.overlay") - control.anchors.centerIn = anotherItem - // The property will change, because we can't be sure that the parent - // in QQuickPopupAnchors::setCenterIn() is the final parent, as some reparenting can happen. - // We still expect the warning from QQuickPopupPositioner::reposition() though. - compare(centerInSpy.count, 2) - compare(control.anchors.centerIn, anotherItem) - - // The binding to the popup's parent was broken above, so restore it. - control.anchors.centerIn = Qt.binding(function() { return control.parent; }) - compare(centerInSpy.count, 3) - - // Change the popup's parent and ensure that it's anchored accordingly. - control.parent = Qt.binding(function() { return anotherItem; }) - compare(control.parent, anotherItem) - compare(control.anchors.centerIn, anotherItem) - compare(centerInSpy.count, 4) - compare(control.x, (anotherItem.width - control.width) / 2) - compare(control.y, (anotherItem.height - control.height) / 2) - - // Check that anchors.centerIn beats x and y coordinates as it does in QQuickItem. - control.x = 33; - control.y = 44; - compare(control.x, (anotherItem.width - control.width) / 2) - compare(control.y, (anotherItem.height - control.height) / 2) - - // Check that the popup's x and y coordinates are restored when it's no longer centered. - control.anchors.centerIn = undefined - compare(centerInSpy.count, 5) - compare(control.x, 33) - compare(control.y, 44) - - // Test centering in the overlay while having a different parent (anotherItem). - control.anchors.centerIn = overlay - compare(centerInSpy.count, 6) - compare(control.x, (overlay.width - control.width) / 2) - compare(control.y, (overlay.height - control.height) / 2) - - // TODO: do this properly by creating a component or something - applicationWindow.visible = false - } - - Component { - id: shortcutWindowComponent - ApplicationWindow { - id: window - width: 360 - height: 360 - visible: true - - property alias popup: popup - property alias shortcut: shortcut - - Popup { - id: popup - - Shortcut { - id: shortcut - sequence: "A" - onActivated: popup.visible = !popup.visible - } - } - } - } - - function test_shortcut() { - // Tests that a Shortcut with Qt.WindowShortcut context - // that is declared within a Popup is activated. - var window = createTemporaryObject(shortcutWindowComponent, testCase) - var control = window.popup - - window.requestActivate() - tryCompare(window, "active", true) - - var shortcutActivatedSpy = createTemporaryObject(signalSpy, testCase, - { target: window.shortcut, signalName: "activated"} ) - verify(shortcutActivatedSpy.valid) - - waitForRendering(window.contentItem) - keyClick(Qt.Key_A) - compare(shortcutActivatedSpy.count, 1) - tryCompare(control, "visible", true) - - keyClick(Qt.Key_A) - compare(shortcutActivatedSpy.count, 2) - tryCompare(control, "visible", false) + compare(control.background.width, 200) + compare(control.background.height, 100) } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_progressbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_progressbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_progressbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_progressbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_radiobutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_radiobutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_radiobutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_radiobutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_radiodelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_radiodelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_radiodelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_radiodelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -89,85 +89,4 @@ verify(control); compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset); } - - function test_spacing() { - var control = createTemporaryObject(radioDelegate, testCase, { text: "Some long, long, long text" }) - verify(control) - verify(control.contentItem.implicitWidth + control.leftPadding + control.rightPadding > control.background.implicitWidth) - - var textLabel = findChild(control.contentItem, "label") - verify(textLabel) - - // The implicitWidth of the IconLabel that all buttons use as their contentItem should be - // equal to the implicitWidth of the Text and the radio indicator + spacing while no icon is set. - compare(control.contentItem.implicitWidth, textLabel.implicitWidth + control.indicator.width + control.spacing) - - control.spacing += 100 - compare(control.contentItem.implicitWidth, textLabel.implicitWidth + control.indicator.width + control.spacing) - - compare(control.implicitWidth, textLabel.implicitWidth + control.indicator.width + control.spacing + control.leftPadding + control.rightPadding) - } - - function test_display_data() { - return [ - { "tag": "IconOnly", display: RadioDelegate.IconOnly }, - { "tag": "TextOnly", display: RadioDelegate.TextOnly }, - { "tag": "TextUnderIcon", display: RadioDelegate.TextUnderIcon }, - { "tag": "TextBesideIcon", display: RadioDelegate.TextBesideIcon }, - { "tag": "IconOnly, mirrored", display: RadioDelegate.IconOnly, mirrored: true }, - { "tag": "TextOnly, mirrored", display: RadioDelegate.TextOnly, mirrored: true }, - { "tag": "TextUnderIcon, mirrored", display: RadioDelegate.TextUnderIcon, mirrored: true }, - { "tag": "TextBesideIcon, mirrored", display: RadioDelegate.TextBesideIcon, mirrored: true } - ] - } - - function test_display(data) { - var control = createTemporaryObject(radioDelegate, testCase, { - text: "RadioDelegate", - display: data.display, - width: 400, - "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png", - "LayoutMirroring.enabled": !!data.mirrored - }) - verify(control) - compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png") - - var iconImage = findChild(control.contentItem, "image") - var textLabel = findChild(control.contentItem, "label") - - var availableWidth = control.availableWidth - control.indicator.width - control.spacing - var indicatorOffset = control.mirrored ? control.indicator.width + control.spacing : 0 - - switch (control.display) { - case RadioDelegate.IconOnly: - verify(iconImage) - verify(!textLabel) - compare(iconImage.x, indicatorOffset + (availableWidth - iconImage.width) / 2) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - break; - case RadioDelegate.TextOnly: - verify(!iconImage) - verify(textLabel) - compare(textLabel.x, control.mirrored ? control.availableWidth - textLabel.width : 0) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - case RadioDelegate.TextUnderIcon: - verify(iconImage) - verify(textLabel) - compare(iconImage.x, indicatorOffset + (availableWidth - iconImage.width) / 2) - compare(textLabel.x, indicatorOffset + (availableWidth - textLabel.width) / 2) - verify(iconImage.y < textLabel.y) - break; - case RadioDelegate.TextBesideIcon: - verify(iconImage) - verify(textLabel) - if (control.mirrored) - verify(textLabel.x < iconImage.x) - else - verify(iconImage.x < textLabel.x) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_rangeslider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_rangeslider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_rangeslider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_rangeslider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -96,8 +96,6 @@ compare(control.stepSize, 0) compare(control.snapMode, RangeSlider.NoSnap) compare(control.orientation, Qt.Horizontal) - compare(control.horizontal, true) - compare(control.vertical, false) } function test_values() { @@ -264,14 +262,9 @@ verify(control) compare(control.orientation, Qt.Horizontal) - compare(control.horizontal, true) - compare(control.vertical, false) verify(control.width > control.height) - control.orientation = Qt.Vertical compare(control.orientation, Qt.Vertical) - compare(control.horizontal, false) - compare(control.vertical, true) verify(control.width < control.height) } @@ -291,21 +284,12 @@ var firstPressedSpy = signalSpy.createObject(control, {target: control.first, signalName: "pressedChanged"}) verify(firstPressedSpy.valid) - var firstMovedSpy = signalSpy.createObject(control, {target: control.first, signalName: "moved"}) - verify(firstMovedSpy.valid) - var secondPressedSpy = signalSpy.createObject(control, {target: control.second, signalName: "pressedChanged"}) verify(secondPressedSpy.valid) - var secondMovedSpy = signalSpy.createObject(control, {target: control.second, signalName: "moved"}) - verify(secondMovedSpy.valid) - - // Press and release the first handle without moving it. mousePress(control, control.leftPadding, control.height - control.bottomPadding, Qt.LeftButton) compare(firstPressedSpy.count, 1) - compare(firstMovedSpy.count, 0) compare(secondPressedSpy.count, 0) - compare(secondMovedSpy.count, 0) compare(control.first.pressed, true) compare(control.first.value, 0.0) compare(control.first.position, 0.0) @@ -315,9 +299,7 @@ mouseRelease(control, control.leftPadding, control.height - control.bottomPadding, Qt.LeftButton) compare(firstPressedSpy.count, 2) - compare(firstMovedSpy.count, 0) compare(secondPressedSpy.count, 0) - compare(secondMovedSpy.count, 0) compare(control.first.pressed, false) compare(control.first.value, 0.0) compare(control.first.position, 0.0) @@ -325,12 +307,9 @@ compare(control.second.value, 1.0) compare(control.second.position, 1.0) - // Press and release the second handle without moving it. mousePress(control, control.width - control.rightPadding, control.topPadding, Qt.LeftButton) compare(firstPressedSpy.count, 2) - compare(firstMovedSpy.count, 0) compare(secondPressedSpy.count, 1) - compare(secondMovedSpy.count, 0) compare(control.first.pressed, false) compare(control.first.value, 0.0) compare(control.first.position, 0.0) @@ -340,9 +319,7 @@ mouseRelease(control, control.width - control.rightPadding, control.topPadding, Qt.LeftButton) compare(firstPressedSpy.count, 2) - compare(firstMovedSpy.count, 0) compare(secondPressedSpy.count, 2) - compare(secondMovedSpy.count, 0) compare(control.first.pressed, false) compare(control.first.value, 0.0) compare(control.first.position, 0.0) @@ -350,12 +327,9 @@ compare(control.second.value, 1.0) compare(control.second.position, 1.0) - // Press and release on the bottom left corner of the control without moving the handle. mousePress(control, 0, control.height, Qt.LeftButton) compare(firstPressedSpy.count, 3) - compare(firstMovedSpy.count, 0) compare(secondPressedSpy.count, 2) - compare(secondMovedSpy.count, 0) compare(control.first.pressed, true) compare(control.first.value, 0.0) compare(control.first.position, 0.0) @@ -365,9 +339,7 @@ mouseRelease(control, 0, control.height, Qt.LeftButton) compare(firstPressedSpy.count, 4) - compare(firstMovedSpy.count, 0) compare(secondPressedSpy.count, 2) - compare(secondMovedSpy.count, 0) compare(control.first.pressed, false) compare(control.first.value, 0.0) compare(control.first.position, 0.0) @@ -375,12 +347,9 @@ compare(control.second.value, 1.0) compare(control.second.position, 1.0) - // Drag the first handle. mousePress(control, control.leftPadding, control.height - control.bottomPadding, Qt.LeftButton) compare(firstPressedSpy.count, 5) - compare(firstMovedSpy.count, 0) compare(secondPressedSpy.count, 2) - compare(secondMovedSpy.count, 0) compare(control.first.pressed, true) compare(control.first.value, 0.0) compare(control.first.position, 0.0) @@ -393,9 +362,7 @@ var toY = horizontal ? control.first.handle.y : control.height * 0.5 mouseMove(control, toX, toY) compare(firstPressedSpy.count, 5) - compare(firstMovedSpy.count, 1) compare(secondPressedSpy.count, 2) - compare(secondMovedSpy.count, 0) compare(control.first.pressed, true) compare(control.first.value, data.live ? 0.5 : 0.0) compare(control.first.position, 0.5) @@ -407,9 +374,7 @@ mouseRelease(control, toX, toY, Qt.LeftButton) compare(firstPressedSpy.count, 6) - compare(firstMovedSpy.count, 1) compare(secondPressedSpy.count, 2) - compare(secondMovedSpy.count, 0) compare(control.first.pressed, false) compare(control.first.value, 0.5) compare(control.first.position, 0.5) @@ -436,22 +401,13 @@ var firstPressedSpy = signalSpy.createObject(control, {target: control.first, signalName: "pressedChanged"}) verify(firstPressedSpy.valid) - var firstMovedSpy = signalSpy.createObject(control, {target: control.first, signalName: "moved"}) - verify(firstMovedSpy.valid) - var secondPressedSpy = signalSpy.createObject(control, {target: control.second, signalName: "pressedChanged"}) verify(secondPressedSpy.valid) - var secondMovedSpy = signalSpy.createObject(control, {target: control.second, signalName: "moved"}) - verify(secondMovedSpy.valid) - - // Press and release the first handle without moving it. var touch = touchEvent(control) touch.press(0, control, control.width * 0.25, control.height * 0.75).commit() compare(firstPressedSpy.count, 1) - compare(firstMovedSpy.count, 0) compare(secondPressedSpy.count, 0) - compare(secondMovedSpy.count, 0) compare(control.first.pressed, true) compare(control.first.value, 0.0) compare(control.first.position, 0.0) @@ -461,9 +417,7 @@ touch.release(0, control, control.width * 0.25, control.height * 0.75).commit() compare(firstPressedSpy.count, 2) - compare(firstMovedSpy.count, 0) compare(secondPressedSpy.count, 0) - compare(secondMovedSpy.count, 0) compare(control.first.pressed, false) compare(control.first.value, 0.0) compare(control.first.position, 0.0) @@ -471,7 +425,6 @@ compare(control.second.value, 1.0) compare(control.second.position, 1.0) - // Press and release the second handle without moving it. touch.press(0, control, control.width * 0.75, control.height * 0.25).commit() compare(firstPressedSpy.count, 2) compare(secondPressedSpy.count, 1) @@ -492,7 +445,6 @@ compare(control.second.value, 1.0) compare(control.second.position, 1.0) - // Press and release on the bottom left corner of the control without moving the handle. touch.press(0, control, 0, control.height).commit() compare(firstPressedSpy.count, 3) compare(secondPressedSpy.count, 2) @@ -523,7 +475,6 @@ compare(control.second.value, 1.0) compare(control.second.position, 1.0) - // Drag the first handle. var horizontal = control.orientation === Qt.Horizontal var toX = horizontal ? control.width * 0.5 : control.first.handle.x var toY = horizontal ? control.first.handle.y : control.height * 0.5 @@ -971,115 +922,4 @@ compare(control.first.pressed, false) compare(control.second.pressed, false) } - - function test_touchDragThreshold_data() { - var d1 = 3; var d2 = 7; - return [ - { tag: "horizontal", orientation: Qt.Horizontal, dx1: d1, dy1: 0, dx2: d2, dy2: 0 }, - { tag: "vertical", orientation: Qt.Vertical, dx1: 0, dy1: -d1, dx2: 0, dy2: -d2 }, - { tag: "horizontal2", orientation: Qt.Horizontal, dx1: -d1, dy1: 0, dx2: -d2, dy2: 0 }, - { tag: "vertical2", orientation: Qt.Vertical, dx1: 0, dy1: d1, dx2: 0, dy2: d2 }, - ] - } - - function test_touchDragThreshold(data) { - var control = createTemporaryObject(sliderComponent, testCase, {touchDragThreshold: 10, live: true, orientation: data.orientation, first: {value: 0}, second: {value: 1}}) - verify(control) - compare(control.touchDragThreshold, 10) - - var valueChangedCount = 0 - var valueChangedSpy = signalSpy.createObject(control, {target: control, signalName: "touchDragThresholdChanged"}) - verify(valueChangedSpy.valid) - - control.touchDragThreshold = undefined - compare(control.touchDragThreshold, -1) // reset to -1 - compare(valueChangedSpy.count, ++valueChangedCount) - - var t = 5 - control.touchDragThreshold = t - compare(control.touchDragThreshold, t) - compare(valueChangedSpy.count, ++valueChangedCount) - - control.touchDragThreshold = t - compare(control.touchDragThreshold, t) - compare(valueChangedSpy.count, valueChangedCount) - - var pressedCount = 0 - var pressedCount2 = 0 - var visualPositionCount = 0 - var visualPositionCount2 = 0 - - var pressedSpy = signalSpy.createObject(control, {target: control.first, signalName: "pressedChanged"}) - verify(pressedSpy.valid) - var pressedSpy2 = signalSpy.createObject(control, {target: control.second, signalName: "pressedChanged"}) - verify(pressedSpy2.valid) - - var visualPositionSpy = signalSpy.createObject(control, {target: control.first, signalName: "visualPositionChanged"}) - verify(visualPositionSpy.valid) - var visualPositionSpy2 = signalSpy.createObject(control, {target: control.second, signalName: "visualPositionChanged"}) - verify(visualPositionSpy2.valid) - - var touch = touchEvent(control) - control.first.value = 0.4 - control.second.value = 1 - var x0 = control.first.handle.x + control.first.handle.width * 0.5 - var y0 = control.first.handle.y + control.first.handle.height * 0.5 - touch.press(0, control, x0, y0).commit() - compare(pressedSpy.count, ++pressedCount) - compare(control.first.pressed, true) - compare(visualPositionSpy.count, ++visualPositionCount) - - touch.move(0, control, x0 + data.dx1, y0 + data.dy1).commit() - compare(pressedSpy.count, pressedCount) - compare(control.first.pressed, true) - compare(visualPositionSpy.count, visualPositionCount) - - touch.move(0, control, x0 + data.dx2, y0 + data.dy2).commit() - compare(pressedSpy.count, pressedCount) - compare(control.first.pressed, true) - compare(visualPositionSpy.count, ++visualPositionCount) - - touch.release(0, control, x0 + data.dx2, y0 + data.dy2).commit() - - control.first.value = 0 - control.second.value = 0.6 - x0 = control.second.handle.x + control.second.handle.width * 0.5 - y0 = control.second.handle.y + control.second.handle.height * 0.5 - touch.press(0, control, x0, y0).commit() - compare(pressedSpy2.count, ++pressedCount2) - compare(control.second.pressed, true) - compare(visualPositionSpy2.count, ++visualPositionCount2) - - touch.move(0, control, x0 + data.dx1, y0 + data.dy1).commit() - compare(pressedSpy2.count, pressedCount2) - compare(control.second.pressed, true) - compare(visualPositionSpy2.count, visualPositionCount2) - - touch.move(0, control, x0 + data.dx2, y0 + data.dy2).commit() - compare(pressedSpy2.count, pressedCount2) - compare(control.second.pressed, true) - compare(visualPositionSpy2.count, ++visualPositionCount2) - touch.release(0, control, x0 + data.dx2, y0 + data.dy2).commit() - } - - function test_valueAt_data() { - return [ - { tag: "0.0..1.0", from: 0.0, to: 1.0, values: [0.0, 0.2, 0.5, 1.0] }, - { tag: "0..100", from: 0, to: 100, values: [0, 20, 50, 100] }, - { tag: "100..-100", from: 100, to: -100, values: [100, 60, 0, -100] }, - { tag: "-7..7", from: -7, to: 7, stepSize: 1.0, values: [-7.0, -4.0, 0.0, 7.0] }, - { tag: "-3..7", from: -3, to: 7, stepSize: 5.0, values: [-3.0, -3.0, 2.0, 7.0] }, - ] - } - - function test_valueAt(data) { - var control = createTemporaryObject(sliderComponent, testCase, - { from: data.from, to: data.to, stepSize: data.stepSize }) - verify(control) - - compare(control.valueAt(0.0), data.values[0]) - compare(control.valueAt(0.2), data.values[1]) - compare(control.valueAt(0.5), data.values[2]) - compare(control.valueAt(1.0), data.values[3]) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_roundbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_roundbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_roundbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_roundbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -84,83 +84,4 @@ control.width = 10; compare(control.radius, 5); } - - function test_spacing() { - var control = createTemporaryObject(roundButton, testCase, { text: "Some long, long, long text" }) - verify(control) - verify(control.contentItem.implicitWidth + control.leftPadding + control.rightPadding > control.background.implicitWidth) - - var textLabel = findChild(control.contentItem, "label") - verify(textLabel) - - // The implicitWidth of the IconLabel that all buttons use as their contentItem - // should be equal to the implicitWidth of the Text while no icon is set. - compare(control.contentItem.implicitWidth, textLabel.implicitWidth) - - // That means that spacing shouldn't affect it. - control.spacing += 100 - compare(control.contentItem.implicitWidth, textLabel.implicitWidth) - - // The implicitWidth of the Button itself should, therefore, also never include spacing while no icon is set. - compare(control.implicitWidth, textLabel.implicitWidth + control.leftPadding + control.rightPadding) - } - - function test_display_data() { - return [ - { "tag": "IconOnly", display: RoundButton.IconOnly }, - { "tag": "TextOnly", display: RoundButton.TextOnly }, - { "tag": "TextUnderIcon", display: RoundButton.TextUnderIcon }, - { "tag": "TextBesideIcon", display: RoundButton.TextBesideIcon }, - { "tag": "IconOnly, mirrored", display: RoundButton.IconOnly, mirrored: true }, - { "tag": "TextOnly, mirrored", display: RoundButton.TextOnly, mirrored: true }, - { "tag": "TextUnderIcon, mirrored", display: RoundButton.TextUnderIcon, mirrored: true }, - { "tag": "TextBesideIcon, mirrored", display: RoundButton.TextBesideIcon, mirrored: true } - ] - } - - function test_display(data) { - var control = createTemporaryObject(roundButton, testCase, { - text: "RoundButton", - display: data.display, - "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png", - "LayoutMirroring.enabled": !!data.mirrored - }) - verify(control) - compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png") - - var iconImage = findChild(control.contentItem, "image") - var textLabel = findChild(control.contentItem, "label") - - switch (control.display) { - case RoundButton.IconOnly: - verify(iconImage) - verify(!textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - break; - case RoundButton.TextOnly: - verify(!iconImage) - verify(textLabel) - compare(textLabel.x, (control.availableWidth - textLabel.width) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - case RoundButton.TextUnderIcon: - verify(iconImage) - verify(textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(textLabel.x, (control.availableWidth - textLabel.width) / 2) - verify(iconImage.y < textLabel.y) - break; - case RoundButton.TextBesideIcon: - verify(iconImage) - verify(textLabel) - if (control.mirrored) - verify(textLabel.x < iconImage.x) - else - verify(iconImage.x < textLabel.x) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_scrollbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_scrollbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_scrollbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_scrollbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -735,20 +735,6 @@ compare(horizontal.contentItem.width, 0.2 * horizontal.availableWidth) } - function test_orientation() { - var control = createTemporaryObject(scrollBar, testCase) - verify(control) - - compare(control.orientation, Qt.Vertical) - compare(control.horizontal, false) - compare(control.vertical, true) - - control.orientation = Qt.Horizontal - compare(control.orientation, Qt.Horizontal) - compare(control.horizontal, true) - compare(control.vertical, false) - } - function test_flashing() { var control = createTemporaryObject(scrollBar, testCase, {size: 0.2}) verify(control) @@ -788,52 +774,4 @@ if (control.background) tryCompare(control.background, "opacity", 0) } - - function test_minimumSize() { - var container = createTemporaryObject(flickable, testCase) - verify(container) - waitForRendering(container) - - var vertical = scrollBar.createObject(container, {minimumSize: 0.1}) - container.ScrollBar.vertical = vertical - - compare(container.visibleArea.heightRatio, 0.5) - compare(vertical.size, 0.5) - compare(vertical.visualSize, 0.5) - compare(vertical.contentItem.height, 0.5 * vertical.availableHeight) - - container.contentHeight = 2000 - - compare(container.visibleArea.heightRatio, 0.05) - compare(vertical.size, 0.05) - compare(vertical.visualSize, 0.1) - compare(vertical.contentItem.height, 0.1 * vertical.availableHeight) - - verify(container.atYBeginning) - compare(container.visibleArea.yPosition, 0.0) - compare(vertical.position, 0.0) - compare(vertical.visualPosition, 0.0) - compare(vertical.contentItem.y, vertical.topPadding) - - container.contentY = 1900 - - verify(container.atYEnd) - compare(container.visibleArea.yPosition, 0.95) - compare(vertical.position, 0.95) - compare(vertical.visualPosition, 0.9) - compare(vertical.contentItem.y, vertical.topPadding + 0.9 * vertical.availableHeight) - - container.contentHeight = 125 - - compare(container.visibleArea.heightRatio, 0.8) - compare(vertical.size, 0.8) - compare(vertical.visualSize, 0.8) - compare(vertical.contentItem.height, 0.8 * vertical.availableHeight) - - verify(container.atYEnd) - compare(container.visibleArea.yPosition, 0.2) - compare(vertical.position, 0.2) - compare(vertical.visualPosition, 0.2) - compare(vertical.contentItem.y, vertical.topPadding + 0.2 * vertical.availableHeight) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_scrollindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_scrollindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_scrollindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_scrollindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -223,20 +223,6 @@ compare(horizontal.contentItem.width, 0.2 * horizontal.availableWidth) } - function test_orientation() { - var control = createTemporaryObject(scrollIndicator, testCase) - verify(control) - - compare(control.orientation, Qt.Vertical) - compare(control.horizontal, false) - compare(control.vertical, true) - - control.orientation = Qt.Horizontal - compare(control.orientation, Qt.Horizontal) - compare(control.horizontal, true) - compare(control.vertical, false) - } - // QTBUG-61785 function test_mouseArea() { var ma = createTemporaryObject(mouseArea, testCase, {width: testCase.width, height: testCase.height}) @@ -258,52 +244,4 @@ touch.release(0, control).commit() verify(!ma.pressed) } - - function test_minimumSize() { - var container = createTemporaryObject(flickable, testCase) - verify(container) - waitForRendering(container) - - var vertical = scrollIndicator.createObject(container, {minimumSize: 0.1}) - container.ScrollIndicator.vertical = vertical - - compare(container.visibleArea.heightRatio, 0.5) - compare(vertical.size, 0.5) - compare(vertical.visualSize, 0.5) - compare(vertical.contentItem.height, 0.5 * vertical.availableHeight) - - container.contentHeight = 2000 - - compare(container.visibleArea.heightRatio, 0.05) - compare(vertical.size, 0.05) - compare(vertical.visualSize, 0.1) - compare(vertical.contentItem.height, 0.1 * vertical.availableHeight) - - verify(container.atYBeginning) - compare(container.visibleArea.yPosition, 0.0) - compare(vertical.position, 0.0) - compare(vertical.visualPosition, 0.0) - compare(vertical.contentItem.y, vertical.topPadding) - - container.contentY = 1900 - - verify(container.atYEnd) - compare(container.visibleArea.yPosition, 0.95) - compare(vertical.position, 0.95) - compare(vertical.visualPosition, 0.9) - compare(vertical.contentItem.y, vertical.topPadding + 0.9 * vertical.availableHeight) - - container.contentHeight = 125 - - compare(container.visibleArea.heightRatio, 0.8) - compare(vertical.size, 0.8) - compare(vertical.visualSize, 0.8) - compare(vertical.contentItem.height, 0.8 * vertical.availableHeight) - - verify(container.atYEnd) - compare(container.visibleArea.yPosition, 0.2) - compare(vertical.position, 0.2) - compare(vertical.visualPosition, 0.2) - compare(vertical.contentItem.y, vertical.topPadding + 0.2 * vertical.availableHeight) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_scrollview.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_scrollview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_scrollview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_scrollview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -118,22 +118,6 @@ } Component { - id: emptyFlickable - ScrollView { - Flickable { - } - } - } - - Component { - id: labelComponent - Label { - text: "ABC" - font.pixelSize: 512 - } - } - - Component { id: scrollableListView ScrollView { ListView { @@ -146,40 +130,6 @@ } Component { - id: scrollableFlickable - ScrollView { - Flickable { - Item { - width: 100 - height: 100 - } - } - } - } - - Component { - id: scrollableWithContentSize - ScrollView { - contentWidth: 1000 - contentHeight: 1000 - Flickable { - } - } - } - - Component { - id: scrollableAndFlicableWithContentSize - ScrollView { - contentWidth: 1000 - contentHeight: 1000 - Flickable { - contentWidth: 200 - contentHeight: 200 - } - } - } - - Component { id: scrollableTextArea ScrollView { TextArea { @@ -291,94 +241,6 @@ compare(control.contentHeight, listview.contentHeight) } - function test_scrollableFlickable() { - // Check that if the application adds a flickable as a child of a - // scrollview, the scrollview doesn't try to calculate and change - // the flickables contentWidth/Height based on the flickables - // children, even if the flickable has an empty or negative content - // size. Some flickables (e.g ListView) sets a negative - // contentWidth on purpose, which should be respected. - var scrollview = createTemporaryObject(scrollableFlickable, testCase) - verify(scrollview) - - var flickable = scrollview.contentItem - verify(flickable.hasOwnProperty("contentX")) - verify(flickable.hasOwnProperty("contentY")) - - compare(flickable.contentWidth, -1) - compare(flickable.contentHeight, -1) - compare(scrollview.contentWidth, -1) - compare(scrollview.contentHeight, -1) - } - - function test_scrollableWithContentSize() { - // Check that if the scrollview has contentWidth/Height set, but - // not the flickable, then those values will be forwarded and used - // by the flickable (rather than trying to calculate the content size - // based on the flickables children). - var scrollview = createTemporaryObject(scrollableWithContentSize, testCase) - verify(scrollview) - - var flickable = scrollview.contentItem - verify(flickable.hasOwnProperty("contentX")) - verify(flickable.hasOwnProperty("contentY")) - - compare(flickable.contentWidth, 1000) - compare(flickable.contentHeight, 1000) - compare(scrollview.contentWidth, 1000) - compare(scrollview.contentHeight, 1000) - } - - function test_scrollableAndFlickableWithContentSize() { - // Check that if both the scrollview and the flickable has - // contentWidth/Height set (which is an inconsistency/fault - // by the app), the content size of the scrollview wins. - var scrollview = createTemporaryObject(scrollableAndFlicableWithContentSize, testCase) - verify(scrollview) - - var flickable = scrollview.contentItem - verify(flickable.hasOwnProperty("contentX")) - verify(flickable.hasOwnProperty("contentY")) - - compare(flickable.contentWidth, 1000) - compare(flickable.contentHeight, 1000) - compare(scrollview.contentWidth, 1000) - compare(scrollview.contentHeight, 1000) - } - - function test_flickableWithExplicitContentSize() { - var control = createTemporaryObject(emptyFlickable, testCase) - verify(control) - - var flickable = control.contentItem - verify(flickable.hasOwnProperty("contentX")) - verify(flickable.hasOwnProperty("contentY")) - - var flickableContentSize = 1000; - flickable.contentWidth = flickableContentSize; - flickable.contentHeight = flickableContentSize; - - compare(flickable.contentWidth, flickableContentSize) - compare(flickable.contentHeight, flickableContentSize) - compare(control.implicitWidth, flickableContentSize) - compare(control.implicitHeight, flickableContentSize) - compare(control.contentWidth, flickableContentSize) - compare(control.contentHeight, flickableContentSize) - - // Add a single child to the flickable. This should not - // trick ScrollView into taking the implicit size of - // the child as content size, since the flickable - // already has an explicit content size. - labelComponent.createObject(flickable); - - compare(flickable.contentWidth, flickableContentSize) - compare(flickable.contentHeight, flickableContentSize) - compare(control.implicitWidth, flickableContentSize) - compare(control.implicitHeight, flickableContentSize) - compare(control.contentWidth, flickableContentSize) - compare(control.contentHeight, flickableContentSize) - } - function test_mouse() { var control = createTemporaryObject(scrollView, testCase, {width: 200, height: 200, contentHeight: 400}) verify(control) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_slider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -77,8 +77,6 @@ compare(control.stepSize, 0) compare(control.snapMode, Slider.NoSnap) compare(control.orientation, Qt.Horizontal) - compare(control.horizontal, true) - compare(control.vertical, false) } function test_value() { @@ -203,14 +201,9 @@ verify(control) compare(control.orientation, Qt.Horizontal) - compare(control.horizontal, true) - compare(control.vertical, false) verify(control.width > control.height) - control.orientation = Qt.Vertical compare(control.orientation, Qt.Vertical) - compare(control.horizontal, false) - compare(control.vertical, true) verify(control.width < control.height) } @@ -772,63 +765,6 @@ compare(control.position, 0.25) } - function test_wheelPropagation_data() { - return [ - { tag: "horizontal", orientation: Qt.Horizontal, dx: 120, dy: 0 }, - { tag: "vertical", orientation: Qt.Vertical, dx: 0, dy: 120 } - ] - } - - Component { - id: mouseAreaComponent - MouseArea {} - } - - function test_wheelPropagation(data) { - var mouseArea = createTemporaryObject(mouseAreaComponent, testCase, { width: parent.width, height: parent.height }) - verify(mouseArea) - - var mouseAreaWheelSpy = signalSpy.createObject(mouseArea, { target: mouseArea, signalName: "wheel" }) - verify(mouseAreaWheelSpy.valid) - - var control = createTemporaryObject(slider, mouseArea, - { wheelEnabled: true, orientation: data.orientation, stepSize: 1 }) - verify(control) - compare(control.value, 0.0) - - var movedCount = 0 - var movedSpy = signalSpy.createObject(control, { target: control, signalName: "moved" }) - verify(movedSpy.valid) - - // Scroll the handle to the edge. - mouseWheel(control, control.width / 2, control.height / 2, data.dx, data.dy) - compare(control.value, 1.0) - compare(control.position, 1.0) - compare(movedSpy.count, ++movedCount) - compare(mouseAreaWheelSpy.count, 0) - - // Scroll again; the wheel event shouldn't go through to the MouseArea parent. - mouseWheel(control, control.width / 2, control.height / 2, data.dx, data.dy) - compare(control.value, 1.0) - compare(control.position, 1.0) - compare(movedSpy.count, movedCount) - compare(mouseAreaWheelSpy.count, 0) - - // Scroll the handle to the other edge. - mouseWheel(control, control.width / 2, control.height / 2, -data.dx, -data.dy) - compare(control.value, 0.0) - compare(control.position, 0.0) - compare(movedSpy.count, ++movedCount) - compare(mouseAreaWheelSpy.count, 0) - - // Scroll again; the wheel event shouldn't go through to the MouseArea parent. - mouseWheel(control, control.width / 2, control.height / 2, -data.dx, -data.dy) - compare(control.value, 0.0) - compare(control.position, 0.0) - compare(movedSpy.count, movedCount) - compare(mouseAreaWheelSpy.count, 0) - } - function test_valueAt_data() { return [ { tag: "0.0..1.0", from: 0.0, to: 1.0, values: [0.0, 0.2, 0.5, 1.0] }, @@ -861,66 +797,4 @@ mouseRelease(control) compare(control.pressed, false) } - - function test_touchDragThreshold_data() { - var d1 = 3; var d2 = 7; - return [ - { tag: "horizontal", orientation: Qt.Horizontal, dx1: d1, dy1: 0, dx2: d2, dy2: 0 }, - { tag: "vertical", orientation: Qt.Vertical, dx1: 0, dy1: -d1, dx2: 0, dy2: -d2 }, - { tag: "horizontal2", orientation: Qt.Horizontal, dx1: -d1, dy1: 0, dx2: -d2, dy2: 0 }, - { tag: "vertical2", orientation: Qt.Vertical, dx1: 0, dy1: d1, dx2: 0, dy2: d2 } - ] - } - - function test_touchDragThreshold(data) { - var control = createTemporaryObject(slider, testCase, {touchDragThreshold: 10, live: true, orientation: data.orientation, value: 0.5}) - verify(control) - compare(control.touchDragThreshold, 10) - - var valueChangedCount = 0 - var valueChangedSpy = signalSpy.createObject(control, {target: control, signalName: "touchDragThresholdChanged"}) - verify(valueChangedSpy.valid) - - control.touchDragThreshold = undefined - compare(control.touchDragThreshold, -1) // reset to -1 - compare(valueChangedSpy.count, ++valueChangedCount) - - var t = 5 - control.touchDragThreshold = t - compare(control.touchDragThreshold, t) - compare(valueChangedSpy.count, ++valueChangedCount) - - control.touchDragThreshold = t - compare(control.touchDragThreshold, t) - compare(valueChangedSpy.count, valueChangedCount) - - var pressedCount = 0 - var movedCount = 0 - - var pressedSpy = signalSpy.createObject(control, {target: control, signalName: "pressedChanged"}) - verify(pressedSpy.valid) - - var movedSpy = signalSpy.createObject(control, {target: control, signalName: "moved"}) - verify(movedSpy.valid) - - var touch = touchEvent(control) - var x0 = control.handle.x + control.handle.width * 0.5 - var y0 = control.handle.y + control.handle.height * 0.5 - touch.press(0, control, x0, y0).commit() - compare(pressedSpy.count, ++pressedCount) - compare(movedSpy.count, movedCount) - compare(control.pressed, true) - - touch.move(0, control, x0 + data.dx1, y0 + data.dy1).commit() - compare(pressedSpy.count, pressedCount) - compare(movedSpy.count, movedCount) // shouldn't move - compare(control.pressed, true) - - touch.move(0, control, x0 + data.dx2, y0 + data.dy2).commit() - compare(pressedSpy.count, pressedCount) - compare(movedSpy.count, ++movedCount) - compare(control.pressed, true) - - touch.release(0, control, x0 + data.dx2, y0 + data.dy2).commit() - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_spinbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_spinbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_spinbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_spinbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.12 +import QtQuick.Controls 2.2 +import QtQuick.Window 2.3 TestCase { id: testCase @@ -71,11 +71,6 @@ SpinBox { } } - Component { - id: mouseArea - MouseArea { } - } - function test_defaults() { var control = createTemporaryObject(spinBox, testCase) verify(control) @@ -121,23 +116,15 @@ compare(control.up.indicator.enabled, false) compare(control.down.indicator.enabled, true) - control.wrap = true - compare(control.up.indicator.enabled, true) - compare(control.down.indicator.enabled, true) - control.value = -1 compare(control.value, 0) compare(control.up.indicator.enabled, true) - compare(control.down.indicator.enabled, true) + compare(control.down.indicator.enabled, false) control.from = 25 compare(control.from, 25) compare(control.value, 25) compare(control.up.indicator.enabled, true) - compare(control.down.indicator.enabled, true) - - control.wrap = false - compare(control.up.indicator.enabled, true) compare(control.down.indicator.enabled, false) control.value = 30 @@ -242,19 +229,8 @@ compare(valueModifiedSpy.count, data.modified) } - function test_keys_data() { - return [ - { tag: "1", from: 1, to: 10, value: 1, stepSize: 1, upSteps: [2,3,4], downSteps: [3,2,1,1] }, - { tag: "2", from: 1, to: 10, value: 10, stepSize: 2, upSteps: [10,10], downSteps: [8,6,4] }, - { tag: "25", from: 0, to: 100, value: 50, stepSize: 25, upSteps: [75,100,100], downSteps: [75,50,25,0,0] }, - { tag: "wrap1", wrap: true, from: 1, to: 10, value: 1, stepSize: 1, upSteps: [2,3], downSteps: [2,1,10,9] }, - { tag: "wrap2", wrap: true, from: 1, to: 10, value: 10, stepSize: 2, upSteps: [1,3,5], downSteps: [3,1,10,8,6] }, - { tag: "wrap25", wrap: true, from: 0, to: 100, value: 50, stepSize: 25, upSteps: [75,100,0,25], downSteps: [0,100,75] } - ] - } - - function test_keys(data) { - var control = createTemporaryObject(spinBox, testCase, {wrap: data.wrap, from: data.from, to: data.to, value: data.value, stepSize: data.stepSize}) + function test_keys() { + var control = createTemporaryObject(spinBox, testCase) verify(control) var upPressedCount = 0 @@ -273,31 +249,48 @@ control.forceActiveFocus() verify(control.activeFocus) - for (var u = 0; u < data.upSteps.length; ++u) { - var wasUpEnabled = control.wrap || control.value < control.to - keyPress(Qt.Key_Up) - compare(control.up.pressed, wasUpEnabled) + control.value = 50 + compare(control.value, 50) + + for (var d1 = 1; d1 <= 10; ++d1) { + keyPress(Qt.Key_Down) + compare(control.down.pressed, true) + compare(control.up.pressed, false) + compare(downPressedSpy.count, ++downPressedCount) + compare(valueModifiedSpy.count, ++valueModifiedCount) + + compare(control.value, 50 - d1) + + keyRelease(Qt.Key_Down) compare(control.down.pressed, false) - if (wasUpEnabled) { - ++upPressedCount - ++valueModifiedCount - } - compare(upPressedSpy.count, upPressedCount) + compare(control.up.pressed, false) + compare(downPressedSpy.count, ++downPressedCount) compare(valueModifiedSpy.count, valueModifiedCount) + } + compare(control.value, 40) + + for (var i1 = 1; i1 <= 10; ++i1) { + keyPress(Qt.Key_Up) + compare(control.up.pressed, true) + compare(control.down.pressed, false) + compare(upPressedSpy.count, ++upPressedCount) + compare(valueModifiedSpy.count, ++valueModifiedCount) - compare(control.value, data.upSteps[u]) + compare(control.value, 40 + i1) keyRelease(Qt.Key_Up) compare(control.down.pressed, false) compare(control.up.pressed, false) - if (wasUpEnabled) - ++upPressedCount - compare(upPressedSpy.count, upPressedCount) + compare(upPressedSpy.count, ++upPressedCount) compare(valueModifiedSpy.count, valueModifiedCount) } + compare(control.value, 50) + + control.stepSize = 25 + compare(control.stepSize, 25) - for (var d = 0; d < data.downSteps.length; ++d) { - var wasDownEnabled = control.wrap || control.value > control.from + for (var d2 = 1; d2 <= 10; ++d2) { + var wasDownEnabled = control.value > control.from keyPress(Qt.Key_Down) compare(control.down.pressed, wasDownEnabled) compare(control.up.pressed, false) @@ -308,7 +301,7 @@ compare(downPressedSpy.count, downPressedCount) compare(valueModifiedSpy.count, valueModifiedCount) - compare(control.value, data.downSteps[d]) + compare(control.value, Math.max(0, 50 - d2 * 25)) keyRelease(Qt.Key_Down) compare(control.down.pressed, false) @@ -318,6 +311,31 @@ compare(downPressedSpy.count, downPressedCount) compare(valueModifiedSpy.count, valueModifiedCount) } + compare(control.value, 0) + + for (var i2 = 1; i2 <= 10; ++i2) { + var wasUpEnabled = control.value < control.to + keyPress(Qt.Key_Up) + compare(control.up.pressed, wasUpEnabled) + compare(control.down.pressed, false) + if (wasUpEnabled) { + ++upPressedCount + ++valueModifiedCount + } + compare(upPressedSpy.count, upPressedCount) + compare(valueModifiedSpy.count, valueModifiedCount) + + compare(control.value, Math.min(99, i2 * 25)) + + keyRelease(Qt.Key_Up) + compare(control.down.pressed, false) + compare(control.up.pressed, false) + if (wasUpEnabled) + ++upPressedCount + compare(upPressedSpy.count, upPressedCount) + compare(valueModifiedSpy.count, valueModifiedCount) + } + compare(control.value, 99) } function test_locale() { @@ -372,9 +390,6 @@ var control = createTemporaryObject(spinBox, testCase) verify(control) - var valueModifiedSpy = signalSpy.createObject(control, {target: control, signalName: "valueModified"}) - verify(valueModifiedSpy.valid) - control.contentItem.forceActiveFocus() compare(control.contentItem.activeFocus, true) @@ -383,7 +398,6 @@ keyClick(Qt.Key_5) keyClick(Qt.Key_Return) compare(control.value, 0) - compare(valueModifiedSpy.count, 0) control.editable = true compare(control.editable, true) @@ -391,55 +405,48 @@ keyClick(Qt.Key_5) keyClick(Qt.Key_Return) compare(control.value, 5) - compare(valueModifiedSpy.count, 1) - } - - function test_wheel_data() { - return [ - { tag: "1", from: 1, to: 10, value: 1, stepSize: 1, upSteps: [2,3,4], downSteps: [3,2,1,1] }, - { tag: "2", from: 1, to: 10, value: 10, stepSize: 2, upSteps: [10,10], downSteps: [8,6,4] }, - { tag: "25", from: 0, to: 100, value: 50, stepSize: 25, upSteps: [75,100,100], downSteps: [75,50,25,0,0] }, - { tag: "wrap1", wrap: true, from: 1, to: 10, value: 1, stepSize: 1, upSteps: [2,3], downSteps: [2,1,10,9] }, - { tag: "wrap2", wrap: true, from: 1, to: 10, value: 10, stepSize: 2, upSteps: [1,3,5], downSteps: [3,1,10,8,6] }, - { tag: "wrap25", wrap: true, from: 0, to: 100, value: 50, stepSize: 25, upSteps: [75,100,0,25], downSteps: [0,100,75] } - ] } function test_wheel(data) { - var ma = createTemporaryObject(mouseArea, testCase, {width: 100, height: 100}) - verify(ma) - - var control = spinBox.createObject(ma, {wrap: data.wrap, from: data.from, to: data.to, value: data.value, stepSize: data.stepSize, wheelEnabled: true}) + var control = createTemporaryObject(spinBox, testCase, {wheelEnabled: true}) verify(control) - var valueModifiedCount = 0 var valueModifiedSpy = signalSpy.createObject(control, {target: control, signalName: "valueModified"}) verify(valueModifiedSpy.valid) var delta = 120 - var spy = signalSpy.createObject(ma, {target: ma, signalName: "wheel"}) - verify(spy.valid) + compare(control.value, 0) - for (var u = 0; u < data.upSteps.length; ++u) { - var wasUpEnabled = control.wrap || control.value < control.to - mouseWheel(control, control.width / 2, control.height / 2, delta, delta) - if (wasUpEnabled) - ++valueModifiedCount - compare(valueModifiedSpy.count, valueModifiedCount) - compare(spy.count, 0) // no propagation - compare(control.value, data.upSteps[u]) - } + mouseWheel(control, control.width / 2, control.height / 2, delta, delta) + compare(control.value, 1) + compare(valueModifiedSpy.count, 1) - for (var d = 0; d < data.downSteps.length; ++d) { - var wasDownEnabled = control.wrap || control.value > control.from - mouseWheel(control, control.width / 2, control.height / 2, -delta, -delta) - if (wasDownEnabled) - ++valueModifiedCount - compare(valueModifiedSpy.count, valueModifiedCount) - compare(spy.count, 0) // no propagation - compare(control.value, data.downSteps[d]) - } + control.stepSize = 2 + + mouseWheel(control, control.width / 2, control.height / 2, delta, delta) + compare(control.value, 3) + compare(valueModifiedSpy.count, 2) + + control.stepSize = 10 + + mouseWheel(control, control.width / 2, control.height / 2, -delta, -delta) + compare(control.value, 0) + compare(valueModifiedSpy.count, 3) + + control.stepSize = 5 + + mouseWheel(control, control.width / 2, control.height / 2, delta, delta) + compare(control.value, 5) + compare(valueModifiedSpy.count, 4) + + mouseWheel(control, control.width / 2, control.height / 2, 0.5 * delta, 0.5 * delta) + compare(control.value, 8) + compare(valueModifiedSpy.count, 5) + + mouseWheel(control, control.width / 2, control.height / 2, -delta, -delta) + compare(control.value, 3) + compare(valueModifiedSpy.count, 6) } function test_initiallyDisabledIndicators_data() { @@ -486,39 +493,6 @@ compare(button.hovered, false) } - function test_hoverWhilePressed_data() { - return [ - { tag: "up" }, - { tag: "down" }, - ] - } - - // QTBUG-74688 - function test_hoverWhilePressed(data) { - var control = createTemporaryObject(spinBox, testCase, { hoverEnabled: true, value: 50 }) - verify(control) - - var button = control[data.tag] - compare(control.hovered, false) - compare(button.hovered, false) - - // Hover over the indicator. It should be hovered. - var buttonXCenter = button.indicator.x + button.indicator.width / 2 - var buttonYCenter = button.indicator.y + button.indicator.height / 2 - mouseMove(control, buttonXCenter, buttonYCenter) - compare(button.hovered, true) - - // Press on the indicator and then move the mouse outside of it. - mousePress(control, buttonXCenter, buttonYCenter) - compare(button.hovered, true) - mouseMove(control, buttonXCenter - button.indicator.width, buttonYCenter - button.indicator.height) - // It should not be pressed or hovered. - compare(button.pressed, false) - compare(button.hovered, false) - - mouseRelease(control) - } - function test_valueFromText_data() { return [ { tag: "editable", editable: true }, @@ -614,48 +588,4 @@ verify(control) compare(control.value, 1000) } - - Component { - id: sizeBox - SpinBox { - from: 0 - to: items.length - 1 - - property var items: ["Small", "Medium", "Large"] - - validator: RegExpValidator { - regExp: new RegExp("(Small|Medium|Large)", "i") - } - - textFromValue: function(value) { - return items[value]; - } - - valueFromText: function(text) { - for (var i = 0; i < items.length; ++i) { - if (items[i].toLowerCase().indexOf(text.toLowerCase()) === 0) - return i - } - return sb.value - } - } - } - - function test_textFromValue_data() { - return [ - { tag: "default", component: spinBox, values: [0, 10, 99], displayTexts: ["0", "10", "99"] }, - { tag: "custom", component: sizeBox, values: [0, 1, 2], displayTexts: ["Small", "Medium", "Large"] } - ] - } - - function test_textFromValue(data) { - var control = createTemporaryObject(data.component, testCase) - verify(control) - - for (var i = 0; i < data.values.length; ++i) { - control.value = data.values[i] - compare(control.value, data.values[i]) - compare(control.displayText, data.displayTexts[i]) - } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_stackview.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_stackview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_stackview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_stackview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -61,7 +61,7 @@ name: "StackView" Item { id: item } - Component { id: textField; TextField { } } + TextField { id: textField } Component { id: component; Item { } } Component { @@ -221,75 +221,33 @@ function test_depth() { var control = createTemporaryObject(stackView, testCase) verify(control) - - var depthChanges = 0 - var emptyChanges = 0 var depthSpy = signalSpy.createObject(control, {target: control, signalName: "depthChanged"}) - var emptySpy = signalSpy.createObject(control, {target: control, signalName: "emptyChanged"}) verify(depthSpy.valid) - verify(emptySpy.valid) compare(control.depth, 0) - compare(control.empty, true) - control.push(item, StackView.Immediate) compare(control.depth, 1) - compare(depthSpy.count, ++depthChanges) - compare(control.empty, false) - compare(emptySpy.count, ++emptyChanges) - + compare(depthSpy.count, 1) control.clear() compare(control.depth, 0) - compare(depthSpy.count, ++depthChanges) - compare(control.empty, true) - compare(emptySpy.count, ++emptyChanges) - + compare(depthSpy.count, 2) control.push(component, StackView.Immediate) compare(control.depth, 1) - compare(depthSpy.count, ++depthChanges) - compare(control.empty, false) - compare(emptySpy.count, ++emptyChanges) - + compare(depthSpy.count, 3) control.push(component, StackView.Immediate) compare(control.depth, 2) - compare(depthSpy.count, ++depthChanges) - compare(control.empty, false) - compare(emptySpy.count, emptyChanges) - - control.replace(component, StackView.Immediate) - compare(control.depth, 2) - compare(depthSpy.count, depthChanges) - compare(control.empty, false) - compare(emptySpy.count, emptyChanges) - - control.replace([component, component], StackView.Immediate) - compare(control.depth, 3) - compare(depthSpy.count, ++depthChanges) - compare(control.empty, false) - compare(emptySpy.count, emptyChanges) - - control.pop(null, StackView.Immediate) + compare(depthSpy.count, 4) + control.pop(StackView.Immediate) compare(control.depth, 1) - compare(depthSpy.count, ++depthChanges) - compare(control.empty, false) - compare(emptySpy.count, emptyChanges) - + compare(depthSpy.count, 5) control.pop(StackView.Immediate) // ignored compare(control.depth, 1) - compare(depthSpy.count, depthChanges) - compare(control.empty, false) - compare(emptySpy.count, emptyChanges) - + compare(depthSpy.count, 5) control.clear() compare(control.depth, 0) - compare(depthSpy.count, ++depthChanges) - compare(control.empty, true) - compare(emptySpy.count, ++emptyChanges) - + compare(depthSpy.count, 6) control.clear() compare(control.depth, 0) - compare(depthSpy.count, depthChanges) - compare(control.empty, true) - compare(emptySpy.count, emptyChanges) + compare(depthSpy.count, 6) } function test_size() { @@ -323,33 +281,22 @@ compare(item.height, control.height) } - function test_focus_data() { - return [ - { tag: "true", focus: true, forceActiveFocus: false }, - { tag: "false", focus: false, forceActiveFocus: false }, - { tag: "forceActiveFocus()", focus: false, forceActiveFocus: true }, - ] - } - - function test_focus(data) { + function test_focus() { var control = createTemporaryObject(stackView, testCase, {initialItem: item, width: 200, height: 200}) verify(control) - if (data.focus) - control.focus = true - if (data.forceActiveFocus) - control.forceActiveFocus() - compare(control.activeFocus, data.focus || data.forceActiveFocus) - - var page = control.push(textField, StackView.Immediate) - verify(page) - compare(control.currentItem, page) - compare(page.activeFocus, control.activeFocus) + control.forceActiveFocus() + verify(control.activeFocus) + + control.push(textField, StackView.Immediate) + compare(control.currentItem, textField) + textField.forceActiveFocus() + verify(textField.activeFocus) control.pop(StackView.Immediate) compare(control.currentItem, item) - compare(item.activeFocus, data.focus || data.forceActiveFocus) - verify(!page.activeFocus) + verify(control.activeFocus) + verify(!textField.activeFocus) } function test_find() { @@ -563,24 +510,6 @@ compare(control.currentItem, item8) } - function test_clear() { - var control = createTemporaryObject(stackView, testCase) - verify(control) - - control.push(component, StackView.Immediate) - - control.clear() - compare(control.depth, 0) - compare(control.busy, false) - - control.push(component, StackView.Immediate) - - control.clear(StackView.PopTransition) - compare(control.depth, 0) - compare(control.busy, true) - tryCompare(control, "busy", false) - } - function test_visibility_data() { return [ {tag:"default transitions", properties: {}}, @@ -1230,19 +1159,4 @@ touch.release(0, control).commit() verify(!ma.pressed) } - - // Separate function to ensure that the temporary value created to hold the return value of the Qt.createComponent() - // call is out of scope when the caller calls gc(). - function stackViewFactory() - { - return createTemporaryObject(stackView, testCase, {initialItem: Qt.createComponent("TestItem.qml")}) - } - - function test_initalItemOwnership() - { - var control = stackViewFactory() - verify(control) - gc() - verify(control.initialItem) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_swipedelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_swipedelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_swipedelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_swipedelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { @@ -572,7 +572,7 @@ verify(closedSpy.valid); // The button should be pressed instead of the SwipeDelegate. - mouseDrag(control, control.width / 2, 0, -control.width, 0); + mouseDrag(control, control.width / 2, control.height / 2, -control.width, 0); // Mouse has been released by this stage. verify(!control.pressed); compare(control.swipe.position, -1.0); @@ -607,7 +607,7 @@ // Returning back to a position of 0 and pressing on the control should // result in the control being pressed. - mouseDrag(control, control.width / 2, 0, control.width * 0.6, 0); + mouseDrag(control, control.width / 2, control.height / 2, control.width * 0.6, 0); tryCompare(closedSpy, "count", 1); compare(control.swipe.position, 0); mousePress(control, control.width / 2, control.height / 2); @@ -1569,84 +1569,4 @@ verify(control.behavior.enabled); verify(control.animation.running); } - - function test_spacing() { - var control = createTemporaryObject(swipeDelegateComponent, testCase, { text: "Some long, long, long text" }) - verify(control) - verify(control.contentItem.implicitWidth + control.leftPadding + control.rightPadding > control.background.implicitWidth) - - var textLabel = findChild(control.contentItem, "label") - verify(textLabel) - - // The implicitWidth of the IconLabel that all buttons use as their contentItem - // should be equal to the implicitWidth of the Text while no icon is set. - compare(control.contentItem.implicitWidth, textLabel.implicitWidth) - - // That means that spacing shouldn't affect it. - control.spacing += 100 - compare(control.contentItem.implicitWidth, textLabel.implicitWidth) - - // The implicitWidth of the SwipeDelegate itself should, therefore, also never include spacing while no icon is set. - compare(control.implicitWidth, textLabel.implicitWidth + control.leftPadding + control.rightPadding) - } - - function test_display_data() { - return [ - { "tag": "IconOnly", display: SwipeDelegate.IconOnly }, - { "tag": "TextOnly", display: SwipeDelegate.TextOnly }, - { "tag": "TextUnderIcon", display: SwipeDelegate.TextUnderIcon }, - { "tag": "TextBesideIcon", display: SwipeDelegate.TextBesideIcon }, - { "tag": "IconOnly, mirrored", display: SwipeDelegate.IconOnly, mirrored: true }, - { "tag": "TextOnly, mirrored", display: SwipeDelegate.TextOnly, mirrored: true }, - { "tag": "TextUnderIcon, mirrored", display: SwipeDelegate.TextUnderIcon, mirrored: true }, - { "tag": "TextBesideIcon, mirrored", display: SwipeDelegate.TextBesideIcon, mirrored: true } - ] - } - - function test_display(data) { - var control = createTemporaryObject(swipeDelegateComponent, testCase, { - text: "SwipeDelegate", - display: data.display, - width: 400, - "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png", - "LayoutMirroring.enabled": !!data.mirrored - }) - verify(control) - compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png") - - var iconImage = findChild(control.contentItem, "image") - var textLabel = findChild(control.contentItem, "label") - - switch (control.display) { - case SwipeDelegate.IconOnly: - verify(iconImage) - verify(!textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - break; - case SwipeDelegate.TextOnly: - verify(!iconImage) - verify(textLabel) - compare(textLabel.x, control.mirrored ? control.availableWidth - textLabel.width : 0) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - case SwipeDelegate.TextUnderIcon: - verify(iconImage) - verify(textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(textLabel.x, (control.availableWidth - textLabel.width) / 2) - verify(iconImage.y < textLabel.y) - break; - case SwipeDelegate.TextBesideIcon: - verify(iconImage) - verify(textLabel) - if (control.mirrored) - verify(textLabel.x < iconImage.x) - else - verify(iconImage.x < textLabel.x) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_swipeview.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_swipeview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_swipeview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_swipeview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -85,60 +85,43 @@ compare(control.currentIndex, -1) compare(control.currentItem, null) - var item0 = page.createObject(control, {text: "0"}) - control.addItem(item0) + control.addItem(page.createObject(control, {text: "0"})) compare(control.count, 1) compare(control.currentIndex, 0) compare(control.currentItem.text, "0") compare(currentItemChangedSpy.count, 1); - compare(control.contentWidth, item0.implicitWidth) - compare(control.contentHeight, item0.implicitHeight) - var item1 = page.createObject(control, {text: "11"}) - control.addItem(item1) + control.addItem(page.createObject(control, {text: "1"})) compare(control.count, 2) compare(control.currentIndex, 0) compare(control.currentItem.text, "0") compare(currentItemChangedSpy.count, 1); - compare(control.contentWidth, item0.implicitWidth) - compare(control.contentHeight, item0.implicitHeight) - var item2 = page.createObject(control, {text: "222"}) - control.addItem(item2) + control.addItem(page.createObject(control, {text: "2"})) compare(control.count, 3) compare(control.currentIndex, 0) compare(control.currentItem.text, "0") compare(currentItemChangedSpy.count, 1); - compare(control.contentWidth, item0.implicitWidth) - compare(control.contentHeight, item0.implicitHeight) control.currentIndex = 1 compare(control.currentIndex, 1) - compare(control.currentItem.text, "11") + compare(control.currentItem.text, "1") compare(currentItemChangedSpy.count, 2); - compare(control.contentWidth, item1.implicitWidth) - compare(control.contentHeight, item1.implicitHeight) control.currentIndex = 2 compare(control.currentIndex, 2) - compare(control.currentItem.text, "222") + compare(control.currentItem.text, "2") compare(currentItemChangedSpy.count, 3); - compare(control.contentWidth, item2.implicitWidth) - compare(control.contentHeight, item2.implicitHeight) control.decrementCurrentIndex() compare(control.currentIndex, 1) - compare(control.currentItem.text, "11") + compare(control.currentItem.text, "1") compare(currentItemChangedSpy.count, 4); - compare(control.contentWidth, item1.implicitWidth) - compare(control.contentHeight, item1.implicitHeight) control.incrementCurrentIndex() compare(control.currentIndex, 2) - compare(control.currentItem.text, "222") + compare(control.currentItem.text, "2") compare(currentItemChangedSpy.count, 5); - compare(control.contentWidth, item2.implicitWidth) - compare(control.contentHeight, item2.implicitHeight) } Component { @@ -556,8 +539,6 @@ control.addItem(page.createObject(control, {text: i})) compare(control.orientation, Qt.Horizontal) - compare(control.horizontal, true) - compare(control.vertical, false) for (i = 0; i < control.count; ++i) { control.currentIndex = i @@ -566,8 +547,6 @@ control.orientation = Qt.Vertical compare(control.orientation, Qt.Vertical) - compare(control.horizontal, false) - compare(control.vertical, true) for (i = 0; i < control.count; ++i) { control.currentIndex = i diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_switchdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_switchdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_switchdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_switchdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -194,15 +194,15 @@ // release in the middle spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }], "pressed"] - mousePress(control, 0, 0, Qt.LeftButton) + mousePress(control.indicator, 0, 0, Qt.LeftButton) compare(control.pressed, true) verify(spy.success) - mouseMove(control, control.width / 2, control.height / 2, 0, Qt.LeftButton) + mouseMove(control.indicator, control.indicator.width / 2 - 1, 0) compare(control.pressed, true) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], "released", "clicked"] - mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton) + mouseRelease(control.indicator, control.indicator.width / 2 - 1, 0, Qt.LeftButton) compare(control.checked, false) compare(control.pressed, false) tryCompare(control, "position", 0) // QTBUG-57944 @@ -297,15 +297,15 @@ // release in the middle spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }], "pressed"] - touch.press(0, control, 0, 0).commit() + touch.press(0, control.indicator, 0, 0).commit() compare(control.pressed, true) verify(spy.success) - touch.move(0, control, control.width / 2, control.height / 2).commit() + touch.move(0, control.indicator, control.indicator.width / 2 - 1).commit() compare(control.pressed, true) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], "released", "clicked"] - touch.release(0, control, control.width / 2, control.height / 2).commit() + touch.release(0, control.indicator, control.indicator.width / 2 - 1, 0).commit() compare(control.checked, false) compare(control.pressed, false) tryCompare(control, "position", 0) // QTBUG-57944 @@ -523,85 +523,4 @@ compare(control.pressed, false) verify(spy.success) } - - function test_spacing() { - var control = createTemporaryObject(switchDelegate, testCase, { text: "Some long, long, long text" }) - verify(control) - verify(control.contentItem.implicitWidth + control.leftPadding + control.rightPadding > control.background.implicitWidth) - - var textLabel = findChild(control.contentItem, "label") - verify(textLabel) - - // The implicitWidth of the IconLabel that all buttons use as their contentItem should be - // equal to the implicitWidth of the Text and the switch indicator + spacing while no icon is set. - compare(control.contentItem.implicitWidth, textLabel.implicitWidth + control.indicator.width + control.spacing) - - control.spacing += 100 - compare(control.contentItem.implicitWidth, textLabel.implicitWidth + control.indicator.width + control.spacing) - - compare(control.implicitWidth, textLabel.implicitWidth + control.indicator.width + control.spacing + control.leftPadding + control.rightPadding) - } - - function test_display_data() { - return [ - { "tag": "IconOnly", display: SwitchDelegate.IconOnly }, - { "tag": "TextOnly", display: SwitchDelegate.TextOnly }, - { "tag": "TextUnderIcon", display: SwitchDelegate.TextUnderIcon }, - { "tag": "TextBesideIcon", display: SwitchDelegate.TextBesideIcon }, - { "tag": "IconOnly, mirrored", display: SwitchDelegate.IconOnly, mirrored: true }, - { "tag": "TextOnly, mirrored", display: SwitchDelegate.TextOnly, mirrored: true }, - { "tag": "TextUnderIcon, mirrored", display: SwitchDelegate.TextUnderIcon, mirrored: true }, - { "tag": "TextBesideIcon, mirrored", display: SwitchDelegate.TextBesideIcon, mirrored: true } - ] - } - - function test_display(data) { - var control = createTemporaryObject(switchDelegate, testCase, { - text: "SwitchDelegate", - display: data.display, - width: 400, - "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png", - "LayoutMirroring.enabled": !!data.mirrored - }) - verify(control) - compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png") - - var iconImage = findChild(control.contentItem, "image") - var textLabel = findChild(control.contentItem, "label") - - var availableWidth = control.availableWidth - control.indicator.width - control.spacing - var indicatorOffset = control.mirrored ? control.indicator.width + control.spacing : 0 - - switch (control.display) { - case SwitchDelegate.IconOnly: - verify(iconImage) - verify(!textLabel) - compare(iconImage.x, indicatorOffset + (availableWidth - iconImage.width) / 2) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - break; - case SwitchDelegate.TextOnly: - verify(!iconImage) - verify(textLabel) - compare(textLabel.x, control.mirrored ? control.availableWidth - textLabel.width : 0) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - case SwitchDelegate.TextUnderIcon: - verify(iconImage) - verify(textLabel) - compare(iconImage.x, indicatorOffset + (availableWidth - iconImage.width) / 2) - compare(textLabel.x, indicatorOffset + (availableWidth - textLabel.width) / 2) - verify(iconImage.y < textLabel.y) - break; - case SwitchDelegate.TextBesideIcon: - verify(iconImage) - verify(textLabel) - if (control.mirrored) - verify(textLabel.x < iconImage.x) - else - verify(iconImage.x < textLabel.x) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_switch.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -201,12 +201,12 @@ mousePress(control, 0, 0, Qt.LeftButton) compare(control.pressed, true) verify(spy.success) - mouseMove(control, control.width / 2, control.height / 2, 0, Qt.LeftButton) + mouseMove(control, control.width / 4, control.height / 4, 0, Qt.LeftButton) compare(control.pressed, true) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], "released", "clicked"] - mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton) + mouseRelease(control, control.width / 4, control.height / 4, Qt.LeftButton) compare(control.checked, false) compare(control.pressed, false) tryCompare(control, "position", 0) // QTBUG-57944 @@ -304,12 +304,12 @@ touch.press(0, control, 0, 0).commit() compare(control.pressed, true) verify(spy.success) - touch.move(0, control, control.width / 2, control.height / 2).commit() + touch.move(0, control, control.width / 4, control.height / 4).commit() compare(control.pressed, true) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], "released", "clicked"] - touch.release(0, control, control.width / 2, control.height / 2).commit() + touch.release(0, control, control.width / 4, control.height / 4).commit() compare(control.checked, false) compare(control.pressed, false) tryCompare(control, "position", 0) // QTBUG-57944 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_tabbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_tabbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_tabbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_tabbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -270,29 +270,6 @@ compare(contentChildrenSpy.count, 12) } - function test_removeCurrent() { - var control = createTemporaryObject(tabBar, testCase) - - control.addItem(tabButton.createObject(control, {text: "1"})) - control.addItem(tabButton.createObject(control, {text: "2"})) - control.addItem(tabButton.createObject(control, {text: "3"})) - control.currentIndex = 1 - compare(control.count, 3) - compare(control.currentIndex, 1) - - control.removeItem(1) - compare(control.count, 2) - compare(control.currentIndex, 0) - - control.removeItem(0) - compare(control.count, 1) - compare(control.currentIndex, 0) - - control.removeItem(0) - compare(control.count, 0) - compare(control.currentIndex, -1) - } - Component { id: contentBar TabBar { @@ -529,198 +506,47 @@ function test_layout(data) { var control = createTemporaryObject(tabBar, testCase, {spacing: data.spacing, width: 200}) - // remove the background so that it won't affect the implicit size of the tabbar, - // so the implicit sizes tested below are entirely based on the content size - control.background = null + // remove the implicit size from the background so that it won't affect + // the implicit size of the tabbar, so the implicit sizes tested below + // are entirely based on the content size + control.background.implicitWidth = 0 var tab1 = tabButton.createObject(control, {text: "First"}) control.addItem(tab1) tryCompare(tab1, "width", control.width) - compare(tab1.height, control.height) - compare(control.implicitContentWidth, tab1.implicitWidth) - compare(control.implicitContentHeight, tab1.implicitHeight) - compare(control.contentWidth, control.implicitContentWidth) - compare(control.contentHeight, control.implicitContentHeight) + compare(control.contentWidth, tab1.implicitWidth) compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) - compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding) - var tab2 = tabButton.createObject(control, {implicitHeight: tab1.implicitHeight + 10, text: "Second"}) + var tab2 = tabButton.createObject(control, {text: "Second"}) control.addItem(tab2) tryCompare(tab1, "width", (control.width - data.spacing) / 2) - compare(tab1.height, control.height) compare(tab2.width, (control.width - data.spacing) / 2) - compare(tab2.height, control.height) - compare(control.implicitContentWidth, tab1.implicitWidth + tab2.implicitWidth + data.spacing) - compare(control.implicitContentHeight, tab2.implicitHeight) - compare(control.contentWidth, control.implicitContentWidth) - compare(control.contentHeight, control.implicitContentHeight) + compare(control.contentWidth, tab1.implicitWidth + tab2.implicitWidth + data.spacing) compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) - compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding) - var tab3 = tabButton.createObject(control, {width: 50, height: tab1.implicitHeight - 10, text: "Third"}) + var tab3 = tabButton.createObject(control, {width: 50, text: "Third"}) control.addItem(tab3) tryCompare(tab1, "width", (control.width - 2 * data.spacing - 50) / 2) - compare(tab1.y, 0) - compare(tab1.height, control.height) - compare(tab2.y, 0) compare(tab2.width, (control.width - 2 * data.spacing - 50) / 2) - compare(tab2.height, control.height) - verify(tab3.y > 0) - compare(tab3.y, (control.height - tab3.height) / 2) compare(tab3.width, 50) - compare(tab3.height, tab1.implicitHeight - 10) - compare(control.implicitContentWidth, tab1.implicitWidth + tab2.implicitWidth + tab3.width + 2 * data.spacing) - compare(control.implicitContentHeight, tab2.implicitHeight) - compare(control.contentWidth, control.implicitContentWidth) - compare(control.contentHeight, control.implicitContentHeight) + compare(control.contentWidth, tab1.implicitWidth + tab2.implicitWidth + tab3.width + 2 * data.spacing) compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) - compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding) var expectedWidth = tab3.contentItem.implicitWidth + tab3.leftPadding + tab3.rightPadding tab3.width = tab3.implicitWidth - tab3.height = tab3.implicitHeight tryCompare(tab1, "width", (control.width - 2 * data.spacing - expectedWidth) / 2) - compare(tab1.height, control.height) - compare(tab2.width, (control.width - 2 * data.spacing - expectedWidth) / 2) - compare(tab2.height, control.height) + tryCompare(tab2, "width", (control.width - 2 * data.spacing - expectedWidth) / 2) compare(tab3.width, expectedWidth) - compare(tab3.height, tab3.implicitHeight) - compare(control.implicitContentWidth, tab1.implicitWidth + tab2.implicitWidth + tab3.implicitWidth + 2 * data.spacing) - compare(control.implicitContentHeight, tab2.implicitHeight) - compare(control.contentWidth, control.implicitContentWidth) - compare(control.contentHeight, control.implicitContentHeight) + compare(control.contentWidth, tab1.implicitWidth + tab2.implicitWidth + tab3.implicitWidth + 2 * data.spacing) compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) - compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding) tab3.width = undefined - tab3.height = undefined control.width = undefined control.contentWidth = 300 - control.contentHeight = 50 expectedWidth = (control.contentWidth - 2 * data.spacing) / 3 tryCompare(tab1, "width", expectedWidth) - compare(tab2.width, expectedWidth) - compare(tab3.width, expectedWidth) - compare(tab1.height, control.contentHeight) - compare(tab2.height, control.contentHeight) - compare(tab3.height, control.contentHeight) - } - - Component { - id: attachedButton - TabButton { - property int index: TabBar.index - property TabBar tabBar: TabBar.tabBar - property int position: TabBar.position - } - } - - function test_attached() { - var control = createTemporaryObject(tabBar, testCase, {position: TabBar.Footer}) - - // append - var tab1 = createTemporaryObject(attachedButton, testCase) - compare(tab1.index, -1) - compare(tab1.tabBar, null) - compare(tab1.position, TabBar.Header) - - control.addItem(tab1) - compare(tab1.index, 0) - compare(tab1.tabBar, control) - compare(tab1.position, TabBar.Footer) - - // insert in the beginning - var tab2 = createTemporaryObject(attachedButton, testCase) - compare(tab2.index, -1) - compare(tab2.tabBar, null) - compare(tab2.position, TabBar.Header) - - control.insertItem(0, tab2) - compare(tab2.index, 0) - compare(tab2.tabBar, control) - compare(tab2.position, TabBar.Footer) - - compare(tab1.index, 1) - - // insert in the middle - var tab3 = createTemporaryObject(attachedButton, testCase) - compare(tab3.index, -1) - compare(tab3.tabBar, null) - compare(tab3.position, TabBar.Header) - - control.insertItem(1, tab3) - compare(tab3.index, 1) - compare(tab3.tabBar, control) - compare(tab3.position, TabBar.Footer) - - compare(tab2.index, 0) - compare(tab1.index, 2) - - // insert in the end - var tab4 = createTemporaryObject(attachedButton, testCase) - compare(tab4.index, -1) - compare(tab4.tabBar, null) - compare(tab4.position, TabBar.Header) - - control.insertItem(-1, tab4) - compare(tab4.index, 3) - compare(tab4.tabBar, control) - compare(tab4.position, TabBar.Footer) - - compare(tab2.index, 0) - compare(tab3.index, 1) - compare(tab1.index, 2) - - // move forwards - control.moveItem(0, 1) - compare(tab3.index, 0) - compare(tab2.index, 1) - compare(tab1.index, 2) - compare(tab4.index, 3) - - control.moveItem(0, 2) - compare(tab2.index, 0) - compare(tab1.index, 1) - compare(tab3.index, 2) - compare(tab4.index, 3) - - control.moveItem(1, 3) - compare(tab2.index, 0) - compare(tab3.index, 1) - compare(tab4.index, 2) - compare(tab1.index, 3) - - // move backwards - control.moveItem(3, 2) - compare(tab2.index, 0) - compare(tab3.index, 1) - compare(tab1.index, 2) - compare(tab4.index, 3) - - control.moveItem(3, 1) - compare(tab2.index, 0) - compare(tab4.index, 1) - compare(tab3.index, 2) - compare(tab1.index, 3) - - // remove from the beginning - control.removeItem(0) - compare(tab2.index, -1) - compare(tab2.tabBar, null) - compare(tab2.position, TabBar.Header) - - compare(tab4.index, 0) - compare(tab3.index, 1) - compare(tab1.index, 2) - - // remove from the middle - control.removeItem(1) - compare(tab3.index, -1) - compare(tab3.tabBar, null) - compare(tab3.position, TabBar.Header) - - compare(tab4.index, 0) - compare(tab1.index, 1) + tryCompare(tab2, "width", expectedWidth) + tryCompare(tab3, "width", expectedWidth) } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_tabbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_tabbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_tabbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_tabbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -95,84 +95,4 @@ verify(control) compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset) } - - function test_spacing() { - var control = createTemporaryObject(tabButton, testCase, { text: "Some long, long, long text" }) - verify(control) - if (control.background) - verify(control.contentItem.implicitWidth + control.leftPadding + control.rightPadding > control.background.implicitWidth) - - var textLabel = findChild(control.contentItem, "label") - verify(textLabel) - - // The implicitWidth of the IconLabel that all buttons use as their contentItem - // should be equal to the implicitWidth of the Text while no icon is set. - compare(control.contentItem.implicitWidth, textLabel.implicitWidth) - - // That means that spacing shouldn't affect it. - control.spacing += 100 - compare(control.contentItem.implicitWidth, textLabel.implicitWidth) - - // The implicitWidth of the TabButton itself should, therefore, also never include spacing while no icon is set. - compare(control.implicitWidth, textLabel.implicitWidth + control.leftPadding + control.rightPadding) - } - - function test_display_data() { - return [ - { "tag": "IconOnly", display: TabButton.IconOnly }, - { "tag": "TextOnly", display: TabButton.TextOnly }, - { "tag": "TextUnderIcon", display: TabButton.TextUnderIcon }, - { "tag": "TextBesideIcon", display: TabButton.TextBesideIcon }, - { "tag": "IconOnly, mirrored", display: TabButton.IconOnly, mirrored: true }, - { "tag": "TextOnly, mirrored", display: TabButton.TextOnly, mirrored: true }, - { "tag": "TextUnderIcon, mirrored", display: TabButton.TextUnderIcon, mirrored: true }, - { "tag": "TextBesideIcon, mirrored", display: TabButton.TextBesideIcon, mirrored: true } - ] - } - - function test_display(data) { - var control = createTemporaryObject(tabButton, testCase, { - text: "TabButton", - display: data.display, - "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png", - "LayoutMirroring.enabled": !!data.mirrored - }) - verify(control) - compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png") - - var iconImage = findChild(control.contentItem, "image") - var textLabel = findChild(control.contentItem, "label") - - switch (control.display) { - case TabButton.IconOnly: - verify(iconImage) - verify(!textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - break; - case TabButton.TextOnly: - verify(!iconImage) - verify(textLabel) - compare(textLabel.x, (control.availableWidth - textLabel.width) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - case TabButton.TextUnderIcon: - verify(iconImage) - verify(textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(textLabel.x, (control.availableWidth - textLabel.width) / 2) - verify(iconImage.y < textLabel.y) - break; - case TabButton.TextBesideIcon: - verify(iconImage) - verify(textLabel) - if (control.mirrored) - verify(textLabel.x < iconImage.x) - else - verify(iconImage.x < textLabel.x) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_textarea.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_textarea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_textarea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_textarea.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -79,11 +79,6 @@ SignalSpy { } } - Component { - id: rectangle - Rectangle { } - } - function test_creation() { var control = createTemporaryObject(textArea, testCase) verify(control) @@ -91,69 +86,15 @@ function test_implicitSize() { var control = createTemporaryObject(textArea, testCase) - verify(control) var implicitWidthSpy = signalSpy.createObject(control, { target: control, signalName: "implicitWidthChanged"} ) - verify(implicitWidthSpy.valid) - var implicitHeightSpy = signalSpy.createObject(control, { target: control, signalName: "implicitHeightChanged"} ) - verify(implicitHeightSpy.valid) - - var implicitBackgroundWidthSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitBackgroundWidthChanged"}) - verify(implicitBackgroundWidthSpy.valid) - - var implicitBackgroundHeightSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitBackgroundHeightChanged"}) - verify(implicitBackgroundHeightSpy.valid) - - var implicitWidthChanges = 0 - var implicitHeightChanges = 0 - var implicitBackgroundWidthChanges = 0 - var implicitBackgroundHeightChanges = 0 - - verify(control.implicitWidth >= control.leftPadding + control.rightPadding) - verify(control.implicitHeight >= control.contentHeight + control.topPadding + control.bottomPadding) - compare(control.implicitBackgroundWidth, 0) - compare(control.implicitBackgroundHeight, 0) - - control.background = rectangle.createObject(control, {implicitWidth: 400, implicitHeight: 200}) + control.background.implicitWidth = 400 + control.background.implicitHeight = 200 compare(control.implicitWidth, 400) compare(control.implicitHeight, 200) - compare(control.implicitBackgroundWidth, 400) - compare(control.implicitBackgroundHeight, 200) - compare(implicitWidthSpy.count, ++implicitWidthChanges) - compare(implicitHeightSpy.count, ++implicitHeightChanges) - compare(implicitBackgroundWidthSpy.count, ++implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, ++implicitBackgroundHeightChanges) - - control.background = null - compare(control.implicitWidth, control.leftPadding + control.rightPadding) - verify(control.implicitHeight >= control.contentHeight + control.topPadding + control.bottomPadding) - compare(control.implicitBackgroundWidth, 0) - compare(control.implicitBackgroundHeight, 0) - compare(implicitWidthSpy.count, ++implicitWidthChanges) - compare(implicitHeightSpy.count, ++implicitHeightChanges) - compare(implicitBackgroundWidthSpy.count, ++implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, ++implicitBackgroundHeightChanges) - - control.text = "TextArea" - compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) - verify(control.implicitHeight >= control.contentHeight + control.topPadding + control.bottomPadding) - compare(control.implicitBackgroundWidth, 0) - compare(control.implicitBackgroundHeight, 0) - compare(implicitWidthSpy.count, ++implicitWidthChanges) - compare(implicitHeightSpy.count, implicitHeightChanges) - compare(implicitBackgroundWidthSpy.count, implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, implicitBackgroundHeightChanges) - - control.placeholderText = "..." - compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) - verify(control.implicitHeight >= control.contentHeight + control.topPadding + control.bottomPadding) - compare(control.implicitBackgroundWidth, 0) - compare(control.implicitBackgroundHeight, 0) - compare(implicitWidthSpy.count, implicitWidthChanges) - compare(implicitHeightSpy.count, implicitHeightChanges) - compare(implicitBackgroundWidthSpy.count, implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, implicitBackgroundHeightChanges) + compare(implicitWidthSpy.count, 1) + compare(implicitHeightSpy.count, 1) } function test_alignment_data() { @@ -271,9 +212,6 @@ var textArea = control.TextArea.flickable verify(textArea) - if (textArea.background) - compare(textArea.background.parent, control) - for (var i = 1; i <= 100; ++i) textArea.text += "line\n" + i @@ -527,165 +465,4 @@ control.destroy() wait(0) } - - function test_placeholderTextColor() { - var control = createTemporaryObject(textArea, testCase) - verify(control) - - // usually default value should not be pure opacue black - verify(control.placeholderTextColor !== "#ff000000") - control.placeholderTextColor = "#12345678" - compare(control.placeholderTextColor, "#12345678") - - for (var i = 0; i < control.children.length; ++i) { - if (control.children[i].hasOwnProperty("text")) - compare(control.children[i].color, control.placeholderTextColor) // placeholder.color - } - } - - function test_inset() { - var control = createTemporaryObject(textArea, testCase, {background: rectangle.createObject(control)}) - verify(control) - - var topInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "topInsetChanged"}) - verify(topInsetSpy.valid) - - var leftInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "leftInsetChanged"}) - verify(leftInsetSpy.valid) - - var rightInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "rightInsetChanged"}) - verify(rightInsetSpy.valid) - - var bottomInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "bottomInsetChanged"}) - verify(bottomInsetSpy.valid) - - var topInsetChanges = 0 - var leftInsetChanges = 0 - var rightInsetChanges = 0 - var bottomInsetChanges = 0 - - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - - control.width = 100 - control.height = 100 - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 100) - - control.topInset = 10 - compare(control.topInset, 10) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, ++topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 10) - compare(control.background.width, 100) - compare(control.background.height, 90) - - control.leftInset = 20 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, ++leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 80) - compare(control.background.height, 90) - - control.rightInset = 30 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, ++rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 50) - compare(control.background.height, 90) - - control.bottomInset = 40 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, ++bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 50) - compare(control.background.height, 50) - - control.topInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, ++topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 0) - compare(control.background.width, 50) - compare(control.background.height, 60) - - control.leftInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, ++leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 70) - compare(control.background.height, 60) - - control.rightInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, ++rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 60) - - control.bottomInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, ++bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 100) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_textfield.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_textfield.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_textfield.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_textfield.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,10 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -67,11 +66,6 @@ } Component { - id: rectangle - Rectangle { } - } - - Component { id: signalSpy SignalSpy { } } @@ -83,69 +77,35 @@ function test_implicitSize() { var control = createTemporaryObject(textField, testCase) - verify(control) + verify(control.implicitWidth > control.leftPadding + control.rightPadding) var implicitWidthSpy = signalSpy.createObject(control, { target: control, signalName: "implicitWidthChanged"} ) - verify(implicitWidthSpy.valid) - var implicitHeightSpy = signalSpy.createObject(control, { target: control, signalName: "implicitHeightChanged"} ) - verify(implicitHeightSpy.valid) - var implicitBackgroundWidthSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitBackgroundWidthChanged"}) - verify(implicitBackgroundWidthSpy.valid) - - var implicitBackgroundHeightSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitBackgroundHeightChanged"}) - verify(implicitBackgroundHeightSpy.valid) - - var implicitWidthChanges = 0 - var implicitHeightChanges = 0 - var implicitBackgroundWidthChanges = 0 - var implicitBackgroundHeightChanges = 0 - - verify(control.implicitWidth >= control.leftPadding + control.rightPadding) - verify(control.implicitHeight >= control.contentHeight + control.topPadding + control.bottomPadding) - compare(control.implicitBackgroundWidth, control.background.implicitWidth) - compare(control.implicitBackgroundHeight, control.background.implicitHeight) - - control.background = rectangle.createObject(control, {implicitWidth: 400, implicitHeight: 200}) + control.background.implicitWidth = 400 + control.background.implicitHeight = 200 compare(control.implicitWidth, 400) compare(control.implicitHeight, 200) - compare(control.implicitBackgroundWidth, 400) - compare(control.implicitBackgroundHeight, 200) - compare(implicitWidthSpy.count, ++implicitWidthChanges) - compare(implicitHeightSpy.count, ++implicitHeightChanges) - compare(implicitBackgroundWidthSpy.count, ++implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, ++implicitBackgroundHeightChanges) + compare(implicitWidthSpy.count, 1) + compare(implicitHeightSpy.count, 1) control.background = null compare(control.implicitWidth, control.leftPadding + control.rightPadding) compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding) - compare(control.implicitBackgroundWidth, 0) - compare(control.implicitBackgroundHeight, 0) - compare(implicitWidthSpy.count, ++implicitWidthChanges) - compare(implicitHeightSpy.count, ++implicitHeightChanges) - compare(implicitBackgroundWidthSpy.count, ++implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, ++implicitBackgroundHeightChanges) + compare(implicitWidthSpy.count, 2) + compare(implicitHeightSpy.count, 2) control.text = "TextField" compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding) - compare(control.implicitBackgroundWidth, 0) - compare(control.implicitBackgroundHeight, 0) - compare(implicitWidthSpy.count, ++implicitWidthChanges) - compare(implicitHeightSpy.count, implicitHeightChanges) - compare(implicitBackgroundWidthSpy.count, implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, implicitBackgroundHeightChanges) + compare(implicitWidthSpy.count, 3) + compare(implicitHeightSpy.count, 2) control.placeholderText = "..." - compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) + verify(control.implicitWidth < control.contentWidth + control.leftPadding + control.rightPadding) compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding) - compare(control.implicitBackgroundWidth, 0) - compare(control.implicitBackgroundHeight, 0) - compare(implicitWidthSpy.count, implicitWidthChanges) - compare(implicitHeightSpy.count, implicitHeightChanges) - compare(implicitBackgroundWidthSpy.count, implicitBackgroundWidthChanges) - compare(implicitBackgroundHeightSpy.count, implicitBackgroundHeightChanges) + compare(implicitWidthSpy.count, 4) + compare(implicitHeightSpy.count, 2) } function test_alignment_data() { @@ -203,14 +163,14 @@ if (data.textAlignment !== undefined) compare(control.horizontalAlignment, data.textAlignment) for (var i = 0; i < control.children.length; ++i) { - if (control.children[i].hasOwnProperty("text") && control.children[i].hasOwnProperty("horizontalAlignment")) + if (control.children[i].hasOwnProperty("horizontalAlignment")) compare(control.children[i].effectiveHorizontalAlignment, data.placeholderAlignment) // placeholder } control.verticalAlignment = TextField.AlignBottom compare(control.verticalAlignment, TextField.AlignBottom) for (var j = 0; j < control.children.length; ++j) { - if (control.children[j].hasOwnProperty("text") && control.children[j].hasOwnProperty("verticalAlignment")) + if (control.children[j].hasOwnProperty("verticalAlignment")) compare(control.children[j].verticalAlignment, Text.AlignBottom) // placeholder } } @@ -471,193 +431,4 @@ mouseClick(control, control.width / 2, control.height / 2, Qt.LeftButton | Qt.RightButton) compare(control.selectedText, "") } - - // QTBUG-66260 - function test_placeholderTextColor() { - var control = createTemporaryObject(textField, testCase) - verify(control) - - // usually default value should not be pure opacue black - verify(control.placeholderTextColor !== "#ff000000") - control.placeholderTextColor = "#12345678" - compare(control.placeholderTextColor, "#12345678") - - for (var i = 0; i < control.children.length; ++i) { - if (control.children[i].hasOwnProperty("text")) - compare(control.children[i].color, control.placeholderTextColor) // placeholder.color - } - } - - function test_inset() { - var control = createTemporaryObject(textField, testCase, {background: rectangle.createObject(control)}) - verify(control) - - var topInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "topInsetChanged"}) - verify(topInsetSpy.valid) - - var leftInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "leftInsetChanged"}) - verify(leftInsetSpy.valid) - - var rightInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "rightInsetChanged"}) - verify(rightInsetSpy.valid) - - var bottomInsetSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "bottomInsetChanged"}) - verify(bottomInsetSpy.valid) - - var topInsetChanges = 0 - var leftInsetChanges = 0 - var rightInsetChanges = 0 - var bottomInsetChanges = 0 - - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - - control.width = 100 - control.height = 100 - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 100) - - control.topInset = 10 - compare(control.topInset, 10) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, ++topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 10) - compare(control.background.width, 100) - compare(control.background.height, 90) - - control.leftInset = 20 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, ++leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 80) - compare(control.background.height, 90) - - control.rightInset = 30 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, ++rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 50) - compare(control.background.height, 90) - - control.bottomInset = 40 - compare(control.topInset, 10) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, ++bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 10) - compare(control.background.width, 50) - compare(control.background.height, 50) - - control.topInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 20) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, ++topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 20) - compare(control.background.y, 0) - compare(control.background.width, 50) - compare(control.background.height, 60) - - control.leftInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 30) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, ++leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 70) - compare(control.background.height, 60) - - control.rightInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 40) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, ++rightInsetChanges) - compare(bottomInsetSpy.count, bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 60) - - control.bottomInset = undefined - compare(control.topInset, 0) - compare(control.leftInset, 0) - compare(control.rightInset, 0) - compare(control.bottomInset, 0) - compare(topInsetSpy.count, topInsetChanges) - compare(leftInsetSpy.count, leftInsetChanges) - compare(rightInsetSpy.count, rightInsetChanges) - compare(bottomInsetSpy.count, ++bottomInsetChanges) - compare(control.background.x, 0) - compare(control.background.y, 0) - compare(control.background.width, 100) - compare(control.background.height, 100) - } - - Component { - id: layoutComponent - - ColumnLayout { - anchors.fill: parent - - property alias textField: textField - - TextField { - id: textField - placeholderText: "Placeholder" - Layout.fillWidth: true - } - } - } - - function test_inLayout() { - var layout = createTemporaryObject(layoutComponent, testCase) - verify(layout) - - var control = layout.textField - verify(control) - - compare(control.width, control.parent.width) - compare(control.background.width, control.width) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_toolbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_toolbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_toolbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_toolbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -106,8 +106,6 @@ verify(control.contentItem) compare(control.contentWidth, 0) compare(control.contentHeight, 0) - compare(control.implicitContentWidth, 0) - compare(control.implicitContentHeight, 0) } function test_oneChild() { @@ -116,8 +114,6 @@ compare(control.contentWidth, 100) compare(control.contentHeight, 30) - compare(control.implicitContentWidth, 100) - compare(control.implicitContentHeight, 30) verify(control.implicitWidth >= 100) verify(control.implicitHeight >= 30) } @@ -128,8 +124,6 @@ compare(control.contentWidth, 0) compare(control.contentHeight, 0) - compare(control.implicitContentWidth, 0) - compare(control.implicitContentHeight, 0) verify(control.implicitWidth >= 0) verify(control.implicitHeight >= 0) } @@ -140,8 +134,6 @@ compare(control.contentWidth, 100) compare(control.contentHeight, 30) - compare(control.implicitContentWidth, 100) - compare(control.implicitContentHeight, 30) verify(control.implicitWidth >= 100) verify(control.implicitHeight >= 30) } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_toolbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_toolbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_toolbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_toolbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -181,63 +181,4 @@ verify(control) compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset) } - - function test_display_data() { - return [ - { "tag": "IconOnly", display: ToolButton.IconOnly }, - { "tag": "TextOnly", display: ToolButton.TextOnly }, - { "tag": "TextUnderIcon", display: ToolButton.TextUnderIcon }, - { "tag": "TextBesideIcon", display: ToolButton.TextBesideIcon }, - { "tag": "IconOnly, mirrored", display: ToolButton.IconOnly, mirrored: true }, - { "tag": "TextOnly, mirrored", display: ToolButton.TextOnly, mirrored: true }, - { "tag": "TextUnderIcon, mirrored", display: ToolButton.TextUnderIcon, mirrored: true }, - { "tag": "TextBesideIcon, mirrored", display: ToolButton.TextBesideIcon, mirrored: true } - ] - } - - function test_display(data) { - var control = createTemporaryObject(toolButton, testCase, { - text: "ToolButton", - display: data.display, - "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png", - "LayoutMirroring.enabled": !!data.mirrored - }) - verify(control) - compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png") - - var iconImage = findChild(control.contentItem, "image") - var textLabel = findChild(control.contentItem, "label") - - switch (control.display) { - case ToolButton.IconOnly: - verify(iconImage) - verify(!textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - break; - case ToolButton.TextOnly: - verify(!iconImage) - verify(textLabel) - compare(textLabel.x, (control.availableWidth - textLabel.width) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - case ToolButton.TextUnderIcon: - verify(iconImage) - verify(textLabel) - compare(iconImage.x, (control.availableWidth - iconImage.width) / 2) - compare(textLabel.x, (control.availableWidth - textLabel.width) / 2) - verify(iconImage.y < textLabel.y) - break; - case ToolButton.TextBesideIcon: - verify(iconImage) - verify(textLabel) - if (control.mirrored) - verify(textLabel.x < iconImage.x) - else - verify(iconImage.x < textLabel.x) - compare(iconImage.y, (control.availableHeight - iconImage.height) / 2) - compare(textLabel.y, (control.availableHeight - textLabel.height) / 2) - break; - } - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_toolseparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_toolseparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_toolseparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_toolseparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.8 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_tooltip.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_tooltip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_tooltip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_tooltip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -283,10 +283,6 @@ } function test_activateShortcutWhileToolTipVisible() { - if ((Qt.platform.pluginName === "offscreen") - || (Qt.platform.pluginName === "minimal")) - skip("Mouse hoovering not functional on offscreen/minimal platforms") - var root = createTemporaryObject(buttonAndShortcutComponent, testCase) verify(root) @@ -329,87 +325,4 @@ verify(tooltip.visible) } } - - Component { - id: nonAttachedToolTipComponent - ToolTip { } - } - - function test_nonAttachedToolTipShowAndHide() { - var tip = createTemporaryObject(nonAttachedToolTipComponent, testCase) - verify(tip) - tip.show("hello"); - verify(tip.visible) - verify(tip.text === "hello") - tip.hide() - tryCompare(tip, "visible", false) - tip.show("delay", 200) - verify(tip.visible) - tryCompare(tip, "visible", false) - } - - Component { - id: timeoutButtonRowComponent - - Row { - Button { - text: "Timeout: 1" - ToolTip.text: text - ToolTip.visible: down - ToolTip.timeout: 1 - } - - Button { - text: "Timeout: -1" - ToolTip.text: text - ToolTip.visible: down - } - } - } - - // QTBUG-74226 - function test_attachedTimeout() { - var row = createTemporaryObject(timeoutButtonRowComponent, testCase) - verify(row) - - // Press the button that has no timeout; it should stay visible. - var button2 = row.children[1] - mousePress(button2) - compare(button2.down, true) - tryCompare(button2.ToolTip.toolTip, "opened", true) - - // Wait a bit to make sure that it's still visible. - wait(50) - compare(button2.ToolTip.toolTip.opened, true) - - // Release and should close. - mouseRelease(button2) - compare(button2.down, false) - tryCompare(button2.ToolTip, "visible", false) - - // Now, press the first button that does have a timeout; it should close on its own eventually. - var button1 = row.children[0] - mousePress(button1) - compare(button1.down, true) - // We use a short timeout to speed up the test, but tryCompare(...opened, true) then - // fails because the dialog has already been hidden by that point, so just check that it's - // immediately visible, which is more or less the same thing. - compare(button1.ToolTip.visible, true) - tryCompare(button1.ToolTip, "visible", false) - mouseRelease(button2) - - // Now, hover over the second button again. It should still stay visible until the mouse is released. - mousePress(button2) - compare(button2.down, true) - tryCompare(button2.ToolTip.toolTip, "opened", true) - - // Wait a bit to make sure that it's still visible. - wait(50) - compare(button2.ToolTip.toolTip.opened, true) - - // Release and should close. - mouseRelease(button2) - compare(button2.down, false) - tryCompare(button2.ToolTip, "visible", false) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_tumbler.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/tst_tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/tst_tumbler.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -107,10 +107,6 @@ return Qt.point(tumblerXCenter(), yCenter); } - function itemTopLeftPos(visualItemIndex) { - return Qt.point(tumbler.leftPadding, tumbler.topPadding + (tumblerDelegateHeight * visualItemIndex)); - } - function checkItemSizes() { var contentChildren = tumbler.wrap ? tumblerView.children : tumblerView.contentItem.children; verify(contentChildren.length >= tumbler.count); @@ -127,24 +123,7 @@ return child; } - var grandChild = findView(child); - if (grandChild) - return grandChild; - } - - return null; - } - - function findDelegateWithText(parent, text) { - for (var i = 0; i < parent.children.length; ++i) { - var child = parent.children[i]; - if (child.hasOwnProperty("text") && child.text === text) { - return child; - } - - var grandChild = findDelegateWithText(child, text); - if (grandChild) - return grandChild; + return findView(child); } return null; @@ -298,7 +277,13 @@ tryCompare(tumbler, "currentIndex", data.currentIndex); tumblerView = findView(tumbler); - tryVerify(function() { return tumblerView.currentItem }); + // TODO: replace once QTBUG-19708 is fixed. + for (var delay = 1000; delay >= 0; delay -= 50) { + if (tumblerView.currentItem) + break; + wait(50); + } + verify(tumblerView.currentItem); compare(tumblerView.currentIndex, data.currentIndex); compare(tumblerView.currentItem.text, data.currentIndex.toString()); @@ -357,7 +342,6 @@ tumbler.forceActiveFocus(); keyClick(Qt.Key_Down); tryCompare(tumblerView, "offset", 3.0); - tryCompare(tumbler, "moving", false); firstItemCenterPos = itemCenterPos(0); firstItem = tumblerView.itemAt(firstItemCenterPos.x, firstItemCenterPos.y); verify(firstItem); @@ -1029,8 +1013,8 @@ if (data.bottom !== undefined) tumbler.bottomPadding = data.bottom; - compare(tumbler.availableWidth, tumbler.implicitWidth - tumbler.leftPadding - tumbler.rightPadding); - compare(tumbler.availableHeight, tumbler.implicitHeight - tumbler.topPadding - tumbler.bottomPadding); + compare(tumbler.availableWidth, implicitTumblerWidth - tumbler.leftPadding - tumbler.rightPadding); + compare(tumbler.availableHeight, implicitTumblerHeight - tumbler.topPadding - tumbler.bottomPadding); compare(tumbler.contentItem.x, tumbler.leftPadding); compare(tumbler.contentItem.y, tumbler.topPadding); @@ -1125,115 +1109,4 @@ var label = row.label; compare(label.text, "2"); } - - function test_positionViewAtIndex_data() { - return [ - // Should be 20, 21, ... but there is a documented limitation for this in positionViewAtIndex()'s docs. - { tag: "wrap=true, mode=Beginning", wrap: true, mode: Tumbler.Beginning, expectedVisibleIndices: [21, 22, 23, 24, 25] }, - { tag: "wrap=true, mode=Center", wrap: true, mode: Tumbler.Center, expectedVisibleIndices: [18, 19, 20, 21, 22] }, - { tag: "wrap=true, mode=End", wrap: true, mode: Tumbler.End, expectedVisibleIndices: [16, 17, 18, 19, 20] }, - // Same as Beginning; should start at 20. - { tag: "wrap=true, mode=Contain", wrap: true, mode: Tumbler.Contain, expectedVisibleIndices: [21, 22, 23, 24, 25] }, - { tag: "wrap=true, mode=SnapPosition", wrap: true, mode: Tumbler.SnapPosition, expectedVisibleIndices: [18, 19, 20, 21, 22] }, - { tag: "wrap=false, mode=Beginning", wrap: false, mode: Tumbler.Beginning, expectedVisibleIndices: [20, 21, 22, 23, 24] }, - { tag: "wrap=false, mode=Center", wrap: false, mode: Tumbler.Center, expectedVisibleIndices: [18, 19, 20, 21, 22] }, - { tag: "wrap=false, mode=End", wrap: false, mode: Tumbler.End, expectedVisibleIndices: [16, 17, 18, 19, 20] }, - { tag: "wrap=false, mode=Visible", wrap: false, mode: Tumbler.Visible, expectedVisibleIndices: [16, 17, 18, 19, 20] }, - { tag: "wrap=false, mode=Contain", wrap: false, mode: Tumbler.Contain, expectedVisibleIndices: [16, 17, 18, 19, 20] }, - { tag: "wrap=false, mode=SnapPosition", wrap: false, mode: Tumbler.SnapPosition, expectedVisibleIndices: [18, 19, 20, 21, 22] } - ] - } - - function test_positionViewAtIndex(data) { - createTumbler({ wrap: data.wrap, model: 40, visibleItemCount: 5 }) - compare(tumbler.wrap, data.wrap) - - waitForRendering(tumbler) - - tumbler.positionViewAtIndex(20, data.mode) - tryCompare(tumbler, "moving", false) - - compare(tumbler.visibleItemCount, 5) - for (var i = 0; i < 5; ++i) { - // Find the item through its text, as that's easier than child/itemAt(). - var text = data.expectedVisibleIndices[i].toString() - var item = findDelegateWithText(tumblerView, text) - verify(item, "found no item with text \"" + text + "\"") - compare(item.text, data.expectedVisibleIndices[i].toString()) - - // Ensure that it's at the position we expect. - var expectedPos = itemTopLeftPos(i) - var actualPos = testCase.mapFromItem(item, 0, 0) - compare(actualPos.x, expectedPos.x, "expected delegate with text " + item.text - + " to have an x pos of " + expectedPos.x + " but it was " + actualPos.x) - compare(actualPos.y, expectedPos.y, "expected delegate with text " + item.text - + " to have an y pos of " + expectedPos.y + " but it was " + actualPos.y) - } - } - - Component { - id: setCurrentIndexOnImperativeModelChangeComponent - - Tumbler { - onModelChanged: currentIndex = model - 2 - } - } - - function test_setCurrentIndexOnImperativeModelChange() { - var tumbler = createTemporaryObject(setCurrentIndexOnImperativeModelChangeComponent, testCase); - verify(tumbler); - - tumbler.model = 4 - compare(tumbler.count, 4); - tumblerView = findView(tumbler); - tryCompare(tumblerView, "count", 4); - - // 4 - 2 = 2 - compare(tumbler.currentIndex, 2); - - ++tumbler.model; - compare(tumbler.count, 5); - compare(tumbler.wrap, true); - tumblerView = findView(tumbler); - tryCompare(tumblerView, "count", 5); - // 5 - 2 = 3 - compare(tumbler.currentIndex, 3); - } - - Component { - id: setCurrentIndexOnDeclarativeModelChangeComponent - - Item { - property alias tumbler: tumbler - - property int setting: 4 - - Tumbler { - id: tumbler - model: setting - onModelChanged: currentIndex = model - 2 - } - } - } - - function test_setCurrentIndexOnDeclarativeModelChange() { - var root = createTemporaryObject(setCurrentIndexOnDeclarativeModelChangeComponent, testCase); - verify(root); - - var tumbler = root.tumbler; - compare(tumbler.count, 4); - compare(tumbler.wrap, false); - tumblerView = findView(tumbler); - tryCompare(tumblerView, "count", 4); - // 4 - 2 = 2 - compare(tumbler.currentIndex, 2); - - ++root.setting; - compare(tumbler.count, 5); - compare(tumbler.wrap, true); - tumblerView = findView(tumbler); - tryCompare(tumblerView, "count", 5); - // 5 - 2 = 3 - compare(tumbler.currentIndex, 3); - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/TumblerDatePicker.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/TumblerDatePicker.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/TumblerDatePicker.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/TumblerDatePicker.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 Row { id: datePicker diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/TumblerListView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/TumblerListView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/TumblerListView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/TumblerListView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 ListView { anchors.fill: parent diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/TumblerPathView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/TumblerPathView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/data/TumblerPathView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/data/TumblerPathView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 PathView { id: pathView diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/default/BLACKLIST qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/default/BLACKLIST --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/default/BLACKLIST 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/default/BLACKLIST 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -[Popup::test_shortcut] -opensuse ci -opensuse-leap ci diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/default/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/default/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/default/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/default/dependencies.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,5 @@ import QtTest 1.0 -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 TestCase { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/fusion/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/fusion/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/fusion/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/fusion/dependencies.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -import QtTest 1.0 -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Fusion 2.12 - -TestCase { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/fusion/fusion.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/fusion/fusion.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/fusion/fusion.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/fusion/fusion.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -TEMPLATE = app -TARGET = tst_fusion -CONFIG += qmltestcase -QT += quickcontrols2 - -DEFINES += TST_CONTROLS_DATA=\\\"$$QQC2_SOURCE_TREE/tests/auto/controls/data\\\" - -SOURCES += \ - $$PWD/tst_fusion.cpp - -OTHER_FILES += \ - $$PWD/../data/*.qml - -TESTDATA += \ - $$PWD/../data/tst_* diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/fusion/tst_fusion.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/fusion/tst_fusion.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/fusion/tst_fusion.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/fusion/tst_fusion.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -int main(int argc, char *argv[]) -{ - QTEST_ADD_GPU_BLACKLIST_SUPPORT - QTEST_SET_MAIN_SOURCE_PATH - qputenv("QML_NO_TOUCH_COMPRESSION", "1"); - QQuickStyle::setStyle("Fusion"); - return quick_test_main(argc, argv, "tst_controls::Fusion", TST_CONTROLS_DATA); -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/imagine/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/imagine/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/imagine/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/imagine/dependencies.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -import QtTest 1.0 -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 - -TestCase { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/imagine/imagine.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/imagine/imagine.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/imagine/imagine.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/imagine/imagine.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -TEMPLATE = app -TARGET = tst_imagine -CONFIG += qmltestcase -QT += quickcontrols2 - -DEFINES += TST_CONTROLS_DATA=\\\"$$QQC2_SOURCE_TREE/tests/auto/controls/data\\\" - -SOURCES += \ - $$PWD/tst_imagine.cpp - -OTHER_FILES += \ - $$PWD/../data/*.qml - -TESTDATA += \ - $$PWD/../data/tst_* diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/imagine/tst_imagine.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/imagine/tst_imagine.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/imagine/tst_imagine.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/imagine/tst_imagine.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -int main(int argc, char *argv[]) -{ - QTEST_ADD_GPU_BLACKLIST_SUPPORT - QTEST_SET_MAIN_SOURCE_PATH - qputenv("QML_NO_TOUCH_COMPRESSION", "1"); - QQuickStyle::setStyle("Imagine"); - return quick_test_main(argc, argv, "tst_controls::Imagine", TST_CONTROLS_DATA); -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/material/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/material/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/material/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/material/dependencies.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ import QtTest 1.0 -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 TestCase { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/universal/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/universal/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/controls/universal/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/controls/universal/dependencies.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ import QtTest 1.0 -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Universal 2.2 TestCase { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/buttons.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/buttons.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/buttons.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/buttons.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 MouseArea { width: column.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/containers.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/containers.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/containers.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/containers.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 MouseArea { width: column.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/editable.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/editable.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/editable.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/editable.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 MouseArea { width: column.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/pageindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/pageindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/pageindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/pageindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 MouseArea { width: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/scrollbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/scrollbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/scrollbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/scrollbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/sliders.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/sliders.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/data/sliders.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/data/sliders.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.2 MouseArea { width: column.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/tst_cursor.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/tst_cursor.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/cursor/tst_cursor.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/cursor/tst_cursor.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -44,11 +44,6 @@ #include #include -#if QT_CONFIG(cursor) -# include -# include -#endif - using namespace QQuickVisualTestUtil; class tst_cursor : public QQmlDataTest @@ -56,7 +51,6 @@ Q_OBJECT private slots: - void init(); void controls_data(); void controls(); void editable(); @@ -64,17 +58,6 @@ void scrollBar(); }; -void tst_cursor::init() -{ -#if QT_CONFIG(cursor) - // Ensure mouse cursor was not left by previous tests where widgets - // will appear, as it could cause events and interfere with the tests. - const QScreen *screen = QGuiApplication::primaryScreen(); - const QRect availableGeometry = screen->availableGeometry(); - QCursor::setPos(availableGeometry.topLeft()); -#endif -} - void tst_cursor::controls_data() { QTest::addColumn("testFile"); @@ -201,11 +184,6 @@ const QPoint scrollBarPos(window->width() - scrollBar->width() / 2, window->height() / 2); QTest::mouseMove(window, scrollBarPos); - - if ((QGuiApplication::platformName() == QLatin1String("offscreen")) - || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Active status behaves differently in offscreen/minimal platforms", Continue); - QVERIFY(scrollBar->isActive()); QCOMPARE(window->cursor().shape(), scrollBar->cursor().shape()); QCOMPARE(scrollBar->cursor().shape(), Qt::CursorShape::ArrowCursor); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/AbstractButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/AbstractButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/AbstractButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/AbstractButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.AbstractButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ApplicationWindow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ApplicationWindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ApplicationWindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ApplicationWindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ApplicationWindow { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/BusyIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/BusyIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/BusyIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/BusyIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.BusyIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Button { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/CheckBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.CheckBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/CheckDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/CheckDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/CheckDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/CheckDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.CheckDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ComboBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ComboBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ComboBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ComboBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ComboBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Container.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Container.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Container.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Container.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Container { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Control.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Control.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Control { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/DelayButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/DelayButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/DelayButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/DelayButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.DelayButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/DialogButtonBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/DialogButtonBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/DialogButtonBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/DialogButtonBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.DialogButtonBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Dialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Dialog { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Dial.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Dial.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Dial { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Drawer.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Drawer { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Frame.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Frame { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/GroupBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/GroupBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/GroupBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/GroupBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.GroupBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ItemDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ItemDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ItemDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ItemDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ItemDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Label.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Label { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/MenuBarItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/MenuBarItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/MenuBarItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/MenuBarItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T - -T.MenuBarItem { - id: control - objectName: "menubaritem-empty" -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/MenuBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/MenuBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/MenuBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/MenuBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T - -T.MenuBar { - id: control - objectName: "menubar-empty" -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/MenuItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/MenuItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/MenuItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/MenuItem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.MenuItem { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Menu.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Menu { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/MenuSeparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/MenuSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/MenuSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/MenuSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.MenuSeparator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/PageIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.PageIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Page.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Page.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Page { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Pane.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Pane { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Popup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Popup { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ProgressBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ProgressBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ProgressBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ProgressBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ProgressBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/RadioButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/RadioButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/RadioButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/RadioButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RadioButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/RadioDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/RadioDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/RadioDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/RadioDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RadioDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/RangeSlider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/RangeSlider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/RangeSlider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/RangeSlider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RangeSlider { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/RoundButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/RoundButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/RoundButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/RoundButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RoundButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ScrollBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ScrollBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ScrollBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ScrollBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ScrollIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ScrollIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ScrollIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ScrollIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ScrollView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ScrollView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ScrollView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ScrollView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Slider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Slider { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/SpinBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/SpinBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/SpinBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/SpinBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SpinBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/StackView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/StackView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/StackView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/StackView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.StackView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/SwipeDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/SwipeDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/SwipeDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/SwipeDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwipeDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/SwipeView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/SwipeView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/SwipeView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/SwipeView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwipeView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/SwitchDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/SwitchDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/SwitchDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/SwitchDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwitchDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Switch.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Switch { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/TabBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/TabBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/TabBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/TabBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TabBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/TabButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/TabButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/TabButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/TabButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TabButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/TextArea.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/TextArea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/TextArea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/TextArea.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TextArea { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/TextField.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/TextField.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/TextField.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/TextField.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TextField { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ToolBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ToolBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ToolButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ToolButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ToolButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ToolButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ToolSeparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ToolSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ToolSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ToolSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolSeparator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ToolTip.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ToolTip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/ToolTip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/ToolTip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolTip { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Tumbler.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/empty/Tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/empty/Tumbler.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Tumbler { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/AbstractButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/AbstractButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/AbstractButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/AbstractButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.AbstractButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ApplicationWindow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ApplicationWindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ApplicationWindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ApplicationWindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ApplicationWindow { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/BusyIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/BusyIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/BusyIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/BusyIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.BusyIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Button { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/CheckBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.CheckBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/CheckDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/CheckDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/CheckDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/CheckDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.CheckDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ComboBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ComboBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ComboBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ComboBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T +import QtQuick.Templates 2.2 as T T.ComboBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Container.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Container.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Container.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Container.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Container { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Control.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Control.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Control { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/DelayButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/DelayButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/DelayButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/DelayButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.DelayButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/DialogButtonBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/DialogButtonBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/DialogButtonBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/DialogButtonBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.DialogButtonBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Dialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Dialog { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Dial.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Dial.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Dial { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Drawer.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Drawer { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Frame.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Frame { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/GroupBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/GroupBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/GroupBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/GroupBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.GroupBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ItemDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ItemDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ItemDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ItemDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ItemDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Label.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Label { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/MenuBarItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/MenuBarItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/MenuBarItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/MenuBarItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T - -T.MenuBarItem { - id: control - objectName: "menubaritem-identified" - - contentItem: Item { - id: contentItem - objectName: "menubaritem-contentItem-identified" - } - - background: Item { - id: background - objectName: "menubaritem-background-identified" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/MenuBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/MenuBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/MenuBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/MenuBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T - -T.MenuBar { - id: control - objectName: "menubar-identified" - - contentItem: Item { - id: contentItem - objectName: "menubar-contentItem-identified" - } - - background: Item { - id: background - objectName: "menubar-background-identified" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/MenuItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/MenuItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/MenuItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/MenuItem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,18 +48,13 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.MenuItem { id: control objectName: "menuitem-identified" - arrow: Item { - id: arrow - objectName: "menuitem-arrow-identified" - } - indicator: Item { id: indicator objectName: "menuitem-indicator-identified" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Menu.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Menu { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/MenuSeparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/MenuSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/MenuSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/MenuSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.MenuSeparator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/PageIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.PageIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Page.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Page.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Page { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Pane.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Pane { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Popup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Popup { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ProgressBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ProgressBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ProgressBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ProgressBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ProgressBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/RadioButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/RadioButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/RadioButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/RadioButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RadioButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/RadioDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/RadioDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/RadioDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/RadioDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RadioDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/RangeSlider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/RangeSlider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/RangeSlider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/RangeSlider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RangeSlider { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/RoundButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/RoundButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/RoundButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/RoundButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RoundButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ScrollBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ScrollBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ScrollBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ScrollBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ScrollIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ScrollIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ScrollIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ScrollIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ScrollView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ScrollView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ScrollView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ScrollView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Slider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Slider { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/SpinBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/SpinBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/SpinBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/SpinBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SpinBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/StackView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/StackView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/StackView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/StackView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.StackView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/SwipeDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/SwipeDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/SwipeDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/SwipeDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwipeDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/SwipeView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/SwipeView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/SwipeView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/SwipeView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwipeView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/SwitchDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/SwitchDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/SwitchDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/SwitchDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwitchDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Switch.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Switch { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/TabBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/TabBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/TabBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/TabBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TabBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/TabButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/TabButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/TabButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/TabButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TabButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/TextArea.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/TextArea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/TextArea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/TextArea.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TextArea { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/TextField.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/TextField.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/TextField.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/TextField.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TextField { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ToolBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ToolBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ToolButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ToolButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ToolButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ToolButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ToolSeparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ToolSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ToolSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ToolSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolSeparator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ToolTip.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ToolTip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/ToolTip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/ToolTip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolTip { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Tumbler.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/identified/Tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/identified/Tumbler.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Tumbler { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/AbstractButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/AbstractButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/AbstractButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/AbstractButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.AbstractButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ApplicationWindow { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.BusyIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Button { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/CheckBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.CheckBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.CheckDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ComboBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ComboBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ComboBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ComboBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ComboBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Container.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Container.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Container.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Container.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Container { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Control.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Control.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Control { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/DelayButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/DelayButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/DelayButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/DelayButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.DelayButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.DialogButtonBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Dialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Dialog { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Dial.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Dial.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Dial { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Drawer.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Drawer { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Frame.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Frame { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/GroupBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/GroupBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/GroupBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/GroupBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.GroupBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ItemDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Label.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Label { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T - -T.MenuBarItem { - id: control - objectName: "menubaritem-incomplete" - - contentItem: Item { - objectName: "menubaritem-contentItem-incomplete" - } - - background: Item { - objectName: "menubaritem-background-incomplete" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/MenuBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/MenuBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/MenuBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/MenuBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T - -T.MenuBar { - id: control - objectName: "menubar-incomplete" - - contentItem: Item { - objectName: "menubar-contentItem-incomplete" - } - - background: Item { - objectName: "menubar-background-incomplete" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/MenuItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/MenuItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/MenuItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/MenuItem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,17 +48,13 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.MenuItem { id: control objectName: "menuitem-incomplete" - arrow: Item { - objectName: "menuitem-arrow-incomplete" - } - indicator: Item { objectName: "menuitem-indicator-incomplete" } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Menu.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Menu { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.MenuSeparator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/PageIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.PageIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Page.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Page.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Page { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Pane.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Pane { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Popup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Popup { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ProgressBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ProgressBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ProgressBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ProgressBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ProgressBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/RadioButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/RadioButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/RadioButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/RadioButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RadioButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RadioDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/RangeSlider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/RangeSlider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/RangeSlider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/RangeSlider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RangeSlider { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/RoundButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/RoundButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/RoundButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/RoundButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RoundButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ScrollBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ScrollBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ScrollBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ScrollBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ScrollView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ScrollView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ScrollView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ScrollView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Slider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Slider { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/SpinBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/SpinBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/SpinBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/SpinBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SpinBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/StackView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/StackView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/StackView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/StackView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.StackView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwipeDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/SwipeView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/SwipeView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/SwipeView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/SwipeView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwipeView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwitchDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Switch.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Switch { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/TabBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/TabBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/TabBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/TabBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TabBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/TabButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/TabButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/TabButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/TabButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TabButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/TextArea.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/TextArea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/TextArea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/TextArea.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TextArea { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/TextField.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/TextField.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/TextField.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/TextField.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TextField { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ToolBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ToolBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ToolButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ToolButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ToolButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ToolButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolSeparator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ToolTip.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ToolTip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/ToolTip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/ToolTip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolTip { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Tumbler.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/incomplete/Tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/incomplete/Tumbler.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Tumbler { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/AbstractButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/AbstractButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/AbstractButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/AbstractButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.AbstractButton { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ApplicationWindow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ApplicationWindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ApplicationWindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ApplicationWindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.ApplicationWindow { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/BusyIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/BusyIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/BusyIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/BusyIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.BusyIndicator { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Button { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/CheckBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.CheckBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/CheckDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/CheckDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/CheckDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/CheckDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.CheckDelegate { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ComboBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ComboBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ComboBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ComboBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T import "../simple" as Simple Simple.ComboBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Container.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Container.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Container.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Container.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Container { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Control.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Control.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Control { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/DelayButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/DelayButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/DelayButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/DelayButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.DelayButton { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/DialogButtonBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/DialogButtonBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/DialogButtonBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/DialogButtonBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.DialogButtonBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Dialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Dialog { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Dial.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Dial.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Dial { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Drawer.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Drawer { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Frame.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Frame { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/GroupBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/GroupBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/GroupBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/GroupBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.GroupBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ItemDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ItemDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ItemDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ItemDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.ItemDelegate { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Label.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Label { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/MenuBarItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/MenuBarItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/MenuBarItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/MenuBarItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import "../simple" as Simple - -Simple.MenuBarItem { - id: control - objectName: "menubaritem-override" - - contentItem: Item { - objectName: "menubaritem-contentItem-override" - } - - background: Item { - objectName: "menubaritem-background-override" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/MenuBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/MenuBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/MenuBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/MenuBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import "../simple" as Simple - -Simple.MenuBar { - id: control - objectName: "menubar-override" - - contentItem: Item { - objectName: "menubar-contentItem-override" - } - - background: Item { - objectName: "menubar-background-override" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/MenuItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/MenuItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/MenuItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/MenuItem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,17 +48,13 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.MenuItem { id: control objectName: "menuitem-override" - arrow: Item { - objectName: "menuitem-arrow-override" - } - indicator: Item { objectName: "menuitem-indicator-override" } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Menu.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Menu { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/MenuSeparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/MenuSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/MenuSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/MenuSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.MenuSeparator { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/PageIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.PageIndicator { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Page.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Page.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Page { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Pane.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Pane { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Popup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Popup { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ProgressBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ProgressBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ProgressBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ProgressBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.ProgressBar { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/RadioButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/RadioButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/RadioButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/RadioButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.RadioButton { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/RadioDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/RadioDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/RadioDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/RadioDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.RadioDelegate { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/RangeSlider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/RangeSlider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/RangeSlider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/RangeSlider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.RangeSlider { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/RoundButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/RoundButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/RoundButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/RoundButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.RoundButton { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ScrollBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ScrollBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ScrollBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ScrollBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.ScrollBar { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ScrollIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ScrollIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ScrollIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ScrollIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.ScrollIndicator { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ScrollView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ScrollView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ScrollView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ScrollView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.ScrollView { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Slider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Slider { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/SpinBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/SpinBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/SpinBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/SpinBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.SpinBox { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/StackView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/StackView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/StackView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/StackView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.StackView { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/SwipeDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/SwipeDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/SwipeDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/SwipeDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.SwipeDelegate { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/SwipeView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/SwipeView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/SwipeView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/SwipeView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.SwipeView { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/SwitchDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/SwitchDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/SwitchDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/SwitchDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.SwitchDelegate { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Switch.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Switch { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/TabBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/TabBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/TabBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/TabBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.TabBar { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/TabButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/TabButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/TabButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/TabButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.TabButton { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/TextArea.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/TextArea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/TextArea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/TextArea.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.TextArea { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/TextField.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/TextField.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/TextField.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/TextField.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.TextField { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ToolBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ToolBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.ToolBar { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ToolButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ToolButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ToolButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ToolButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.ToolButton { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ToolSeparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ToolSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ToolSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ToolSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.ToolSeparator { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ToolTip.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ToolTip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/ToolTip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/ToolTip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.ToolTip { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Tumbler.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/override/Tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/override/Tumbler.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.9 import "../simple" as Simple Simple.Tumbler { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/AbstractButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/AbstractButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/AbstractButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/AbstractButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.AbstractButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ApplicationWindow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ApplicationWindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ApplicationWindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ApplicationWindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ApplicationWindow { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/BusyIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/BusyIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/BusyIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/BusyIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.BusyIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Button { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/CheckBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.CheckBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/CheckDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/CheckDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/CheckDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/CheckDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.CheckDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ComboBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ComboBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ComboBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ComboBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ComboBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Container.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Container.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Container.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Container.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Container { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Control.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Control.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Control { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/DelayButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/DelayButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/DelayButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/DelayButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.DelayButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/DialogButtonBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/DialogButtonBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/DialogButtonBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/DialogButtonBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.DialogButtonBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Dialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Dialog { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Dial.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Dial.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Dial { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Drawer.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Drawer { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Frame.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Frame { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/GroupBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/GroupBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/GroupBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/GroupBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.GroupBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ItemDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ItemDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ItemDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ItemDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ItemDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Label.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Label { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/MenuBarItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/MenuBarItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/MenuBarItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/MenuBarItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T - -T.MenuBarItem { - id: control - objectName: "menubaritem-simple" - - implicitWidth: Math.max(contentItem.implicitWidth, background.implicitWidth) - implicitHeight: Math.max(contentItem.implicitHeight, background.implicitHeight) - - contentItem: Text { - objectName: "menubaritem-contentItem-simple" - text: control.text - } - - background: Rectangle { - objectName: "menubaritem-background-simple" - implicitWidth: 20 - implicitHeight: 20 - color: control.pressed ? "red" : "green" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/MenuBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/MenuBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/MenuBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/MenuBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T - -T.MenuBar { - id: control - objectName: "menubar-simple" - - implicitWidth: Math.max(contentItem.implicitWidth, background.implicitWidth) - implicitHeight: Math.max(contentItem.implicitHeight, background.implicitHeight) - - contentItem: Item { - objectName: "menubar-contentItem-simple" - } - - background: Rectangle { - objectName: "menubar-background-simple" - implicitWidth: 20 - implicitHeight: 20 - color: control.pressed ? "red" : "green" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/MenuItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/MenuItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/MenuItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/MenuItem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.MenuItem { id: control @@ -58,11 +58,6 @@ implicitWidth: Math.max(contentItem.implicitWidth + indicator.implicitWidth, background.implicitWidth) implicitHeight: Math.max(contentItem.implicitHeight, indicator.implicitHeight, background.implicitHeight) - arrow: Text { - objectName: "menuitem-arrow-simple" - text: control.mirrored ? "<" : ">" - } - indicator: Text { objectName: "menuitem-indicator-simple" text: control.checked ? "V" : "" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Menu.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Menu { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/MenuSeparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/MenuSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/MenuSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/MenuSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.MenuSeparator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/PageIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.PageIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Page.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Page.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Page { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Pane.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Pane { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Popup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Popup { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ProgressBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ProgressBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ProgressBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ProgressBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ProgressBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/RadioButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/RadioButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/RadioButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/RadioButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RadioButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/RadioDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/RadioDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/RadioDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/RadioDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RadioDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/RangeSlider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/RangeSlider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/RangeSlider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/RangeSlider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RangeSlider { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/RoundButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/RoundButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/RoundButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/RoundButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.RoundButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ScrollBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ScrollBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ScrollBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ScrollBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ScrollIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ScrollIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ScrollIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ScrollIndicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollIndicator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ScrollView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ScrollView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ScrollView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ScrollView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ScrollView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Slider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Slider { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/SpinBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/SpinBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/SpinBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/SpinBox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SpinBox { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/StackView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/StackView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/StackView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/StackView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.StackView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/SwipeDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/SwipeDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/SwipeDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/SwipeDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwipeDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/SwipeView.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/SwipeView.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/SwipeView.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/SwipeView.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwipeView { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/SwitchDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/SwitchDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/SwitchDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/SwitchDelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.SwitchDelegate { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Switch.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Switch { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/TabBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/TabBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/TabBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/TabBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TabBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/TabButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/TabButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/TabButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/TabButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TabButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/TextArea.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/TextArea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/TextArea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/TextArea.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TextArea { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/TextField.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/TextField.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/TextField.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/TextField.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.TextField { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ToolBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ToolBar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolBar { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ToolButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ToolButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ToolButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ToolButton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolButton { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ToolSeparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ToolSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ToolSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ToolSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolSeparator { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ToolTip.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ToolTip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/ToolTip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/ToolTip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.ToolTip { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Tumbler.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/data/styles/simple/Tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/data/styles/simple/Tumbler.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.9 +import QtQuick.Templates 2.2 as T T.Tumbler { id: control diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/tst_customization.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/tst_customization.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/customization/tst_customization.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/customization/tst_customization.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -72,9 +72,7 @@ { "ItemDelegate", QStringList() << "background" << "contentItem" }, { "Label", QStringList() << "background" }, { "Menu", QStringList() << "background" << "contentItem" }, - { "MenuBar", QStringList() << "background" << "contentItem" }, - { "MenuBarItem", QStringList() << "background" << "contentItem" }, - { "MenuItem", QStringList() << "arrow" << "background" << "contentItem" << "indicator" }, + { "MenuItem", QStringList() << "background" << "contentItem" << "indicator" }, { "MenuSeparator", QStringList() << "background" << "contentItem" }, { "Page", QStringList() << "background" << "contentItem" }, { "PageIndicator", QStringList() << "background" << "contentItem" }, @@ -180,9 +178,7 @@ QString oldObjectName = qt_objectNames()->value(object); if (!oldObjectName.isEmpty()) qt_createdQObjects()->removeOne(oldObjectName); - // Only track object names from our QML files, - // not e.g. contentItem object names (like "ApplicationWindow"). - if (objectName.contains("-")) { + if (!objectName.isEmpty()) { qt_createdQObjects()->append(objectName); qt_objectNames()->insert(object, objectName); } @@ -255,7 +251,7 @@ QObject* tst_customization::createControl(const QString &name, const QString &qml, QString *error) { QQmlComponent component(engine); - component.setData("import QtQuick 2.10; import QtQuick.Window 2.2; import QtQuick.Controls 2.3; " + name.toUtf8() + " { " + qml.toUtf8() + " }", QUrl()); + component.setData("import QtQuick 2.9; import QtQuick.Window 2.2; import QtQuick.Controls 2.2; " + name.toUtf8() + " { " + qml.toUtf8() + " }", QUrl()); QObject *obj = component.create(); if (!obj) *error = component.errorString(); @@ -359,16 +355,12 @@ for (const ControlInfo &control : ControlInfos) QTest::newRow(qPrintable("overidentified:" + control.type)) << "identified" << control.type << control.delegates << "identified" << true; -#ifndef Q_OS_MACOS // QTBUG-65671 - // test that the built-in styles don't have undesired IDs in their delegates - const QStringList styles = QStringList() << "Default" << "Fusion" << "Material" << "Universal"; // ### TODO: QQuickStyle::availableStyles(); + const QStringList styles = QStringList() << "Default" << "Material" << "Universal"; // ### TODO: QQuickStyle::availableStyles(); for (const QString &style : styles) { for (const ControlInfo &control : ControlInfos) QTest::newRow(qPrintable(style + ":" + control.type)) << style << control.type << control.delegates << "" << false; } - -#endif } void tst_customization::override() diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/designer/designer.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/designer/designer.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/designer/designer.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/designer/designer.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -TEMPLATE = app -TARGET = tst_designer - -QT += quick quick-private quickcontrols2 testlib -CONFIG += testcase -macos:CONFIG -= app_bundle - -SOURCES += \ - $$PWD/tst_designer.cpp diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/designer/tst_designer.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/designer/tst_designer.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/designer/tst_designer.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/designer/tst_designer.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,161 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#include -#include -#include - -#include - -class tst_Designer : public QObject -{ - Q_OBJECT - -private slots: - void initTestCase(); - - void test_controls(); - void test_controls_data(); -}; - - -void tst_Designer::initTestCase() -{ -} - -void doComponentCompleteRecursive(QObject *object) -{ - if (object) { - QQuickItem *item = qobject_cast(object); - - if (item && DesignerSupport::isComponentComplete(item)) - return; - - DesignerSupport::emitComponentCompleteSignalForAttachedProperty(qobject_cast(object)); - - QList childList = object->children(); - - if (item) { - for (QQuickItem *childItem : item->childItems()) { - if (!childList.contains(childItem)) - childList.append(childItem); - } - } - - for (QObject *child : childList) - doComponentCompleteRecursive(child); - - if (item) { - static_cast(item)->componentComplete(); - } else { - QQmlParserStatus *qmlParserStatus = dynamic_cast< QQmlParserStatus*>(object); - if (qmlParserStatus) - qmlParserStatus->componentComplete(); - } - } -} - - -void tst_Designer::test_controls() -{ - QFETCH(QString, type); - - const QByteArray before("import QtQuick 2.10\n" - "import QtQuick.Controls 2.3\n" - "Item {\n"); - - QByteArray source = before; - source.append(type); - - const QByteArray after(" {" - "}\n" - "}\n"); - - source.append(after); - - QQmlEngine engine; - QQmlComponent component(&engine); - - { - ComponentCompleteDisabler disableComponentComplete; - component.setData(source, QUrl::fromLocalFile(QDir::current().absolutePath())); - } - - QObject *root = component.create(); - QVERIFY(root); - doComponentCompleteRecursive(root); -} - -void tst_Designer::test_controls_data() -{ - QTest::addColumn("type"); - - QTest::newRow("type") << "SpinBox"; - QTest::newRow("type") << "Switch"; - QTest::newRow("type") << "ComboBox"; - QTest::newRow("type") << "CheckBox"; - QTest::newRow("type") << "Button"; - QTest::newRow("type") << "DelayButton"; - QTest::newRow("type") << "Dial"; - QTest::newRow("type") << "Frame"; - QTest::newRow("type") << "GroupBox"; - QTest::newRow("type") << "Label"; - QTest::newRow("type") << "Page"; - QTest::newRow("type") << "Pane"; - QTest::newRow("type") << "ProgressBar"; - QTest::newRow("type") << "RadioButton"; - QTest::newRow("type") << "RangeSlider"; - QTest::newRow("type") << "RoundButton"; - QTest::newRow("type") << "ScrollView"; - QTest::newRow("type") << "Slider"; - QTest::newRow("type") << "StackView"; - QTest::newRow("type") << "SwipeView"; - QTest::newRow("type") << "Switch"; - QTest::newRow("type") << "TabBar"; - QTest::newRow("type") << "TabButton"; - QTest::newRow("type") << "TextArea"; - QTest::newRow("type") << "TextField"; - QTest::newRow("type") << "ToolBar"; - QTest::newRow("type") << "ToolButton"; - QTest::newRow("type") << "Tumbler"; -} - -QTEST_MAIN(tst_Designer) - -#include "tst_designer.moc" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/focus/data/activeFocusOnTab.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/focus/data/activeFocusOnTab.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/focus/data/activeFocusOnTab.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/focus/data/activeFocusOnTab.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Item { id: main diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/focus/data/keyNavigation.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/focus/data/keyNavigation.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/focus/data/keyNavigation.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/focus/data/keyNavigation.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.1 Item { id: main diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/focus/data/visualFocus.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/focus/data/visualFocus.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/focus/data/visualFocus.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/focus/data/visualFocus.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.5 +import QtQuick.Controls 2.0 Column { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-appwindow-custom.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-appwindow-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-appwindow-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-appwindow-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { font.capitalization: Font.AllUppercase diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-appwindow-default.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-appwindow-default.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-appwindow-default.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-appwindow-default.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-control-custom.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-control-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-control-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-control-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Control { font.capitalization: Font.AllUppercase diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-control-default.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-control-default.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-control-default.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-control-default.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Control { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-popup-custom.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-popup-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-popup-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-popup-custom.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Popup { font.capitalization: Font.AllUppercase diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-popup-default.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-popup-default.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/font-popup-default.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/font-popup-default.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Popup { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-childcontrol.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-childcontrol.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-childcontrol.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-childcontrol.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-childpopup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-childpopup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-childpopup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-childpopup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-control.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-control.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-dynamicchildcontrol.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-dynamicchildcontrol.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-dynamicchildcontrol.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-dynamicchildcontrol.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-dynamicchildpopup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-dynamicchildpopup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-dynamicchildpopup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-dynamicchildpopup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-dynamiccontrol.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-dynamiccontrol.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-dynamiccontrol.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-dynamiccontrol.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-dynamicpopup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-dynamicpopup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-dynamicpopup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-dynamicpopup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-popup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/inheritance-popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/inheritance-popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/listview.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/listview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/data/listview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/data/listview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/tst_font.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/tst_font.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/font/tst_font.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/font/tst_font.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -45,7 +45,7 @@ #include #include #include -#include +#include using namespace QQuickVisualTestUtil; @@ -54,8 +54,6 @@ Q_OBJECT private slots: - void systemFont(); - void font_data(); void font(); @@ -69,42 +67,6 @@ void listView(); }; -static QFont testFont() -{ - QQmlEngine engine; - QQmlComponent component(&engine); - component.setData("import QtQuick 2.0; import QtQuick.Controls 2.0; Text { }", QUrl()); - - QScopedPointer object(component.create()); - Q_ASSERT_X(!object.isNull(), "testFont", qPrintable(component.errorString())); - - QVariant var = object->property("font"); - Q_ASSERT_X(var.isValid(), "testFont", var.typeName()); - return var.value(); -} - -void tst_font::systemFont() -{ - QSKIP("QTBUG-70063: qmlClearTypeRegistrations() call causes crash"); - - const QFont *originalSystemFont = QGuiApplicationPrivate::platformTheme()->font(QPlatformTheme::SystemFont); - if (!originalSystemFont) - QSKIP("Cannot test the system font on a minimal platform"); - - const QFont fontBefore = testFont(); - QCOMPARE(fontBefore, *originalSystemFont); - - qmlClearTypeRegistrations(); - delete QGuiApplicationPrivate::app_font; - QGuiApplicationPrivate::app_font = nullptr; - - const QFont appFont = QGuiApplication::font(); - QCOMPARE(appFont, *originalSystemFont); - - const QFont fontAfter = testFont(); - QCOMPARE(fontAfter, *originalSystemFont); -} - void tst_font::font_data() { QTest::addColumn("testFile"); @@ -133,11 +95,6 @@ QFETCH(QString, testFile); QFETCH(QFont, expectedFont); - if (QSysInfo::productType().compare(QLatin1String("osx"), Qt::CaseInsensitive) == 0 - && qgetenv("QTEST_ENVIRONMENT").split(' ').contains("CI")) { - QSKIP("This test crashes on macOS: QTBUG-70063"); - } - QQmlEngine engine; QQmlComponent component(&engine); component.loadUrl(testFileUrl(testFile)); @@ -224,95 +181,110 @@ QCOMPARE(grandChild->property("font").value(), windowFont); } -class TestFontTheme : public QQuickTheme +class TestFontTheme : public QQuickProxyTheme { public: - static const int NFonts = QQuickTheme::Tumbler + 1; - - TestFontTheme() + TestFontTheme(QPlatformTheme *theme) : QQuickProxyTheme(theme) { - for (int i = 0; i < NFonts; ++i) { + std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast(0)); + + for (int i = QPlatformTheme::SystemFont; i < QPlatformTheme::NFonts; ++i) { QFont font = QFont(); font.setPixelSize(i + 10); - setFont(static_cast(i), font); + fonts[i] = new QFont(font); } + + QGuiApplicationPrivate::platform_theme = this; + } + + const QFont *font(Font type = SystemFont) const override + { + return fonts[type]; } + +private: + QFont *fonts[QPlatformTheme::NFonts]; }; -Q_DECLARE_METATYPE(QQuickTheme::Scope) +Q_DECLARE_METATYPE(QPlatformTheme::Font) void tst_font::defaultFont_data() { QTest::addColumn("control"); - QTest::addColumn("scope"); + QTest::addColumn("fontType"); - QTest::newRow("AbstractButton") << "AbstractButton" << QQuickTheme::System; - QTest::newRow("ApplicationWindow") << "ApplicationWindow" << QQuickTheme::System; - QTest::newRow("Button") << "Button" << QQuickTheme::Button; - QTest::newRow("CheckBox") << "CheckBox" << QQuickTheme::CheckBox; - QTest::newRow("CheckDelegate") << "CheckDelegate" << QQuickTheme::ListView; - QTest::newRow("ComboBox") << "ComboBox" << QQuickTheme::ComboBox; - QTest::newRow("Container") << "Container" << QQuickTheme::System; - QTest::newRow("Control") << "Control" << QQuickTheme::System; - QTest::newRow("Dial") << "Dial" << QQuickTheme::System; - QTest::newRow("Dialog") << "Dialog" << QQuickTheme::System; - QTest::newRow("DialogButtonBox") << "DialogButtonBox" << QQuickTheme::System; - QTest::newRow("Drawer") << "Drawer" << QQuickTheme::System; - QTest::newRow("Frame") << "Frame" << QQuickTheme::System; - QTest::newRow("GroupBox") << "GroupBox" << QQuickTheme::GroupBox; - QTest::newRow("ItemDelegate") << "ItemDelegate" << QQuickTheme::ItemView; - QTest::newRow("Label") << "Label" << QQuickTheme::Label; - QTest::newRow("Menu") << "Menu" << QQuickTheme::Menu; - QTest::newRow("MenuItem") << "MenuItem" << QQuickTheme::Menu; - QTest::newRow("MenuSeparator") << "MenuSeparator" << QQuickTheme::Menu; - QTest::newRow("Page") << "Page" << QQuickTheme::System; - QTest::newRow("Pane") << "Pane" << QQuickTheme::System; - QTest::newRow("Popup") << "Popup" << QQuickTheme::System; - QTest::newRow("ProgressBar") << "ProgressBar" << QQuickTheme::System; - QTest::newRow("RadioButton") << "RadioButton" << QQuickTheme::RadioButton; - QTest::newRow("RadioDelegate") << "RadioDelegate" << QQuickTheme::ListView; - QTest::newRow("RangeSlider") << "RangeSlider" << QQuickTheme::System; - QTest::newRow("RoundButton") << "RoundButton" << QQuickTheme::Button; - QTest::newRow("ScrollBar") << "ScrollBar" << QQuickTheme::System; - QTest::newRow("ScrollIndicator") << "ScrollIndicator" << QQuickTheme::System; - QTest::newRow("Slider") << "Slider" << QQuickTheme::System; - QTest::newRow("SpinBox") << "SpinBox" << QQuickTheme::SpinBox; - QTest::newRow("SwipeDelegate") << "SwipeDelegate" << QQuickTheme::ListView; - QTest::newRow("Switch") << "Switch" << QQuickTheme::Switch; - QTest::newRow("SwitchDelegate") << "SwitchDelegate" << QQuickTheme::ListView; - QTest::newRow("TabBar") << "TabBar" << QQuickTheme::TabBar; - QTest::newRow("TabButton") << "TabButton" << QQuickTheme::TabBar; - QTest::newRow("TextArea") << "TextArea" << QQuickTheme::TextArea; - QTest::newRow("TextField") << "TextField" << QQuickTheme::TextField; - QTest::newRow("ToolBar") << "ToolBar" << QQuickTheme::ToolBar; - QTest::newRow("ToolButton") << "ToolButton" << QQuickTheme::ToolBar; - QTest::newRow("ToolSeparator") << "ToolSeparator" << QQuickTheme::ToolBar; - QTest::newRow("ToolTip") << "ToolTip" << QQuickTheme::ToolTip; - QTest::newRow("Tumbler") << "Tumbler" << QQuickTheme::Tumbler; + QTest::newRow("AbstractButton") << "AbstractButton" << QPlatformTheme::SystemFont; + QTest::newRow("ApplicationWindow") << "ApplicationWindow" << QPlatformTheme::SystemFont; + QTest::newRow("Button") << "Button" << QPlatformTheme::PushButtonFont; + QTest::newRow("CheckBox") << "CheckBox" << QPlatformTheme::CheckBoxFont; + QTest::newRow("CheckDelegate") << "CheckDelegate" << QPlatformTheme::ListViewFont; + QTest::newRow("ComboBox") << "ComboBox" << QPlatformTheme::ComboMenuItemFont; + QTest::newRow("Container") << "Container" << QPlatformTheme::SystemFont; + QTest::newRow("Control") << "Control" << QPlatformTheme::SystemFont; + QTest::newRow("Dial") << "Dial" << QPlatformTheme::SystemFont; + QTest::newRow("Dialog") << "Dialog" << QPlatformTheme::SystemFont; + QTest::newRow("DialogButtonBox") << "DialogButtonBox" << QPlatformTheme::SystemFont; + QTest::newRow("Drawer") << "Drawer" << QPlatformTheme::SystemFont; + QTest::newRow("Frame") << "Frame" << QPlatformTheme::SystemFont; + QTest::newRow("GroupBox") << "GroupBox" << QPlatformTheme::GroupBoxTitleFont; + QTest::newRow("ItemDelegate") << "ItemDelegate" << QPlatformTheme::ItemViewFont; + QTest::newRow("Label") << "Label" << QPlatformTheme::LabelFont; + QTest::newRow("Menu") << "Menu" << QPlatformTheme::MenuFont; + QTest::newRow("MenuItem") << "MenuItem" << QPlatformTheme::MenuItemFont; + QTest::newRow("MenuSeparator") << "MenuSeparator" << QPlatformTheme::SystemFont; + QTest::newRow("Page") << "Page" << QPlatformTheme::SystemFont; + QTest::newRow("Pane") << "Pane" << QPlatformTheme::SystemFont; + QTest::newRow("Popup") << "Popup" << QPlatformTheme::SystemFont; + QTest::newRow("ProgressBar") << "ProgressBar" << QPlatformTheme::SystemFont; + QTest::newRow("RadioButton") << "RadioButton" << QPlatformTheme::RadioButtonFont; + QTest::newRow("RadioDelegate") << "RadioDelegate" << QPlatformTheme::ListViewFont; + QTest::newRow("RangeSlider") << "RangeSlider" << QPlatformTheme::SystemFont; + QTest::newRow("RoundButton") << "RoundButton" << QPlatformTheme::PushButtonFont; + QTest::newRow("ScrollBar") << "ScrollBar" << QPlatformTheme::SystemFont; + QTest::newRow("ScrollIndicator") << "ScrollIndicator" << QPlatformTheme::SystemFont; + QTest::newRow("Slider") << "Slider" << QPlatformTheme::SystemFont; + QTest::newRow("SpinBox") << "SpinBox" << QPlatformTheme::EditorFont; + QTest::newRow("SwipeDelegate") << "SwipeDelegate" << QPlatformTheme::ListViewFont; + QTest::newRow("Switch") << "Switch" << QPlatformTheme::SystemFont; // ### TODO: add QPlatformTheme::SwitchFont + QTest::newRow("SwitchDelegate") << "SwitchDelegate" << QPlatformTheme::ListViewFont; + QTest::newRow("TabBar") << "TabBar" << QPlatformTheme::SystemFont; + QTest::newRow("TabButton") << "TabButton" << QPlatformTheme::TabButtonFont; + QTest::newRow("TextArea") << "TextArea" << QPlatformTheme::EditorFont; + QTest::newRow("TextField") << "TextField" << QPlatformTheme::EditorFont; + QTest::newRow("ToolBar") << "ToolBar" << QPlatformTheme::SystemFont; + QTest::newRow("ToolButton") << "ToolButton" << QPlatformTheme::ToolButtonFont; + QTest::newRow("ToolSeparator") << "ToolSeparator" << QPlatformTheme::SystemFont; + QTest::newRow("ToolTip") << "ToolTip" << QPlatformTheme::TipLabelFont; + QTest::newRow("Tumbler") << "Tumbler" << QPlatformTheme::SystemFont; } void tst_font::defaultFont() { QFETCH(QString, control); - QFETCH(QQuickTheme::Scope, scope); + QFETCH(QPlatformTheme::Font, fontType); + + TestFontTheme theme(QGuiApplicationPrivate::platform_theme); QQmlEngine engine; QQmlComponent component(&engine); component.setData(QString("import QtQuick.Controls 2.2; %1 { }").arg(control).toUtf8(), QUrl()); - // The call to setData() above causes QQuickDefaultTheme to be set as the current theme, - // so we must make sure we only set our theme afterwards. - QQuickThemePrivate::instance.reset(new TestFontTheme); - QScopedPointer object(component.create()); QVERIFY2(!object.isNull(), qPrintable(component.errorString())); QVariant var = object->property("font"); QVERIFY(var.isValid()); - QFont expectedFont = QQuickTheme::font(scope); + const QFont *expectedFont = theme.font(fontType); + QVERIFY(expectedFont); + QFont actualFont = var.value(); - QCOMPARE(actualFont, expectedFont); + + if (actualFont != *expectedFont) { + qDebug() << QTest::currentDataTag() << actualFont << *expectedFont; + } + + QCOMPARE(actualFont, *expectedFont); } void tst_font::listView_data() diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-childcontrol.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-childcontrol.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-childcontrol.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-childcontrol.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - id: window - - property alias control: control - property alias child: child - property alias grandChild: grandChild - - Item { - Control { - id: control - - Control { - id: child - - Item { - Control { - id: grandChild - } - } - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-childpopup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-childpopup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-childpopup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-childpopup.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - id: window - - property alias control: control - property alias child: child - property alias grandChild: grandChild - - Item { - Popup { - id: control - - Control { - id: child - - Item { - Control { - id: grandChild - } - } - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-control.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-control.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - id: window - - property alias control: control - property alias child: child - property alias grandChild: grandChild - - Control { - id: control - - Control { - id: child - - Item { - Control { - id: grandChild - } - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - id: window - - property Control control - property Control child - property Control grandChild - - Item { - id: childItem - } - - Component { - id: component - Control { } - } - - Component.onCompleted: { - control = component.createObject(childItem) - child = component.createObject(control) - grandChild = component.createObject(child) - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-dynamicchildpopup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-dynamicchildpopup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-dynamicchildpopup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-dynamicchildpopup.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - id: window - - property Popup control - property Control child - property Control grandChild - - Item { - id: childItem - } - - Component { - id: popupComponent - Popup { } - } - - Component { - id: controlComponent - Control { } - } - - Component.onCompleted: { - control = popupComponent.createObject(childItem) - child = controlComponent.createObject(control.contentItem) - grandChild = controlComponent.createObject(child) - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-dynamiccontrol.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-dynamiccontrol.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-dynamiccontrol.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-dynamiccontrol.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - id: window - - property Control control - property Control child - property Control grandChild - - Component { - id: component - Control { } - } - - Component.onCompleted: { - control = component.createObject(contentItem) - child = component.createObject(control) - grandChild = component.createObject(child) - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-dynamicpopup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-dynamicpopup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-dynamicpopup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-dynamicpopup.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - id: window - - property Popup control - property Control child - property Control grandChild - - Component { - id: popupComponent - Popup { } - } - - Component { - id: controlComponent - Control { } - } - - Component.onCompleted: { - control = popupComponent.createObject(window) - child = controlComponent.createObject(control.contentItem) - grandChild = controlComponent.createObject(child) - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-popup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/inheritance-popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/inheritance-popup.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - id: window - - property alias control: control - property alias child: child - property alias grandChild: grandChild - - Popup { - id: control - - Control { - id: child - - Item { - Control { - id: grandChild - } - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/listview.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/listview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/listview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/listview.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - id: window - width: 200 - height: 200 - - property alias listView: listView - - palette.highlight: "red" - - ListView { - id: listView - anchors.fill: parent - model: 1 - delegate: Column { - property alias control: control - property alias label: label - property alias textarea: textarea - property alias textfield: textfield - - Control { id: control } - Label { id: label } - TextArea { id: textarea } - TextField { id: textfield } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-appwindow-custom.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-appwindow-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-appwindow-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-appwindow-custom.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - palette.alternateBase: "aqua" - palette.base: "azure" - palette.brightText: "beige" - palette.button: "bisque" - palette.buttonText: "chocolate" - palette.dark: "coral" - palette.highlight: "crimson" - palette.highlightedText: "fuchsia" - palette.light: "gold" - palette.link: "indigo" - palette.linkVisited: "ivory" - palette.mid: "khaki" - palette.midlight: "lavender" - palette.shadow: "linen" - palette.text: "moccasin" - palette.toolTipBase: "navy" - palette.toolTipText: "orchid" - palette.window: "plum" - palette.windowText: "salmon" -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-appwindow-default.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-appwindow-default.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-appwindow-default.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-appwindow-default.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-control-custom.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-control-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-control-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-control-custom.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -Control { - palette.alternateBase: "aqua" - palette.base: "azure" - palette.brightText: "beige" - palette.button: "bisque" - palette.buttonText: "chocolate" - palette.dark: "coral" - palette.highlight: "crimson" - palette.highlightedText: "fuchsia" - palette.light: "gold" - palette.link: "indigo" - palette.linkVisited: "ivory" - palette.mid: "khaki" - palette.midlight: "lavender" - palette.shadow: "linen" - palette.text: "moccasin" - palette.toolTipBase: "navy" - palette.toolTipText: "orchid" - palette.window: "plum" - palette.windowText: "salmon" -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-control-default.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-control-default.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-control-default.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-control-default.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -Control { -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-popup-custom.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-popup-custom.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-popup-custom.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-popup-custom.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -Popup { - palette.alternateBase: "aqua" - palette.base: "azure" - palette.brightText: "beige" - palette.button: "bisque" - palette.buttonText: "chocolate" - palette.dark: "coral" - palette.highlight: "crimson" - palette.highlightedText: "fuchsia" - palette.light: "gold" - palette.link: "indigo" - palette.linkVisited: "ivory" - palette.mid: "khaki" - palette.midlight: "lavender" - palette.shadow: "linen" - palette.text: "moccasin" - palette.toolTipBase: "navy" - palette.toolTipText: "orchid" - palette.window: "plum" - palette.windowText: "salmon" -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-popup-default.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-popup-default.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/data/palette-popup-default.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/data/palette-popup-default.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -Popup { -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/palette.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/palette.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/palette.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/palette.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -CONFIG += testcase -TARGET = tst_palette -SOURCES += tst_palette.cpp - -macos:CONFIG -= app_bundle - -QT += core-private gui-private qml-private quick-private testlib quicktemplates2-private quickcontrols2-private - -include (../shared/util.pri) - -RESOURCES += qtquickcontrols2.conf - -TESTDATA = data/* - -OTHER_FILES += \ - data/*.qml diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/qtquickcontrols2.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/qtquickcontrols2.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/qtquickcontrols2.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/qtquickcontrols2.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -[Default] -Palette\Base=#efefef - -[Default\Palette] -Text=#101010 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/tst_palette.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/tst_palette.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/palette/tst_palette.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/palette/tst_palette.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,350 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "../shared/visualtestutil.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace QQuickVisualTestUtil; - -class tst_palette : public QQmlDataTest -{ - Q_OBJECT - -private slots: - void initTestCase(); - - void palette_data(); - void palette(); - - void inheritance_data(); - void inheritance(); - - void defaultPalette_data(); - void defaultPalette(); - - void listView_data(); - void listView(); -}; - -void tst_palette::initTestCase() -{ - QQmlDataTest::initTestCase(); - - // Import QtQuick.Controls to initialize styles and themes so that - // QQuickControlPrivate::themePalette() returns a palette from the - // style's theme instead of the platform's theme. - QQmlEngine engine; - QQmlComponent component(&engine); - component.setData("import QtQuick.Controls 2.3; Control { }", QUrl()); - delete component.create(); -} - -void tst_palette::palette_data() -{ - QTest::addColumn("testFile"); - QTest::addColumn("expectedPalette"); - - QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::System); - defaultPalette.setColor(QPalette::Base, QColor("#efefef")); - defaultPalette.setColor(QPalette::Text, QColor("#101010")); - - QTest::newRow("Control") << "palette-control-default.qml" << defaultPalette; - QTest::newRow("AppWindow") << "palette-appwindow-default.qml" << defaultPalette; - QTest::newRow("Popup") << "palette-popup-default.qml" << defaultPalette; - - QPalette customPalette; - customPalette.setColor(QPalette::AlternateBase, QColor("aqua")); - customPalette.setColor(QPalette::Base, QColor("azure")); - customPalette.setColor(QPalette::BrightText, QColor("beige")); - customPalette.setColor(QPalette::Button, QColor("bisque")); - customPalette.setColor(QPalette::ButtonText, QColor("chocolate")); - customPalette.setColor(QPalette::Dark, QColor("coral")); - customPalette.setColor(QPalette::Highlight, QColor("crimson")); - customPalette.setColor(QPalette::HighlightedText, QColor("fuchsia")); - customPalette.setColor(QPalette::Light, QColor("gold")); - customPalette.setColor(QPalette::Link, QColor("indigo")); - customPalette.setColor(QPalette::LinkVisited, QColor("ivory")); - customPalette.setColor(QPalette::Mid, QColor("khaki")); - customPalette.setColor(QPalette::Midlight, QColor("lavender")); - customPalette.setColor(QPalette::Shadow, QColor("linen")); - customPalette.setColor(QPalette::Text, QColor("moccasin")); - customPalette.setColor(QPalette::ToolTipBase, QColor("navy")); - customPalette.setColor(QPalette::ToolTipText, QColor("orchid")); - customPalette.setColor(QPalette::Window, QColor("plum")); - customPalette.setColor(QPalette::WindowText, QColor("salmon")); - - QTest::newRow("Control:custom") << "palette-control-custom.qml" << customPalette; - QTest::newRow("AppWindow:custom") << "palette-appwindow-custom.qml" << customPalette; - QTest::newRow("Popup:custom") << "palette-popup-custom.qml" << customPalette; -} - -void tst_palette::palette() -{ - QFETCH(QString, testFile); - QFETCH(QPalette, expectedPalette); - - QQmlEngine engine; - QQmlComponent component(&engine); - component.loadUrl(testFileUrl(testFile)); - - QScopedPointer object(component.create()); - QVERIFY2(!object.isNull(), qPrintable(component.errorString())); - - QVariant var = object->property("palette"); - QVERIFY(var.isValid()); - - QPalette actualPalette = var.value(); - QCOMPARE(actualPalette, expectedPalette); -} - -void tst_palette::inheritance_data() -{ - QTest::addColumn("testFile"); - - QTest::newRow("Control") << "inheritance-control.qml"; - QTest::newRow("Child Control") << "inheritance-childcontrol.qml"; - QTest::newRow("Dynamic Control") << "inheritance-dynamiccontrol.qml"; - QTest::newRow("Dynamic Child Control") << "inheritance-dynamicchildcontrol.qml"; - - QTest::newRow("Popup") << "inheritance-popup.qml"; - QTest::newRow("Child Popup") << "inheritance-childpopup.qml"; - QTest::newRow("Dynamic Popup") << "inheritance-dynamicpopup.qml"; - QTest::newRow("Dynamic Child Popup") << "inheritance-dynamicchildpopup.qml"; -} - -void tst_palette::inheritance() -{ - QFETCH(QString, testFile); - - QQmlEngine engine; - QQmlComponent component(&engine); - component.loadUrl(testFileUrl(testFile)); - - QScopedPointer window(qobject_cast(component.create())); - QVERIFY2(!window.isNull(), qPrintable(component.errorString())); - - QObject *control = window->property("control").value(); - QObject *child = window->property("child").value(); - QObject *grandChild = window->property("grandChild").value(); - QVERIFY(control && child && grandChild); - - QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::System); - defaultPalette.setColor(QPalette::Base, QColor("#efefef")); - defaultPalette.setColor(QPalette::Text, QColor("#101010")); - - QCOMPARE(window->palette(), defaultPalette); - - QCOMPARE(control->property("palette").value(), defaultPalette); - QCOMPARE(child->property("palette").value(), defaultPalette); - QCOMPARE(grandChild->property("palette").value(), defaultPalette); - - QPalette childPalette(defaultPalette); - childPalette.setColor(QPalette::Base, Qt::red); - childPalette.setColor(QPalette::Text, Qt::green); - childPalette.setColor(QPalette::Button, Qt::blue); - child->setProperty("palette", childPalette); - QCOMPARE(child->property("palette").value(), childPalette); - QCOMPARE(grandChild->property("palette").value(), childPalette); - - QPalette grandChildPalette(childPalette); - grandChildPalette.setColor(QPalette::Base, Qt::cyan); - grandChildPalette.setColor(QPalette::Mid, Qt::magenta); - grandChild->setProperty("palette", grandChildPalette); - QCOMPARE(child->property("palette").value(), childPalette); - QCOMPARE(grandChild->property("palette").value(), grandChildPalette); - - QPalette windowPalette(defaultPalette); - windowPalette.setColor(QPalette::Window, Qt::gray); - window->setPalette(windowPalette); - QCOMPARE(window->palette(), windowPalette); - QCOMPARE(control->property("palette").value(), windowPalette); - - childPalette.setColor(QPalette::Window, Qt::gray); - QCOMPARE(child->property("palette").value(), childPalette); - - grandChildPalette.setColor(QPalette::Window, Qt::gray); - QCOMPARE(grandChild->property("palette").value(), grandChildPalette); - - child->setProperty("palette", QVariant()); - QCOMPARE(child->property("palette").value(), windowPalette); - QCOMPARE(grandChild->property("palette").value(), grandChildPalette); - - grandChild->setProperty("palette", QVariant()); - QCOMPARE(grandChild->property("palette").value(), windowPalette); -} - -class TestTheme : public QQuickTheme -{ -public: - static const int NPalettes = QQuickTheme::Tumbler + 1; - - TestTheme() - { - for (int i = 0; i < NPalettes; ++i) - setPalette(static_cast(i), QPalette(QColor::fromRgb(i))); - } -}; - -Q_DECLARE_METATYPE(QQuickTheme::Scope) - -void tst_palette::defaultPalette_data() -{ - QTest::addColumn("control"); - QTest::addColumn("scope"); - - QTest::newRow("AbstractButton") << "AbstractButton" << QQuickTheme::System; - QTest::newRow("ApplicationWindow") << "ApplicationWindow" << QQuickTheme::System; - QTest::newRow("Button") << "Button" << QQuickTheme::Button; - QTest::newRow("CheckBox") << "CheckBox" << QQuickTheme::CheckBox; - QTest::newRow("CheckDelegate") << "CheckDelegate" << QQuickTheme::ListView; - QTest::newRow("ComboBox") << "ComboBox" << QQuickTheme::ComboBox; - QTest::newRow("Container") << "Container" << QQuickTheme::System; - QTest::newRow("Control") << "Control" << QQuickTheme::System; - QTest::newRow("Dial") << "Dial" << QQuickTheme::System; - QTest::newRow("Dialog") << "Dialog" << QQuickTheme::System; - QTest::newRow("DialogButtonBox") << "DialogButtonBox" << QQuickTheme::System; - QTest::newRow("Drawer") << "Drawer" << QQuickTheme::System; - QTest::newRow("Frame") << "Frame" << QQuickTheme::System; - QTest::newRow("GroupBox") << "GroupBox" << QQuickTheme::GroupBox; - QTest::newRow("ItemDelegate") << "ItemDelegate" << QQuickTheme::ItemView; - QTest::newRow("Label") << "Label" << QQuickTheme::Label; - QTest::newRow("Menu") << "Menu" << QQuickTheme::Menu; - QTest::newRow("MenuItem") << "MenuItem" << QQuickTheme::Menu; - QTest::newRow("MenuSeparator") << "MenuSeparator" << QQuickTheme::Menu; - QTest::newRow("Page") << "Page" << QQuickTheme::System; - QTest::newRow("Pane") << "Pane" << QQuickTheme::System; - QTest::newRow("Popup") << "Popup" << QQuickTheme::System; - QTest::newRow("ProgressBar") << "ProgressBar" << QQuickTheme::System; - QTest::newRow("RadioButton") << "RadioButton" << QQuickTheme::RadioButton; - QTest::newRow("RadioDelegate") << "RadioDelegate" << QQuickTheme::ListView; - QTest::newRow("RangeSlider") << "RangeSlider" << QQuickTheme::System; - QTest::newRow("RoundButton") << "RoundButton" << QQuickTheme::Button; - QTest::newRow("ScrollBar") << "ScrollBar" << QQuickTheme::System; - QTest::newRow("ScrollIndicator") << "ScrollIndicator" << QQuickTheme::System; - QTest::newRow("Slider") << "Slider" << QQuickTheme::System; - QTest::newRow("SpinBox") << "SpinBox" << QQuickTheme::SpinBox; - QTest::newRow("SwipeDelegate") << "SwipeDelegate" << QQuickTheme::ListView; - QTest::newRow("Switch") << "Switch" << QQuickTheme::Switch; - QTest::newRow("SwitchDelegate") << "SwitchDelegate" << QQuickTheme::ListView; - QTest::newRow("TabBar") << "TabBar" << QQuickTheme::TabBar; - QTest::newRow("TabButton") << "TabButton" << QQuickTheme::TabBar; - QTest::newRow("TextArea") << "TextArea" << QQuickTheme::TextArea; - QTest::newRow("TextField") << "TextField" << QQuickTheme::TextField; - QTest::newRow("ToolBar") << "ToolBar" << QQuickTheme::ToolBar; - QTest::newRow("ToolButton") << "ToolButton" << QQuickTheme::ToolBar; - QTest::newRow("ToolSeparator") << "ToolSeparator" << QQuickTheme::ToolBar; - QTest::newRow("ToolTip") << "ToolTip" << QQuickTheme::ToolTip; - QTest::newRow("Tumbler") << "Tumbler" << QQuickTheme::Tumbler; -} - -void tst_palette::defaultPalette() -{ - QFETCH(QString, control); - QFETCH(QQuickTheme::Scope, scope); - - QQmlEngine engine; - QQmlComponent component(&engine); - component.setData(QString("import QtQuick.Controls 2.3; %1 { }").arg(control).toUtf8(), QUrl()); - - // The call to setData() above causes QQuickDefaultTheme to be set as the current theme, - // so we must make sure we only set our theme afterwards. - QQuickThemePrivate::instance.reset(new TestTheme); - - QScopedPointer object(component.create()); - QVERIFY2(!object.isNull(), qPrintable(component.errorString())); - - QVariant var = object->property("palette"); - QVERIFY(var.isValid()); - - QPalette expectedPalette = QQuickTheme::palette(scope); - QPalette actualPalette = var.value(); - QCOMPARE(actualPalette, expectedPalette); -} - -void tst_palette::listView_data() -{ - QTest::addColumn("objectName"); - - QTest::newRow("Control") << "control"; - QTest::newRow("Label") << "label"; - QTest::newRow("TextArea") << "textarea"; - QTest::newRow("TextField") << "textfield"; -} - -void tst_palette::listView() -{ - QFETCH(QString, objectName); - - QQmlEngine engine; - QQmlComponent component(&engine); - component.loadUrl(testFileUrl("listview.qml")); - - QScopedPointer window(qobject_cast(component.create())); - QVERIFY2(!window.isNull(), qPrintable(component.errorString())); - - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); - - QQuickItem *listView = window->property("listView").value(); - QVERIFY(listView); - - QQuickItem *contentItem = listView->property("contentItem").value(); - QVERIFY(contentItem); - - QVERIFY(QMetaObject::invokeMethod(listView, "forceLayout")); - - QQuickItem *column = contentItem->childItems().value(0); - QVERIFY(column); - - QQuickItem *control = column->property(objectName.toUtf8()).value(); - QVERIFY(control); - - QCOMPARE(control->property("palette").value().color(QPalette::Highlight), QColor(Qt::red)); -} - -QTEST_MAIN(tst_palette) - -#include "tst_palette.moc" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_colordialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_colordialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_colordialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_colordialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_filedialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_filedialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_filedialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_filedialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_folderdialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_folderdialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_folderdialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_folderdialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_fontdialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_fontdialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_fontdialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_fontdialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_menubar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_menubar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_menubar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_menubar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_menuitemgroup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_menuitemgroup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_menuitemgroup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_menuitemgroup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_menuitem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_menuitem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_menuitem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_menuitem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_menu.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 @@ -242,23 +242,4 @@ compare(Menu.DefaultMenu, 0) compare(Menu.EditMenu, 1) } - - function test_subMenus() { - var parentMenu = createTemporaryObject(menu, testCase) - verify(parentMenu) - - var subMenu = menu.createObject(parentMenu) - verify(subMenu) - - var subMenuItem = subMenu.menuItem - verify(subMenuItem) - - parentMenu.addMenu(subMenu) - compare(parentMenu.items.length, 1) - verify(parentMenu.items[0], subMenuItem) - - subMenu.title = "Title" - compare(subMenu.title, "Title") - compare(subMenuItem.text, "Title") - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_menuseparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_menuseparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_menuseparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_menuseparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_messagedialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_messagedialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_messagedialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_messagedialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_standardpaths.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_standardpaths.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_standardpaths.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_standardpaths.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_systemtrayicon.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_systemtrayicon.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/platform/data/tst_systemtrayicon.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/platform/data/tst_systemtrayicon.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtTest 1.0 import Qt.labs.platform 1.0 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/pressandhold/data/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/pressandhold/data/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/pressandhold/data/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/pressandhold/data/dependencies.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Control { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/activefocusontab.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/activefocusontab.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/activefocusontab.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/activefocusontab.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { title: "Test Application Window" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/attachedProperties.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/attachedProperties.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/attachedProperties.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/attachedProperties.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 ApplicationWindow { property alias childControl: childControl diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { title: "Test Application Window" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtGraphicalEffects 1.12 +import QtQuick 2.7 +import QtQuick.Controls 2.1 +import QtQuick.Layouts 1.3 +import QtGraphicalEffects 1.0 ApplicationWindow { width: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/defaultFocus.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/defaultFocus.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/defaultFocus.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/defaultFocus.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { visible: true diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/fill.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/fill.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/fill.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/fill.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/font.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/font.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/font.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/font.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.6 +import QtQuick.Controls 2.1 +import QtQuick.Templates 2.1 as T ApplicationWindow { objectName: "appWin" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/layout.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/layout.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/layout.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/layout.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,15 +48,14 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 200 height: 200 visible: true - menuBar: MenuBar { } header: ToolBar { } footer: ToolBar { } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/locale.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/locale.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/data/locale.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/data/locale.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick 2.6 +import QtQuick.Controls 2.1 +import QtQuick.Templates 2.1 as T ApplicationWindow { objectName: "appWin" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include "../shared/util.h" #include "../shared/visualtestutil.h" @@ -412,7 +412,7 @@ QCOMPARE(childControl->window(), childAppWindow); QCOMPARE(childControl->property("attached_window").value(), childAppWindow); QCOMPARE(childControl->property("attached_contentItem").value(), childAppWindow->contentItem()); - QCOMPARE(childControl->property("attached_activeFocusControl").value(), childAppWindowControl); + QCOMPARE(childControl->property("attached_activeFocusControl").value(), childAppWindow->activeFocusControl()); QCOMPARE(childControl->property("attached_header").value(), childAppWindow->header()); QCOMPARE(childControl->property("attached_footer").value(), childAppWindow->footer()); QCOMPARE(childControl->property("attached_overlay").value(), childAppWindow->overlay()); @@ -421,7 +421,7 @@ QCOMPARE(childItem->window(), childAppWindow); QCOMPARE(childItem->property("attached_window").value(), childAppWindow); QCOMPARE(childItem->property("attached_contentItem").value(), childAppWindow->contentItem()); - QCOMPARE(childItem->property("attached_activeFocusControl").value(), childAppWindowControl); + QCOMPARE(childItem->property("attached_activeFocusControl").value(), childAppWindow->activeFocusControl()); QCOMPARE(childItem->property("attached_header").value(), childAppWindow->header()); QCOMPARE(childItem->property("attached_footer").value(), childAppWindow->footer()); QCOMPARE(childItem->property("attached_overlay").value(), childAppWindow->overlay()); @@ -443,55 +443,11 @@ QVERIFY(!childItem->property("attached_header").value()); QVERIFY(!childItem->property("attached_footer").value()); QVERIFY(!childItem->property("attached_overlay").value()); - childAppWindow->close(); - qApp->processEvents(); - - childWindow->show(); - childWindow->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(childWindow)); - - QVERIFY(!childWindowControl->hasActiveFocus()); - childWindowControl->forceActiveFocus(); - QTRY_VERIFY(childWindowControl->hasActiveFocus()); - QCOMPARE(childWindow->activeFocusItem(), childWindowControl); - QCOMPARE(childWindowControl->property("attached_activeFocusControl").value(), childWindowControl); - - childControl->setParentItem(childWindow->contentItem()); - QCOMPARE(childControl->window(), childWindow); - QVERIFY(!childControl->property("attached_window").value()); - QCOMPARE(childControl->property("attached_activeFocusControl").value(), childWindowControl); - QVERIFY(!childControl->property("attached_contentItem").value()); - QVERIFY(!childControl->property("attached_header").value()); - QVERIFY(!childControl->property("attached_footer").value()); - QCOMPARE(childControl->property("attached_overlay").value(), QQuickOverlay::overlay(childWindow)); - - childItem->setParentItem(childWindow->contentItem()); - QCOMPARE(childItem->window(), childWindow); - QVERIFY(!childControl->property("attached_window").value()); - QCOMPARE(childControl->property("attached_activeFocusControl").value(), childWindowControl); - QVERIFY(!childControl->property("attached_contentItem").value()); - QVERIFY(!childControl->property("attached_header").value()); - QVERIFY(!childControl->property("attached_footer").value()); - QCOMPARE(childControl->property("attached_overlay").value(), QQuickOverlay::overlay(childWindow)); - - childControl->setParentItem(nullptr); - QVERIFY(!childControl->window()); - QVERIFY(!childControl->property("attached_window").value()); - QVERIFY(!childControl->property("attached_contentItem").value()); - QVERIFY(!childControl->property("attached_activeFocusControl").value()); - QVERIFY(!childControl->property("attached_header").value()); - QVERIFY(!childControl->property("attached_footer").value()); - QVERIFY(!childControl->property("attached_overlay").value()); - childItem->setParentItem(nullptr); - QVERIFY(!childItem->window()); - QVERIFY(!childItem->property("attached_window").value()); - QVERIFY(!childItem->property("attached_contentItem").value()); - QVERIFY(!childItem->property("attached_activeFocusControl").value()); - QVERIFY(!childItem->property("attached_header").value()); - QVERIFY(!childItem->property("attached_footer").value()); - QVERIFY(!childItem->property("attached_overlay").value()); - childWindow->close(); + // ### A temporary workaround to unblock the CI until the crash caused + // by https://codereview.qt-project.org/#/c/108517/ has been fixed... + window->hide(); + qApp->processEvents(); } void tst_QQuickApplicationWindow::font() @@ -550,18 +506,24 @@ QCOMPARE(item6->font(), font); } -class TestTheme : public QQuickTheme +class TestTheme : public QQuickProxyTheme { public: - TestTheme() + TestTheme(QPlatformTheme *theme) : QQuickProxyTheme(theme), m_font("Courier") + { QGuiApplicationPrivate::platform_theme = this; } + + const QFont *font(Font type = SystemFont) const override { - setFont(System, QFont("Courier")); + Q_UNUSED(type); + return &m_font; } + + QFont m_font; }; void tst_QQuickApplicationWindow::defaultFont() { - QQuickThemePrivate::instance.reset(new TestTheme); + TestTheme theme(QGuiApplicationPrivate::platform_theme); QQmlEngine engine; QQmlComponent component(&engine); @@ -570,7 +532,7 @@ QScopedPointer window; window.reset(static_cast(component.create())); QVERIFY(!window.isNull()); - QCOMPARE(window->font(), QQuickTheme::font(QQuickTheme::System)); + QCOMPARE(window->font(), *theme.font()); } void tst_QQuickApplicationWindow::locale() @@ -816,18 +778,11 @@ QQuickItem *content = window->contentItem(); QVERIFY(content); - QQuickItem *menuBar = window->menuBar(); - QVERIFY(menuBar); QQuickItem *header = window->header(); QVERIFY(header); QQuickItem *footer = window->footer(); QVERIFY(footer); - QCOMPARE(menuBar->x(), 0.0); - QCOMPARE(menuBar->y(), -menuBar->height() - header->height()); - QCOMPARE(header->width(), qreal(window->width())); - QVERIFY(menuBar->height() > 0); - QCOMPARE(header->x(), 0.0); QCOMPARE(header->y(), -header->height()); QCOMPARE(header->width(), qreal(window->width())); @@ -839,12 +794,6 @@ QVERIFY(footer->height() > 0.0); QCOMPARE(content->x(), 0.0); - QCOMPARE(content->y(), menuBar->height() + header->height()); - QCOMPARE(content->width(), qreal(window->width())); - QCOMPARE(content->height(), window->height() - menuBar->height() - header->height() - footer->height()); - - menuBar->setVisible(false); - QCOMPARE(content->x(), 0.0); QCOMPARE(content->y(), header->height()); QCOMPARE(content->width(), qreal(window->width())); QCOMPARE(content->height(), window->height() - header->height() - footer->height()); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickcolor/data/tst_color.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickcolor/data/tst_color.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickcolor/data/tst_color.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickcolor/data/tst_color.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -TestCase { - id: testCase - name: "Color" - - function test_transparent() { - compare(Color.transparent("red", 0.2), Qt.rgba(1, 0, 0, 0.2)) - compare(Color.transparent(Qt.rgba(0, 1, 0, 1), 0.2), Qt.rgba(0, 1, 0, 0.2)) - compare(Color.transparent("#0000ff", 0.2), Qt.rgba(0, 0, 1, 0.2)) - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickcolor/qquickcolor.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickcolor/qquickcolor.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickcolor/qquickcolor.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickcolor/qquickcolor.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -TEMPLATE = app -TARGET = tst_qquickcolor -CONFIG += qmltestcase - -SOURCES += \ - $$PWD/tst_qquickcolor.cpp - -OTHER_FILES += \ - $$PWD/data/*.qml - -TESTDATA += \ - $$PWD/data/tst_* diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickcolor/tst_qquickcolor.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickcolor/tst_qquickcolor.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickcolor/tst_qquickcolor.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickcolor/tst_qquickcolor.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -QUICK_TEST_MAIN(tst_qquickcolor) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/applicationwindow-button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/applicationwindow-button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/applicationwindow-button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/applicationwindow-button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/applicationwindow-hover.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/applicationwindow-hover.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/applicationwindow-hover.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/applicationwindow-hover.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/applicationwindow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/applicationwindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/applicationwindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/applicationwindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/dragOverModalShadow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/dragOverModalShadow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/dragOverModalShadow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/dragOverModalShadow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/flickable.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/flickable.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/flickable.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/flickable.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/grabber.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/grabber.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/grabber.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/grabber.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/header.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/header.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/header.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/header.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/multiple.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/multiple.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/multiple.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/multiple.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/multiTouch.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/multiTouch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/multiTouch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/multiTouch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/reposition.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/reposition.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/reposition.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/reposition.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/slider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/slider.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 400 - height: 400 - - property alias drawer: drawer - property alias slider: slider - - Drawer { - id: drawer - width: 300 - height: 400 - position: 1.0 - visible: true - - Slider { - id: slider - value: 1 - width: parent.width - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.5 - -ApplicationWindow { - id: window - width: 400 - height: 400 - - property alias drawer: drawer - - header: Rectangle { - color: "red" - height: 40 - } - - Drawer { - id: drawer - width: window.width - height: window.height * 0.2 - parent: window.contentItem - edge: Qt.TopEdge - - Label { - anchors.centerIn: parent - text: "a drawer" - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/window-button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/window-button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/window-button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/window-button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/window-hover.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/window-hover.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/window-hover.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/window-hover.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/window.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/window.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/window.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/window.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/window-wheel.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/window-wheel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/data/window-wheel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/data/window-wheel.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/tst_qquickdrawer.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/tst_qquickdrawer.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickdrawer/tst_qquickdrawer.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickdrawer/tst_qquickdrawer.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -38,7 +38,6 @@ #include #include "../shared/util.h" #include "../shared/visualtestutil.h" -#include "../shared/qtest_quickcontrols.h" #include #include @@ -62,9 +61,6 @@ private slots: void initTestCase(); - void defaults(); - void invalidEdge(); - void visible_data(); void visible(); @@ -106,11 +102,6 @@ void nonModal_data(); void nonModal(); - void slider_data(); - void slider(); - - void topEdgeScreenEdge(); - private: struct TouchDeviceDeleter { @@ -135,40 +126,6 @@ QWindowSystemInterface::registerTouchDevice(touchDevice.data()); } -void tst_QQuickDrawer::defaults() -{ - QQmlEngine engine; - QQmlComponent component(&engine); - component.loadUrl(testFileUrl("window.qml")); - - QScopedPointer root(component.create()); - QVERIFY2(!root.isNull(), qPrintable(component.errorString())); - - QQuickDrawer *drawer = root->property("drawer").value(); - QVERIFY(drawer); - QCOMPARE(drawer->edge(), Qt::LeftEdge); - QCOMPARE(drawer->position(), 0.0); - QCOMPARE(drawer->dragMargin(), qGuiApp->styleHints()->startDragDistance()); -} - -void tst_QQuickDrawer::invalidEdge() -{ - QQmlEngine engine; - QQmlComponent component(&engine); - component.loadUrl(testFileUrl("window.qml")); - - QScopedPointer root(component.create()); - QVERIFY2(!root.isNull(), qPrintable(component.errorString())); - - QQuickDrawer *drawer = root->property("drawer").value(); - QVERIFY(drawer); - - // Test an invalid value - it should warn and ignore it. - QTest::ignoreMessage(QtWarningMsg, qUtf8Printable(testFileUrl("window.qml").toString() + ":61:5: QML Drawer: invalid edge value - valid values are: Qt.TopEdge, Qt.LeftEdge, Qt.RightEdge, Qt.BottomEdge")); - drawer->setEdge(static_cast(QQuickDrawer::Right)); - QCOMPARE(drawer->edge(), Qt::LeftEdge); -} - void tst_QQuickDrawer::visible_data() { QTest::addColumn("source"); @@ -1262,76 +1219,6 @@ QVERIFY(closedSpy.wait()); } -void tst_QQuickDrawer::slider_data() -{ - QTest::addColumn("mouse"); - QTest::addColumn("delta"); - - QTest::newRow("mouse") << true << 2; - QTest::newRow("touch") << false << 2; - QTest::newRow("mouse,delta") << true << 296 / 8; -} - -void tst_QQuickDrawer::slider() -{ - QFETCH(bool, mouse); - QFETCH(int, delta); - - QQuickApplicationHelper helper(this, QStringLiteral("slider.qml")); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickDrawer *drawer = window->property("drawer").value(); - QVERIFY(drawer); - - QQuickSlider *slider = window->property("slider").value(); - QVERIFY(slider); - - QCOMPARE(slider->value(), 1.0); - QCOMPARE(drawer->position(), 1.0); - - const qreal y = slider->height() / 2; - const QPoint from(slider->width() - 1, y); - const QPoint to(1, y); - - if (mouse) - QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, from); - else - QTest::touchEvent(window, touchDevice.data()).press(0, from); - - int distance = qAbs(from.x() - to.x()); - for (int dx = delta; dx <= distance; dx += delta) { - if (mouse) - QTest::mouseMove(window, from - QPoint(dx, 0)); - else - QTest::touchEvent(window, touchDevice.data()).move(0, from - QPoint(dx, 0)); - QTest::qWait(1); // avoid infinite velocity - } - - QCOMPARE(slider->value(), 0.0); - QCOMPARE(drawer->position(), 1.0); - - if (mouse) - QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, to); - else - QTest::touchEvent(window, touchDevice.data()).release(0, to); -} - -void tst_QQuickDrawer::topEdgeScreenEdge() -{ - QQuickApplicationHelper helper(this, QStringLiteral("topEdgeScreenEdge.qml")); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickDrawer *drawer = window->property("drawer").value(); - QVERIFY(drawer); - - QVERIFY(QMetaObject::invokeMethod(drawer, "open")); - QTRY_COMPARE(drawer->position(), 1.0); -} - -QTEST_QUICKCONTROLS_MAIN(tst_QQuickDrawer) +QTEST_MAIN(tst_QQuickDrawer) #include "tst_qquickdrawer.moc" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/alignment.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/alignment.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/alignment.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/alignment.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -Row { - width: 200 - height: 200 - - IconImage { - name: "appointment-new" - sourceSize: Qt.size(22, 22) - } - Image { - source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/color.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/color.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/color.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/color.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -Row { - width: 200 - height: 200 - - IconImage { - source: "qrc:/icons/testtheme/22x22/actions/color-test-original.png" - sourceSize: Qt.size(22, 22) - color: "red" - } - Image { - source: "qrc:/icons/testtheme/22x22/actions/color-test-tinted.png" - fillMode: Image.Pad - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/fileSelectors.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/fileSelectors.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/fileSelectors.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/fileSelectors.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -Row { - width: 200 - height: 200 - - IconImage { - name: "appointment-new" - sourceSize: Qt.size(22, 22) - } - Image { - source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/imageProvider.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/imageProvider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/imageProvider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/imageProvider.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T - -IconLabel { - icon.color: "transparent" - icon.source: "image://provider/red" -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -IconImage { - name: "appointment-new" -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -Row { - width: 200 - height: 200 - - IconImage { - name: "appointment-new" - sourceSize: Qt.size(22, 22) - } - Image { - source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -IconImage { - name: "appointment-new" - sourceSize: Qt.size(22, 22) - width: 16 - height: 16 -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/root.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/root.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/root.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/root.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -import QtQuick 2.12 - -Item { - width: 200 - height: 200 -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -Row { - width: 200 - height: 200 - - IconImage { - source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" - } - Image { - source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -Row { - width: 200 - height: 200 - - IconImage { - source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" - sourceSize: Qt.size(22, 22) - } - Image { - source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -IconImage { - source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" - sourceSize: Qt.size(22, 22) - width: 16 - height: 16 -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -IconImage { - source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" - sourceSize: Qt.size(32, 32) -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/svgNoSizes.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/svgNoSizes.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/svgNoSizes.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/svgNoSizes.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -Row { - width: 200 - height: 200 - - IconImage { - source: "qrc:/icons/testtheme/appointment-new.svg" - } - Image { - source: "qrc:/icons/testtheme/appointment-new.svg" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -Row { - width: 200 - height: 200 - - IconImage { - source: "qrc:/data/icons/testtheme/appointment-new.svg" - sourceSize: Qt.size(22, 22) - } - Image { - source: "qrc:/data/icons/testtheme/appointment-new.svg" - sourceSize: Qt.size(22, 22) - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/translucentColors.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/translucentColors.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/data/translucentColors.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/data/translucentColors.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -ApplicationWindow { - width: 500 - height: 500 - visible: true - - IconImage { - width: Math.min(250, parent.width) - height: Math.min(250, parent.height) - source: "qrc:/icons/testtheme/22x22/actions/color-test-original.png" - sourceSize: Qt.size(250, 0) - color: Qt.rgba(0, 0, 0, 0.5) - } -} Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/appointment-new.svg qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/appointment-new.svg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/appointment-new.svg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/appointment-new.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,425 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - New Appointment - - - appointment - new - meeting - rvsp - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/index.theme qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/index.theme --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/icons/testtheme/index.theme 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/icons/testtheme/index.theme 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -[Icon Theme] -Name=Test -Comment=Test Theme - -Directories=16x16/actions,22x22/actions,22x22@2/actions - -[16x16/actions] -Size=16 -Context=Actions -Type=Fixed - -[22x22/actions] -Size=22 -Context=Actions -Type=Fixed - -[22x22@2/actions] -Size=22 -Context=Actions -Scale=2 -Type=Fixed diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/qquickiconimage.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/qquickiconimage.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/qquickiconimage.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/qquickiconimage.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -CONFIG += testcase -macos:CONFIG -= app_bundle -TARGET = tst_qquickiconimage - -QT += core gui qml quick testlib -QT_PRIVATE += quick-private quickcontrols2-private -qtHaveModule(svg): QT += svg - -include (../shared/util.pri) - -SOURCES += tst_qquickiconimage.cpp - -RESOURCES += resources.qrc - -TESTDATA += \ - $$PWD/data/*.qml \ - $$PWD/data/icons/* diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/resources.qrc qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/resources.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/resources.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/resources.qrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - - - icons/testtheme/16x16/actions/appointment-new.png - icons/testtheme/22x22/actions/appointment-new.png - icons/testtheme/22x22/actions/appointment-new@2x.png - icons/testtheme/22x22@2/actions/appointment-new.png - icons/testtheme/22x22/actions/+testselector/appointment-new.png - icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png - icons/testtheme/22x22@2/actions/+testselector/appointment-new.png - icons/testtheme/index.theme - icons/testtheme/appointment-new.svg - icons/testtheme/22x22/actions/color-test-original.png - icons/testtheme/22x22/actions/color-test-tinted.png - icons/testtheme/22x22/actions/color-test-original@2x.png - icons/testtheme/22x22/actions/color-test-tinted@2x.png - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/tst_qquickiconimage.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/tst_qquickiconimage.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconimage/tst_qquickiconimage.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconimage/tst_qquickiconimage.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,572 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "../shared/util.h" -#include "../shared/visualtestutil.h" - -using namespace QQuickVisualTestUtil; - -class tst_qquickiconimage : public QQmlDataTest -{ - Q_OBJECT -public: - tst_qquickiconimage(); - -private slots: - void initTestCase(); - void defaults(); - void nameBindingSourceSize(); - void nameBindingSourceSizeWidthHeight(); - void nameBindingNoSizes(); - void sourceBindingNoSizes(); - void sourceBindingSourceSize(); - void sourceBindingSourceSizeWidthHeight(); - void sourceBindingSourceTooLarge(); - void changeSourceSize(); - void alignment_data(); - void alignment(); - void svgNoSizes(); - void svgSourceBindingSourceSize(); - void color(); - void fileSelectors(); - void imageProvider(); - void translucentColors(); - -private: - void setTheme(); - - qreal dpr; - int integerDpr; -}; - -static QImage grabItemToImage(QQuickItem *item) -{ - QSharedPointer result = item->grabToImage(); - QSignalSpy spy(result.data(), SIGNAL(ready())); - spy.wait(); - return result->image(); -} - -#define SKIP_IF_DPR_TOO_HIGH() \ - if (dpr > 2) \ - QSKIP("Test does not support device pixel ratio greater than 2") - -tst_qquickiconimage::tst_qquickiconimage() : - dpr(qGuiApp->devicePixelRatio()), - integerDpr(qCeil(dpr)) -{ -} - -void tst_qquickiconimage::initTestCase() -{ - QQmlDataTest::initTestCase(); - QIcon::setThemeName(QStringLiteral("testtheme")); -} - -void tst_qquickiconimage::defaults() -{ - QQuickIconImage iconImage; - QCOMPARE(iconImage.fillMode(), QQuickImage::Pad); - QCOMPARE(iconImage.name(), QString()); - QCOMPARE(iconImage.source(), QUrl()); - QCOMPARE(iconImage.color(), QColor(Qt::transparent)); -} - -void tst_qquickiconimage::nameBindingSourceSize() -{ - // We can't have images for every DPR. - SKIP_IF_DPR_TOO_HIGH(); - - QQuickView view(testFileUrl("nameBindingSourceSize.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()->childItems().at(0)); - QVERIFY(iconImage); - - QQuickItem *image = view.rootObject()->childItems().at(1); - QVERIFY(image); - - QCOMPARE(grabItemToImage(iconImage), grabItemToImage(image)); - QCOMPARE(iconImage->sourceSize().width(), 22); - QCOMPARE(iconImage->sourceSize().height(), 22); - QCOMPARE(iconImage->implicitWidth(), 22.0); - QCOMPARE(iconImage->implicitHeight(), 22.0); - QCOMPARE(iconImage->width(), 22.0); - QCOMPARE(iconImage->height(), 22.0); - - // The requested width of 16 is less than the pixmap's size on disk which - // is 22x22. Our default fillMode, Pad, would result in the image being clipped, - // so instead we change the fillMode to PreserveAspectFit. Doing so causes - // QQuickImage::updatePaintedGeometry() to set our implicit size to 22x16 to - // ensure that the aspect ratio is respected. Since we have no explicit height, - // the height (previously 22) becomes the implicit height (16). - iconImage->setWidth(16.0); - QCOMPARE(iconImage->fillMode(), QQuickImage::PreserveAspectFit); - QCOMPARE(iconImage->sourceSize().width(), 22); - QCOMPARE(iconImage->sourceSize().height(), 22); - QCOMPARE(iconImage->implicitWidth(), 22.0); - QCOMPARE(iconImage->implicitHeight(), 16.0); - QCOMPARE(iconImage->width(), 16.0); - QCOMPARE(iconImage->height(), 16.0); -} - -void tst_qquickiconimage::nameBindingSourceSizeWidthHeight() -{ - SKIP_IF_DPR_TOO_HIGH(); - - QQuickView view(testFileUrl("nameBindingSourceSizeWidthHeight.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()); - QVERIFY(iconImage); - QCOMPARE(iconImage->sourceSize().width(), 22); - QCOMPARE(iconImage->sourceSize().height(), 22); - QCOMPARE(iconImage->implicitWidth(), 22.0); - QCOMPARE(iconImage->implicitHeight(), 22.0); - QCOMPARE(iconImage->width(), 16.0); - QCOMPARE(iconImage->height(), 16.0); -} - -void tst_qquickiconimage::nameBindingNoSizes() -{ - SKIP_IF_DPR_TOO_HIGH(); - - QQuickView view(testFileUrl("nameBindingNoSizes.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()); - QVERIFY(iconImage); - // The smallest available size will be chosen. - QCOMPARE(iconImage->sourceSize().width(), 16); - QCOMPARE(iconImage->sourceSize().height(), 16); - QCOMPARE(iconImage->implicitWidth(), 16.0); - QCOMPARE(iconImage->implicitHeight(), 16.0); - QCOMPARE(iconImage->width(), 16.0); - QCOMPARE(iconImage->height(), 16.0); -} - -void tst_qquickiconimage::sourceBindingNoSizes() -{ - SKIP_IF_DPR_TOO_HIGH(); - - QQuickView view(testFileUrl("sourceBindingNoSizes.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()->childItems().at(0)); - QVERIFY(iconImage); - - QQuickItem *image = view.rootObject()->childItems().at(1); - QVERIFY(image); - - QCOMPARE(iconImage->sourceSize().width(), 22 * integerDpr); - QCOMPARE(iconImage->sourceSize().height(), 22 * integerDpr); - QCOMPARE(iconImage->implicitWidth(), 22.0); - QCOMPARE(iconImage->implicitHeight(), 22.0); - QCOMPARE(iconImage->width(), 22.0); - QCOMPARE(iconImage->height(), 22.0); - QCOMPARE(grabItemToImage(iconImage), grabItemToImage(image)); -} - -void tst_qquickiconimage::sourceBindingSourceSize() -{ - SKIP_IF_DPR_TOO_HIGH(); - - QQuickView view(testFileUrl("sourceBindingSourceSize.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()->childItems().at(0)); - QVERIFY(iconImage); - - QQuickItem *image = view.rootObject()->childItems().at(1); - QVERIFY(image); - - QCOMPARE(iconImage->sourceSize().width(), 22); - QCOMPARE(iconImage->sourceSize().height(), 22); - QCOMPARE(iconImage->implicitWidth(), 22.0); - QCOMPARE(iconImage->implicitHeight(), 22.0); - QCOMPARE(iconImage->width(), 22.0); - QCOMPARE(iconImage->height(), 22.0); - QCOMPARE(grabItemToImage(iconImage), grabItemToImage(image)); - - // Changing width and height should not affect sourceSize. - iconImage->setWidth(50); - QCOMPARE(iconImage->sourceSize().width(), 22); - QCOMPARE(iconImage->sourceSize().height(), 22); - iconImage->setHeight(50); - QCOMPARE(iconImage->sourceSize().width(), 22); - QCOMPARE(iconImage->sourceSize().height(), 22); -} - -void tst_qquickiconimage::sourceBindingSourceSizeWidthHeight() -{ - SKIP_IF_DPR_TOO_HIGH(); - - QQuickView view(testFileUrl("sourceBindingSourceSizeWidthHeight.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()); - QVERIFY(iconImage); - QCOMPARE(iconImage->sourceSize().width(), 22); - QCOMPARE(iconImage->sourceSize().height(), 22); - QCOMPARE(iconImage->implicitWidth(), 22.0); - QCOMPARE(iconImage->implicitHeight(), 22.0); - QCOMPARE(iconImage->width(), 16.0); - QCOMPARE(iconImage->height(), 16.0); -} - -void tst_qquickiconimage::sourceBindingSourceTooLarge() -{ - SKIP_IF_DPR_TOO_HIGH(); - - QQuickView view(testFileUrl("sourceBindingSourceTooLarge.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()); - QVERIFY(iconImage); - QCOMPARE(iconImage->sourceSize().width(), 32); - QCOMPARE(iconImage->sourceSize().height(), 32); - QCOMPARE(iconImage->implicitWidth(), 22.0); - QCOMPARE(iconImage->implicitHeight(), 22.0); - QCOMPARE(iconImage->width(), 22.0); - QCOMPARE(iconImage->height(), 22.0); -} - -void tst_qquickiconimage::alignment_data() -{ - QTest::addColumn("horizontalAlignment"); - QTest::addColumn("verticalAlignment"); - - QTest::newRow("AlignLeft,AlignTop") << QQuickImage::AlignLeft << QQuickImage::AlignTop; - QTest::newRow("AlignLeft,AlignVCenter") << QQuickImage::AlignLeft << QQuickImage::AlignVCenter; - QTest::newRow("AlignLeft,AlignBottom") << QQuickImage::AlignLeft << QQuickImage::AlignBottom; - QTest::newRow("AlignHCenter,AlignTop") << QQuickImage::AlignHCenter << QQuickImage::AlignTop; - QTest::newRow("AlignHCenter,AlignVCenter") << QQuickImage::AlignHCenter << QQuickImage::AlignVCenter; - QTest::newRow("AlignHCenter,AlignBottom") << QQuickImage::AlignHCenter << QQuickImage::AlignBottom; - QTest::newRow("AlignRight,AlignTop") << QQuickImage::AlignRight << QQuickImage::AlignTop; - QTest::newRow("AlignRight,AlignVCenter") << QQuickImage::AlignRight << QQuickImage::AlignVCenter; - QTest::newRow("AlignRight,AlignBottom") << QQuickImage::AlignRight << QQuickImage::AlignBottom; -} - -void tst_qquickiconimage::alignment() -{ - SKIP_IF_DPR_TOO_HIGH(); - - QFETCH(QQuickImage::HAlignment, horizontalAlignment); - QFETCH(QQuickImage::VAlignment, verticalAlignment); - - QQuickView view(testFileUrl("alignment.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()->childItems().at(0)); - QVERIFY(iconImage); - - QQuickImage *image = qobject_cast(view.rootObject()->childItems().at(1)); - QVERIFY(image); - - // The default fillMode for IconImage is Image::Pad, so these two grabs - // should only be equal when the device pixel ratio is 1 or 2, as there is no - // @3x version of the image, and hence the Image will be upscaled - // and therefore blurry when the ratio is higher than 2. - if (qGuiApp->devicePixelRatio() <= 2) - QCOMPARE(grabItemToImage(iconImage), grabItemToImage(image)); - else - QVERIFY(grabItemToImage(iconImage) != grabItemToImage(image)); - - // Check that the images are what we expect in different alignment configurations. - iconImage->setWidth(200); - iconImage->setHeight(100); - iconImage->setHorizontalAlignment(horizontalAlignment); - iconImage->setVerticalAlignment(verticalAlignment); - iconImage->setFillMode(QQuickImage::Pad); - image->setWidth(200); - image->setHeight(100); - image->setHorizontalAlignment(horizontalAlignment); - image->setVerticalAlignment(verticalAlignment); - image->setFillMode(QQuickImage::Pad); - - if (qGuiApp->devicePixelRatio() <= 2) - QCOMPARE(grabItemToImage(iconImage), grabItemToImage(image)); - else - QVERIFY(grabItemToImage(iconImage) != grabItemToImage(image)); -} - -void tst_qquickiconimage::svgNoSizes() -{ -#ifndef QT_SVG_LIB - QSKIP("This test requires qtsvg"); -#else - QQuickView view(testFileUrl("svgNoSizes.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()->childItems().at(0)); - QVERIFY(iconImage); - - QQuickImage *image = qobject_cast(view.rootObject()->childItems().at(1)); - QVERIFY(image); - - QCOMPARE(iconImage->sourceSize().width(), 48); - QCOMPARE(iconImage->sourceSize().height(), 48); - QCOMPARE(iconImage->implicitWidth(), 48.0); - QCOMPARE(iconImage->implicitHeight(), 48.0); - QCOMPARE(iconImage->width(), 48.0); - QCOMPARE(iconImage->height(), 48.0); - QCOMPARE(grabItemToImage(iconImage), grabItemToImage(image)); -#endif -} - -void tst_qquickiconimage::svgSourceBindingSourceSize() -{ -#ifndef QT_SVG_LIB - QSKIP("This test requires qtsvg"); -#else - QQuickView view(testFileUrl("alignment.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()->childItems().at(0)); - QVERIFY(iconImage); - - QQuickImage *image = qobject_cast(view.rootObject()->childItems().at(1)); - QVERIFY(image); - - QCOMPARE(iconImage->sourceSize().width(), 22); - QCOMPARE(iconImage->sourceSize().height(), 22); - QCOMPARE(iconImage->implicitWidth(), 22.0); - QCOMPARE(iconImage->implicitHeight(), 22.0); - QCOMPARE(iconImage->width(), 22.0); - QCOMPARE(iconImage->height(), 22.0); - QCOMPARE(grabItemToImage(iconImage), grabItemToImage(image)); -#endif -} - -void tst_qquickiconimage::color() -{ - SKIP_IF_DPR_TOO_HIGH(); - - if (QGuiApplication::platformName() == QLatin1String("offscreen")) - QSKIP("grabToImage() doesn't work on the \"offscreen\" platform plugin (QTBUG-63185)"); - - QQuickView view(testFileUrl("color.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()->childItems().at(0)); - QVERIFY(iconImage); - - QQuickImage *image = qobject_cast(view.rootObject()->childItems().at(1)); - QVERIFY(image); - - QImage iconImageWindowGrab = grabItemToImage(iconImage); - QCOMPARE(iconImageWindowGrab, grabItemToImage(image)); - - // Transparent pixels should remain transparent. - QCOMPARE(iconImageWindowGrab.pixelColor(0, 0), QColor(0, 0, 0, 0)); - - // Set a color after component completion. - iconImage->setColor(QColor(Qt::green)); - iconImageWindowGrab = grabItemToImage(iconImage); - const QPoint centerPixelPos(11, 11); - QCOMPARE(iconImageWindowGrab.pixelColor(centerPixelPos), QColor(Qt::green)); - - // Set a semi-transparent color after component completion. - iconImage->setColor(QColor(0, 0, 255, 127)); - iconImageWindowGrab = grabItemToImage(iconImage); - QCOMPARE(iconImageWindowGrab.pixelColor(centerPixelPos).red(), 0); - QCOMPARE(iconImageWindowGrab.pixelColor(centerPixelPos).green(), 0); - QCOMPARE(iconImageWindowGrab.pixelColor(centerPixelPos).blue(), 255); - QCOMPARE(iconImageWindowGrab.pixelColor(centerPixelPos).alpha(), 127); -} - -void tst_qquickiconimage::changeSourceSize() -{ - QQuickView view(testFileUrl("sourceBindingSourceSize.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()->childItems().at(0)); - QVERIFY(iconImage); - - // Ensure that there isn't any infinite recursion when trying to change the sourceSize. - QSize sourceSize = iconImage->sourceSize(); - sourceSize.setWidth(sourceSize.width() - 1); - iconImage->setSourceSize(sourceSize); -} - - -void tst_qquickiconimage::fileSelectors() -{ - SKIP_IF_DPR_TOO_HIGH(); - - if (QGuiApplication::platformName() == QLatin1String("offscreen")) - QSKIP("grabToImage() doesn't work on the \"offscreen\" platform plugin (QTBUG-63185)"); - - QQuickView view; - QQmlFileSelector* fileSelector = new QQmlFileSelector(view.engine()); - fileSelector->setExtraSelectors(QStringList() << "testselector"); - view.setSource(testFileUrl("fileSelectors.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()->childItems().at(0)); - QVERIFY(iconImage); - - QQuickItem *image = view.rootObject()->childItems().at(1); - QVERIFY(image); - - QImage iconImageWindowGrab = grabItemToImage(iconImage); - QCOMPARE(iconImageWindowGrab, grabItemToImage(image)); - - QCOMPARE(iconImageWindowGrab.pixelColor(iconImageWindowGrab.width() / 2, iconImageWindowGrab.height() / 2), QColor(Qt::blue)); -} - -class TestImageProvider : public QQuickImageProvider -{ -public: - TestImageProvider() : QQuickImageProvider(QQuickImageProvider::Pixmap) { } - - QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) - { - QSize defaultSize(32, 32); - if (size) - *size = defaultSize; - - QPixmap pixmap(requestedSize.width() > 0 ? requestedSize.width() : defaultSize.width(), - requestedSize.height() > 0 ? requestedSize.height() : defaultSize.height()); - pixmap.fill(QColor(id).rgba()); - return pixmap; - } -}; - -// don't crash (QTBUG-63959) -void tst_qquickiconimage::imageProvider() -{ - if (QGuiApplication::platformName() == QLatin1String("offscreen")) - QSKIP("grabToImage() doesn't work on the \"offscreen\" platform plugin (QTBUG-63185)"); - - QQuickView view; - view.engine()->addImageProvider("provider", new TestImageProvider); - view.setSource(testFileUrl("imageProvider.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickIconImage *iconImage = qobject_cast(view.rootObject()->findChild()); - QVERIFY(iconImage); - - QImage image = grabItemToImage(iconImage); - QVERIFY(!image.isNull()); - QCOMPARE(image.pixelColor(image.width() / 2, image.height() / 2), QColor(Qt::red)); -} - -/* - QQuickIconImage::componentComplete() calls QQuickIconImagePrivate::updateIcon(), - which loads the icon's image via QQuickImageBase::load(). That eventually calls - QQuickImageBase::requestFinished(), which calls QQuickIconImage::pixmapChange(). - That then calls QQuickIconImagePrivate::updateFillMode(), which can in turn - cause QQuickIconImage::pixmapChange() to be called again, causing recursion. - - This was a problem because it resulted in icon.color being applied twice. - - This test checks that that doesn't happen. -*/ -void tst_qquickiconimage::translucentColors() -{ - if (QGuiApplication::platformName() == QLatin1String("offscreen")) - QSKIP("grabToImage() doesn't work on the \"offscreen\" platform plugin (QTBUG-63185)"); - - // Doesn't reproduce with QQuickView. - QQmlApplicationEngine engine; - engine.load(testFileUrl("translucentColors.qml")); - QQuickWindow *window = qobject_cast(engine.rootObjects().first()); - - QQuickIconImage *iconImage = qobject_cast(window->findChild()); - QVERIFY(iconImage); - - const QImage image = grabItemToImage(iconImage); - QVERIFY(!image.isNull()); - QCOMPARE(image.pixelColor(image.width() / 2, image.height() / 2), QColor::fromRgba(0x80000000)); -} - -int main(int argc, char *argv[]) -{ - QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - QGuiApplication app(argc, argv); - Q_UNUSED(app); - tst_qquickiconimage test; - QTEST_SET_MAIN_SOURCE_PATH - return QTest::qExec(&test, argc, argv); -} - -#include "tst_qquickiconimage.moc" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/data/colorChanges.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/data/colorChanges.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/data/colorChanges.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/data/colorChanges.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -AbstractButton { - id: button - width: 200 - height: 200 - icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" - icon.color: enabled ? "transparent" : "red" - - IconLabel { - icon: button.icon - text: button.text - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/data/iconlabel.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/data/iconlabel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/data/iconlabel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/data/iconlabel.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -AbstractButton { - id: button - width: 200 - height: 200 - text: "Some text" - icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" - - IconLabel { - icon: button.icon - text: button.text - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -AbstractButton { - id: button - width: 200 - height: 200 - icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" - - IconLabel { - spacing: 10 - mirrored: true - icon: button.icon - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 - -Item { - width: 200 - height: 200 - - IconLabel { - spacing: 10 - text: "Some text" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/qquickiconlabel.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/qquickiconlabel.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/qquickiconlabel.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/qquickiconlabel.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -CONFIG += testcase -macos:CONFIG -= app_bundle -TARGET = tst_qquickiconlabel - -QT += core gui qml quick testlib -QT_PRIVATE += quick-private quickcontrols2-private - -include (../shared/util.pri) - -SOURCES += tst_qquickiconlabel.cpp - -TESTDATA += \ - $$PWD/data/*.qml diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,334 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "../shared/util.h" -#include "../shared/visualtestutil.h" - -using namespace QQuickVisualTestUtil; - -class tst_qquickiconlabel : public QQmlDataTest -{ - Q_OBJECT -public: - tst_qquickiconlabel(); - -private slots: - void display_data(); - void display(); - void spacingWithOneDelegate_data(); - void spacingWithOneDelegate(); - void emptyIconSource(); - void colorChanges(); -}; - -tst_qquickiconlabel::tst_qquickiconlabel() -{ -} - -void tst_qquickiconlabel::display_data() -{ - QTest::addColumn >("displayTypes"); - QTest::addColumn("mirrored"); - QTest::addColumn("labelWidth"); - QTest::addColumn("labelHeight"); - QTest::addColumn("spacing"); - - typedef QVector DisplayVector; - QQuickIconLabel::Display IconOnly = QQuickIconLabel::IconOnly; - QQuickIconLabel::Display TextOnly = QQuickIconLabel::TextOnly; - QQuickIconLabel::Display TextUnderIcon = QQuickIconLabel::TextUnderIcon; - QQuickIconLabel::Display TextBesideIcon = QQuickIconLabel::TextBesideIcon; - - QTest::addRow("IconOnly") << (DisplayVector() << IconOnly) << false << -1.0 << -1.0 << 0.0; - QTest::addRow("TextOnly") << (DisplayVector() << TextOnly) << false << -1.0 << -1.0 << 0.0; - QTest::addRow("TextUnderIcon") << (DisplayVector() << TextUnderIcon) << false << -1.0 << -1.0 << 10.0; - QTest::addRow("TextBesideIcon") << (DisplayVector() << TextBesideIcon) << false << -1.0 << -1.0 << 10.0; - QTest::addRow("IconOnly, spacing=10") << (DisplayVector() << IconOnly) << false << -1.0 << -1.0 << 10.0; - QTest::addRow("TextOnly, spacing=10") << (DisplayVector() << TextOnly) << false << -1.0 << -1.0 << 10.0; - QTest::addRow("TextUnderIcon, spacing=10") << (DisplayVector() << TextUnderIcon) << false << -1.0 << -1.0 << 0.0; - QTest::addRow("TextUnderIcon => IconOnly => TextUnderIcon") - << (DisplayVector() << TextUnderIcon << IconOnly << TextUnderIcon) << false << -1.0 << -1.0 << 0.0; - QTest::addRow("TextUnderIcon => IconOnly => TextUnderIcon, labelWidth=400") - << (DisplayVector() << TextUnderIcon << IconOnly << TextUnderIcon) << false << 400.0 << -1.0 << 0.0; - QTest::addRow("TextUnderIcon => TextOnly => TextUnderIcon") - << (DisplayVector() << TextUnderIcon << TextOnly << TextUnderIcon) << false << -1.0 << -1.0 << 0.0; - QTest::addRow("TextUnderIcon => TextOnly => TextUnderIcon, labelWidth=400") - << (DisplayVector() << TextUnderIcon << TextOnly << TextUnderIcon) << false << 400.0 << -1.0 << 0.0; - QTest::addRow("TextBesideIcon, spacing=10") << (DisplayVector() << TextBesideIcon) << false << -1.0 << -1.0 << 0.0; - QTest::addRow("TextBesideIcon => IconOnly => TextBesideIcon") - << (DisplayVector() << TextBesideIcon << IconOnly << TextBesideIcon) << false << -1.0 << -1.0 << 0.0; - QTest::addRow("TextBesideIcon => IconOnly => TextBesideIcon, labelWidth=400") - << (DisplayVector() << TextBesideIcon << IconOnly << TextBesideIcon) << false << 400.0 << -1.0 << 0.0; - QTest::addRow("TextBesideIcon => TextOnly => TextBesideIcon") - << (DisplayVector() << TextBesideIcon << TextOnly << TextBesideIcon) << false << -1.0 << -1.0 << 0.0; - QTest::addRow("TextBesideIcon => TextOnly => TextBesideIcon, labelWidth=400") - << (DisplayVector() << TextBesideIcon << TextOnly << TextBesideIcon) << false << 400.0 << -1.0 << 0.0; - QTest::addRow("IconOnly, mirrored") << (DisplayVector() << IconOnly) << true << -1.0 << -1.0 << 0.0; - QTest::addRow("TextOnly, mirrored") << (DisplayVector() << TextOnly) << true << -1.0 << -1.0 << 0.0; - QTest::addRow("TextUnderIcon, mirrored") << (DisplayVector() << TextUnderIcon) << true << -1.0 << -1.0 << 0.0; - QTest::addRow("TextBesideIcon, mirrored") << (DisplayVector() << TextBesideIcon) << true << -1.0 << -1.0 << 0.0; -} - -void tst_qquickiconlabel::display() -{ - QFETCH(QVector, displayTypes); - QFETCH(bool, mirrored); - QFETCH(qreal, labelWidth); - QFETCH(qreal, labelHeight); - QFETCH(qreal, spacing); - - QQuickView view(testFileUrl("iconlabel.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); - - QQuickItem *rootItem = view.rootObject(); - QVERIFY(rootItem); - - QQuickIconLabel *label = rootItem->findChild(); - QVERIFY(label); - QCOMPARE(label->spacing(), 0.0); - QCOMPARE(label->display(), QQuickIconLabel::TextBesideIcon); - QCOMPARE(label->isMirrored(), false); - - // Setting labelWidth allows us to test the issue where the icon's - // width was not updated after switching between different display types. - if (!qFuzzyCompare(labelWidth, -1)) { - label->setWidth(labelWidth); - QCOMPARE(label->width(), labelWidth); - } - if (!qFuzzyCompare(labelHeight, -1)) { - label->setHeight(labelHeight); - QCOMPARE(label->height(), labelHeight); - } - - label->setMirrored(mirrored); - QCOMPARE(label->isMirrored(), mirrored); - - label->setSpacing(spacing); - QCOMPARE(label->spacing(), spacing); - - const qreal horizontalPadding = label->leftPadding() + label->rightPadding(); - const qreal verticalPadding = label->topPadding() + label->bottomPadding(); - - // Test that the icon and text are correctly positioned and sized after - // setting several different display types in succession. - for (QQuickIconLabel::Display displayType : qAsConst(displayTypes)) { - label->setDisplay(displayType); - QCOMPARE(label->display(), displayType); - - QQuickIconImage *icon = label->findChild(); - QQuickText *text = label->findChild(); - - const qreal horizontalCenter = label->width() / 2; - const qreal verticalCenter = label->height() / 2; - - switch (displayType) { - case QQuickIconLabel::IconOnly: - QVERIFY(icon); - QVERIFY(!text); - QCOMPARE(icon->x(), horizontalCenter - icon->width() / 2); - QCOMPARE(icon->y(), verticalCenter - icon->height() / 2); - QCOMPARE(icon->width(), icon->implicitWidth()); - QCOMPARE(icon->height(), icon->implicitHeight()); - QCOMPARE(label->implicitWidth(), icon->implicitWidth() + horizontalPadding); - QCOMPARE(label->implicitHeight(), icon->implicitHeight() + verticalPadding); - break; - case QQuickIconLabel::TextOnly: - QVERIFY(!icon); - QVERIFY(text); - QCOMPARE(text->x(), horizontalCenter - text->width() / 2); - QCOMPARE(text->y(), verticalCenter - text->height() / 2); - QCOMPARE(text->width(), text->implicitWidth()); - QCOMPARE(text->height(), text->implicitHeight()); - QCOMPARE(label->implicitWidth(), text->implicitWidth() + horizontalPadding); - QCOMPARE(label->implicitHeight(), text->implicitHeight() + verticalPadding); - break; - case QQuickIconLabel::TextUnderIcon: { - QVERIFY(icon); - QVERIFY(text); - const qreal combinedHeight = icon->height() + label->spacing() + text->height(); - const qreal contentY = verticalCenter - combinedHeight / 2; - QCOMPARE(icon->x(), horizontalCenter - icon->width() / 2); - QCOMPARE(icon->y(), contentY); - QCOMPARE(icon->width(), icon->implicitWidth()); - QCOMPARE(icon->height(), icon->implicitHeight()); - QCOMPARE(text->x(), horizontalCenter - text->width() / 2); - QCOMPARE(text->y(), contentY + icon->height() + label->spacing()); - QCOMPARE(text->width(), text->implicitWidth()); - QCOMPARE(text->height(), text->implicitHeight()); - QCOMPARE(label->implicitWidth(), qMax(icon->implicitWidth(), text->implicitWidth()) + horizontalPadding); - QCOMPARE(label->implicitHeight(), combinedHeight + verticalPadding); - break; - } - case QQuickIconLabel::TextBesideIcon: - default: - QVERIFY(icon); - QVERIFY(text); - const qreal combinedWidth = icon->width() + label->spacing() + text->width(); - const qreal contentX = horizontalCenter - combinedWidth / 2; - QCOMPARE(icon->x(), contentX + (label->isMirrored() ? text->width() + label->spacing() : 0)); - QCOMPARE(icon->y(), verticalCenter - icon->height() / 2); - QCOMPARE(icon->width(), icon->implicitWidth()); - QCOMPARE(icon->height(), icon->implicitHeight()); - QCOMPARE(text->x(), contentX + (label->isMirrored() ? 0 : icon->width() + label->spacing())); - QCOMPARE(text->y(), verticalCenter - text->height() / 2); - QCOMPARE(text->width(), text->implicitWidth()); - QCOMPARE(text->height(), text->implicitHeight()); - QCOMPARE(label->implicitWidth(), combinedWidth + horizontalPadding); - QCOMPARE(label->implicitHeight(), qMax(icon->implicitHeight(), text->implicitHeight()) + verticalPadding); - break; - } - - if (text) - QCOMPARE(label->baselineOffset(), text->y() + text->baselineOffset()); - else - QCOMPARE(label->baselineOffset(), 0); - } -} - -void tst_qquickiconlabel::spacingWithOneDelegate_data() -{ - QTest::addColumn("qmlFileName"); - - QTest::addRow("spacingWithOnlyIcon") << QStringLiteral("spacingWithOnlyIcon.qml"); - QTest::addRow("spacingWithOnlyText") << QStringLiteral("spacingWithOnlyText.qml"); -} - -void tst_qquickiconlabel::spacingWithOneDelegate() -{ - QFETCH(QString, qmlFileName); - - QQuickView view(testFileUrl(qmlFileName)); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); - - QQuickItem *rootItem = view.rootObject(); - QVERIFY(rootItem); - - QQuickIconLabel *label = rootItem->findChild(); - QVERIFY(label); - QQuickItem *delegate = nullptr; - if (!label->icon().isEmpty()) { - QVERIFY(!label->findChild()); - delegate = label->findChild(); - } else { - QVERIFY(!label->findChild()); - delegate = label->findChild(); - } - - QVERIFY(delegate); - QCOMPARE(delegate->x(), 0.0); - QCOMPARE(delegate->width(), label->width()); -} - -void tst_qquickiconlabel::emptyIconSource() -{ - QQuickView view(testFileUrl("iconlabel.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); - - QQuickItem *rootItem = view.rootObject(); - QVERIFY(rootItem); - - QQuickIconLabel *label = rootItem->findChild(); - QVERIFY(label); - QCOMPARE(label->spacing(), 0.0); - QCOMPARE(label->display(), QQuickIconLabel::TextBesideIcon); - QCOMPARE(label->isMirrored(), false); - - QQuickItem *icon = label->findChild(); - QVERIFY(icon); - - QQuickItem *text = label->findChild(); - QVERIFY(text); - qreal horizontalCenter = label->width() / 2; - const qreal combinedWidth = icon->width() + text->width(); - const qreal contentX = horizontalCenter - combinedWidth / 2; - // The text should be positioned next to an item. - QCOMPARE(text->x(), contentX + icon->width() + label->spacing()); - - // Now give the label an explicit width large enough so that implicit size - // changes in its children don't affect its implicit size. - label->setWidth(label->implicitWidth() + 200); - label->setHeight(label->implicitWidth() + 100); - QVERIFY(icon->property("source").isValid()); - label->setIcon(QQuickIcon()); - QVERIFY(!label->findChild()); - horizontalCenter = label->width() / 2; - QCOMPARE(text->x(), horizontalCenter - text->width() / 2); -} - -void tst_qquickiconlabel::colorChanges() -{ - if (QGuiApplication::platformName() == QLatin1String("offscreen")) - QSKIP("grabToImage() doesn't work on the \"offscreen\" platform plugin (QTBUG-63185)"); - - QQuickView view(testFileUrl("colorChanges.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - QVERIFY(QTest::qWaitForWindowExposed(&view)); - - QQuickItem *rootItem = view.rootObject(); - QVERIFY(rootItem); - - QQuickIconLabel *label = rootItem->findChild(); - QVERIFY(label); - QCOMPARE(label->spacing(), 0.0); - QCOMPARE(label->display(), QQuickIconLabel::TextBesideIcon); - QCOMPARE(label->isMirrored(), false); - - QSharedPointer grabResult = label->grabToImage(); - QTRY_VERIFY(!grabResult->image().isNull()); - const QImage enabledImageGrab = grabResult->image(); - - // The color should change to "red" when the item is disabled. - rootItem->setEnabled(false); - - grabResult = label->grabToImage(); - QTRY_VERIFY(!grabResult->image().isNull()); - QVERIFY(grabResult->image() != enabledImageGrab); -} - -QTEST_MAIN(tst_qquickiconlabel) - -#include "tst_qquickiconlabel.moc" Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickimaginestyle/control-assets/button-background.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickimaginestyle/control-assets/button-background.9.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickimaginestyle/data/tst_imagine.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickimaginestyle/data/tst_imagine.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickimaginestyle/data/tst_imagine.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickimaginestyle/data/tst_imagine.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtTest 1.1 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 - -TestCase { - id: testCase - width: 200 - height: 200 - visible: true - when: windowShown - name: "Imagine" - - Component { - id: buttonComponent - Button {} - } - - Component { - id: implicitQrcButtonComponent - Button { - Imagine.path: ":/control-assets" - } - } - - Component { - id: explicitQrcButtonComponent - Button { - Imagine.path: "qrc:/control-assets" - } - } - - function test_qrcPaths_data() { - return [ - { tag: ":/control-assets", component: implicitQrcButtonComponent }, - { tag: "qrc:/control-assets", component: explicitQrcButtonComponent } - ] - } - - function test_qrcPaths(data) { - if (Qt.platform.pluginName === "offscreen") - skip("grabImage() is not functional on the offscreen platform (QTBUG-63185)") - - var control = createTemporaryObject(data.component, testCase) - verify(control) - compare(control.Imagine.path, data.tag) - var image = grabImage(control) - compare(image.pixel(control.width / 2, control.height / 2), "#ff0000") - } - - function test_fontFromConfigFile() { - var control = createTemporaryObject(buttonComponent, testCase) - verify(control) - compare(control.font.pixelSize, 80) - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickimaginestyle/qquickimaginestyle.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickimaginestyle/qquickimaginestyle.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickimaginestyle/qquickimaginestyle.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickimaginestyle/qquickimaginestyle.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -TEMPLATE = app -TARGET = tst_qquickimaginestyle -CONFIG += qmltestcase - -SOURCES += \ - $$PWD/tst_qquickimaginestyle.cpp - -RESOURCES += \ - $$PWD/qtquickcontrols2.conf \ - $$PWD/control-assets/button-background.9.png - -OTHER_FILES += \ - $$PWD/data/*.qml - -TESTDATA += \ - $$PWD/data/tst_* diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickimaginestyle/qtquickcontrols2.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickimaginestyle/qtquickcontrols2.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickimaginestyle/qtquickcontrols2.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickimaginestyle/qtquickcontrols2.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -[Controls] -Style=Imagine - -[Imagine] -Font\PixelSize=80 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickimaginestyle/tst_qquickimaginestyle.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickimaginestyle/tst_qquickimaginestyle.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickimaginestyle/tst_qquickimaginestyle.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickimaginestyle/tst_qquickimaginestyle.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -QUICK_TEST_MAIN(tst_qquickmaterialstyle) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyle/data/tst_material.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyle/data/tst_material.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyle/data/tst_material.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyle/data/tst_material.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtQuick.Window 2.2 import QtTest 1.0 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick.Templates 2.1 as T +import QtQuick.Controls 2.1 +import QtQuick.Controls.Material 2.1 TestCase { id: testCase @@ -715,39 +715,4 @@ control.destroy() } - - Component { - id: testResizeBackground - Item { - width: 200 - height: 200 - property alias textArea: textArea - ScrollView { - anchors.fill: parent - ScrollBar.horizontal.policy: ScrollBar.AlwaysOff - TextArea { - id: textArea - wrapMode : TextEdit.WordWrap - readOnly: false - selectByMouse: true - focus: true - text: "test message" - } - } - } - } - - function test_resize_background() { - var control = testCase.createTemporaryObject(testResizeBackground, testCase) - compare(control.textArea.background.height, 1) - compare(control.textArea.background.width, control.width) - control.width = 400 - control.height = 400 - compare(control.textArea.background.height, 1) - compare(control.textArea.background.width, control.width) - control.width = 200 - control.height = 200 - compare(control.textArea.background.height, 1) - compare(control.textArea.background.width, control.width) - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,22 +48,17 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.7 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Material 2.0 ApplicationWindow { width: 400 height: 400 property alias label: label - property alias button: button Label { id: label } - - Button { - id: button - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc 2018-03-21 07:59:29.000000000 +0000 @@ -1,7 +1,5 @@ - - - qtquickcontrols2.conf - variant-dense.conf - variant-normal.conf - + + + qtquickcontrols2.conf + diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/qtquickcontrols2.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/qtquickcontrols2.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/qtquickcontrols2.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/qtquickcontrols2.conf 2018-03-21 07:59:29.000000000 +0000 @@ -4,7 +4,3 @@ [Material] Background=#444444 Foreground=Red -Font\PixelSize=22 - -[Material\Font] -Family=Courier diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -36,7 +36,6 @@ #include #include -#include #include "../shared/util.h" #include "../shared/visualtestutil.h" @@ -50,69 +49,22 @@ private slots: void conf(); - void variants_data(); - void variants(); }; void tst_qquickmaterialstyleconf::conf() { QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); - QFont customFont; - customFont.setFamily("Courier"); - customFont.setPixelSize(22); - QQuickApplicationWindow *window = helper.appWindow; window->show(); QVERIFY(QTest::qWaitForWindowExposed(window)); - // We specified a custom background color and font, so the window should have them. + // We specified a custom background color, so the window should have it. QCOMPARE(window->property("color").value(), QColor("#444444")); - QCOMPARE(window->property("font").value(), customFont); - // We specified a custom foreground color and font, so the label should have them. + // We specified a custom foreground color, so the label should have it. QQuickItem *label = window->property("label").value(); QVERIFY(label); QCOMPARE(label->property("color").value(), QColor("#F44336")); - QCOMPARE(label->property("font").value(), customFont); -} - -void tst_qquickmaterialstyleconf::variants_data() -{ - QTest::addColumn("confPath"); - QTest::addColumn("expectedButtonHeight"); - // Just to ensure that the correct conf is loaded. - QTest::addColumn("expectedColor"); - - // (36 button height + 12 touchable area) - QTest::newRow("normal") << QByteArray(":/variant-normal.conf") << 48 << QColor::fromRgb(0x123456); - // We specified a custom variant (dense), so the button should be small. - // (32 button height + 12 touchable area) - QTest::newRow("dense") << QByteArray(":/variant-dense.conf") << 44 << QColor::fromRgb(0x789abc); -} - -void tst_qquickmaterialstyleconf::variants() -{ - QFETCH(QByteArray, confPath); - QFETCH(int, expectedButtonHeight); - QFETCH(QColor, expectedColor); - - qmlClearTypeRegistrations(); - QQuickStylePrivate::reset(); - qputenv("QT_QUICK_CONTROLS_CONF", confPath); - - QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); - - QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowExposed(window)); - - QQuickItem *label = window->property("label").value(); - QVERIFY(label); - QCOMPARE(label->property("color").value(), expectedColor); - - QQuickItem *button = window->property("button").value(); - QVERIFY(button); - QCOMPARE(button->height(), expectedButtonHeight); } QTEST_MAIN(tst_qquickmaterialstyleconf) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/variant-dense.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/variant-dense.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/variant-dense.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/variant-dense.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -[Controls] -Style=Material - -[Material] -Variant=Dense -Foreground=#789abc diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/variant-normal.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/variant-normal.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmaterialstyleconf/variant-normal.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmaterialstyleconf/variant-normal.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -[Controls] -Style=Material - -[Material] -Variant=Normal -Foreground=#123456 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/actions.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/actions.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/actions.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/actions.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 400 - height: 400 - - property alias menu: menu - - Menu { - id: menu - Action { text: "action1" } - MenuItem { text: "menuitem2" } - Action { text: "action3" } - MenuItem { text: "menuitem4" } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/addItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/addItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/addItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/addItem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/applicationwindow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/applicationwindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/applicationwindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/applicationwindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { title: "Test Application Window" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/applicationWindowScrollable.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/applicationWindowScrollable.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/applicationWindowScrollable.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/applicationWindowScrollable.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - title: "Test Application Window" - width: 300 - height: 300 - - property alias menu: menu - - Menu { - id: menu - - Repeater { - model: 20 - - delegate: MenuItem { - objectName: text - text: (index + 1) - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 800 - height: 800 - - property alias menu: menu - - Component { - id: menuItemComponent - - MenuItem { - contentItem: Text { - text: parent.text - color: "blue" - } - background: Rectangle { - color: "#00ff00" - } - } - } - - Menu { - id: menu - title: "Root Menu" - - Action { - text: "Action Item 1" - } - Menu { - title: "Sub-menu" - delegate: menuItemComponent - - Action { - text: "Sub-menu Action Item 1" - } - Menu { - title: "Sub-sub-menu" - delegate: menuItemComponent - - Action { - text: "Sub-sub-menu Action Item 1" - } - } - Action { - text: "Sub-menu Action Item 2" - } - } - Action { - text: "Action Item 2" - } - - delegate: menuItemComponent - visible: true - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 200 - height: 200 - - property alias menu: menu - - Menu { - id: menu - - MenuItem { - text: qsTr("Enabled 1") - } - MenuItem { - text: qsTr("Disabled 1") - enabled: false - } - MenuItem { - text: qsTr("Enabled 2") - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/disableWhenTriggered.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/disableWhenTriggered.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/disableWhenTriggered.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/disableWhenTriggered.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,121 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.10 -import QtQuick.Controls 2.3 - -ApplicationWindow { - width: 400 - height: 400 - - Action { - id: actionOutsideMenu - text: "Action declared outside menu" - onTriggered: enabled = false - } - - menuBar: MenuBar { - Menu { - title: "Menu" - objectName: title - - Action { - text: "Action" - objectName: text - onTriggered: enabled = false - } - MenuItem { - objectName: "MenuItem with Action" - action: Action { - text: "Action declared inside MenuItem" - objectName: text - onTriggered: enabled = false - } - } - MenuItem { - objectName: "MenuItem with Action declared outside menu" - action: actionOutsideMenu - } - MenuItem { - text: "MenuItem with no Action" - objectName: text - onTriggered: enabled = false - } - - Menu { - title: "Submenu" - objectName: title - - Action { - text: "Sub-Action" - objectName: text - onTriggered: enabled = false - } - MenuItem { - objectName: "Sub-MenuItem with Action declared inside" - action: Action { - text: "Action declared inside Sub-MenuItem" - objectName: text - onTriggered: enabled = false - } - } - MenuItem { - objectName: "Sub-MenuItem with Action declared outside menu" - action: actionOutsideMenu - } - MenuItem { - text: "Sub-MenuItem with no Action" - objectName: text - onTriggered: enabled = false - } - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/menuItemWidths.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/menuItemWidths.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/menuItemWidths.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/menuItemWidths.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 600 - height: 600 - - property alias menu: menu - - Menu { - id: menu - MenuItem { - objectName: "MenuItem" - text: "MenuItem" - } - MenuSeparator { - objectName: "MenuSeparator" - } - Menu { - title: "Sub-menu" - objectName: "Sub-menu" - - MenuItem { - objectName: "SubMenuItem" - text: "SubMenuItem" - } - } - Rectangle { - objectName: "CustomSeparator" - height: 2 - color: "salmon" - } - Rectangle { - // Use a binding to test retranslate(), which re-evaluates all bindings. - implicitWidth: someValue - objectName: "CustomRectangleSeparator" - height: 2 - color: "salmon" - - property int someValue: 120 - } - Control { - objectName: "CustomControlSeparator" - implicitWidth: someOtherValue - height: 2 - background: Rectangle { - color: "navajowhite" - } - - property int someOtherValue: 180 - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/menuSeparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/menuSeparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/menuSeparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/menuSeparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/mnemonics.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/mnemonics.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/mnemonics.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/mnemonics.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 400 - height: 400 - - property alias menu: menu - property alias action: action - property alias menuItem: menuItem - property alias subMenu: subMenu - property alias subMenuItem: subMenuItem - - Menu { - id: menu - - Action { - id: action - text: "&Action" - } - - MenuItem { - id: menuItem - text: "Menu &Item" - } - - Menu { - id: subMenu - title: "Sub &Menu" - - MenuItem { - id: subMenuItem - text: "&Sub Menu Item" - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/order.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/order.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/order.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/order.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/popup.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/popup.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,124 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 400 - height: 600 - - property alias menu: menu - property alias menuItem1: menuItem1 - property alias menuItem2: menuItem2 - property alias menuItem3: menuItem3 - property alias button: button - - function popupAtCursor() { - menu.popup() - } - - function popupAtPos(pos) { - menu.popup(pos) - } - - function popupAtCoord(x, y) { - menu.popup(x, y) - } - - function popupItemAtCursor(item) { - menu.popup(item) - } - - function popupItemAtPos(pos, item) { - menu.popup(pos, item) - } - - function popupItemAtCoord(x, y, item) { - menu.popup(x, y, item) - } - - function popupAtParentCursor(parent) { - menu.popup(parent) - } - - function popupAtParentPos(parent, pos) { - menu.popup(parent, pos) - } - - function popupAtParentCoord(parent, x, y) { - menu.popup(parent, x, y) - } - - function popupItemAtParentCursor(parent, item) { - menu.popup(parent, item) - } - - function popupItemAtParentPos(parent, pos, item) { - menu.popup(parent, pos, item) - } - - function popupItemAtParentCoord(parent, x, y, item) { - menu.popup(parent, x, y, item) - } - - Menu { - id: menu - MenuItem { id: menuItem1; text: "Foo" } - MenuItem { id: menuItem2; text: "Bar" } - MenuItem { id: menuItem3; text: "Baz" } - } - - Button { - id: button - text: "Button" - anchors.centerIn: parent - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/pressAndHold.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/pressAndHold.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/pressAndHold.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/pressAndHold.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/removeTakeItem.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/removeTakeItem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/removeTakeItem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/removeTakeItem.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 200 - height: 200 - - property alias menu: menu - property alias menuItem1: menuItem1 - property alias menuItem2: menuItem2 - property alias menuItem3: menuItem3 - - function takeSecondItem() { - return menu.takeItem(1) - } - - function removeFirstItem() { - menu.removeItem(menuItem1) - } - - function removeNullItem() { - menu.removeItem(null) - } - - function removeFirstIndex() { - menu.removeItem(0) - } - - Menu { - id: menu - MenuItem { - id: menuItem1 - } - MenuItem { - id: menuItem2 - } - MenuItem { - id: menuItem3 - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/repeater.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/repeater.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/repeater.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/repeater.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 200 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/subMenuDisabled.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/subMenuDisabled.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/subMenuDisabled.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/subMenuDisabled.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 600 - height: 400 - - property alias mainMenu: mainMenu - property alias subMenu: subMenu - - Menu { - id: mainMenu - title: "Menu" - - Menu { - id: subMenu - title: "Sub Menu" - MenuItem { - id: subMenuItem1 - text: "Sub Menu Item 1" - enabled: false - } - MenuItem { - id: subMenuItem2 - text: "Sub Menu Item 2" - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/subMenus.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/subMenus.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/subMenus.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/subMenus.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,134 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 600 - height: 400 - - property alias mainMenu: mainMenu - property alias subMenu1: subMenu1 - property alias subMenu2: subMenu2 - property alias subSubMenu1: subSubMenu1 - - Menu { - id: mainMenu - MenuItem { - id: mainMenuItem1 - objectName: "mainMenuItem1" - text: "Main 1" - } - - Menu { - id: subMenu1 - objectName: "subMenu1" - title: "Sub Menu 1" - - MenuItem { - id: subMenuItem1 - objectName: "subMenuItem1" - text: "Sub 1" - } - MenuItem { - id: subMenuItem2 - objectName: "subMenuItem2" - text: "Sub 2" - } - - Menu { - id: subSubMenu1 - objectName: "subSubMenu1" - title: "Sub Sub Menu 1" - - MenuItem { - id: subSubMenuItem1 - objectName: "subSubMenuItem1" - text: "Sub Sub 1" - } - MenuItem { - id: subSubMenuItem2 - objectName: "subSubMenuItem2" - text: "Sub Sub 2" - } - } - } - - MenuItem { - id: mainMenuItem2 - objectName: "mainMenuItem2" - text: "Main 2" - } - - Menu { - id: subMenu2 - objectName: "subMenu2" - title: "Sub Menu 2" - - MenuItem { - id: subMenuItem3 - objectName: "subMenuItem3" - text: "Sub 3" - } - MenuItem { - id: subMenuItem4 - objectName: "subMenuItem4" - text: "Sub 4" - } - } - - MenuItem { - id: mainMenuItem3 - objectName: "mainMenuItem3" - text: "Main 3" - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/windowScrollable.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/windowScrollable.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/data/windowScrollable.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/data/windowScrollable.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.11 - -Window { - title: "Test Window" - width: 300 - height: 300 - - property alias menu: menu - - Menu { - id: menu - - Repeater { - model: 20 - - delegate: MenuItem { - objectName: text - text: (index + 1) - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/tst_qquickmenu.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/tst_qquickmenu.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenu/tst_qquickmenu.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenu/tst_qquickmenu.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -34,9 +34,8 @@ ** ****************************************************************************/ -#include -#include -#include +#include +#include #include #include #include @@ -45,9 +44,7 @@ #include #include "../shared/util.h" #include "../shared/visualtestutil.h" -#include "../shared/qtest_quickcontrols.h" -#include #include #include #include @@ -65,42 +62,14 @@ private slots: void defaults(); - void count(); void mouse(); void pressAndHold(); void contextMenuKeyboard(); - void disabledMenuItemKeyNavigation(); - void mnemonics(); void menuButton(); void addItem(); void menuSeparator(); void repeater(); void order(); - void popup(); - void actions(); - void removeTakeItem(); - void subMenuMouse_data(); - void subMenuMouse(); - void subMenuDisabledMouse_data(); - void subMenuDisabledMouse(); - void subMenuKeyboard_data(); - void subMenuKeyboard(); - void subMenuDisabledKeyboard_data(); - void subMenuDisabledKeyboard(); - void subMenuPosition_data(); - void subMenuPosition(); - void addRemoveSubMenus(); - void scrollable_data(); - void scrollable(); - void disableWhenTriggered_data(); - void disableWhenTriggered(); - void menuItemWidth_data(); - void menuItemWidth(); - void menuItemWidthAfterMenuWidthChanged_data(); - void menuItemWidthAfterMenuWidthChanged(); - void menuItemWidthAfterImplicitWidthChanged_data(); - void menuItemWidthAfterImplicitWidthChanged(); - void menuItemWidthAfterRetranslate(); }; void tst_QQuickMenu::defaults() @@ -109,50 +78,14 @@ QQuickMenu *emptyMenu = helper.appWindow->property("emptyMenu").value(); QCOMPARE(emptyMenu->isVisible(), false); - QCOMPARE(emptyMenu->currentIndex(), -1); QCOMPARE(emptyMenu->contentItem()->property("currentIndex"), QVariant(-1)); - QCOMPARE(emptyMenu->count(), 0); -} - -void tst_QQuickMenu::count() -{ - QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); - - QQuickMenu *menu = helper.window->property("emptyMenu").value(); - QVERIFY(menu); - - QSignalSpy countSpy(menu, &QQuickMenu::countChanged); - QVERIFY(countSpy.isValid()); - - menu->addItem(new QQuickItem); - QCOMPARE(menu->count(), 1); - QCOMPARE(countSpy.count(), 1); - - menu->insertItem(0, new QQuickItem); - QCOMPARE(menu->count(), 2); - QCOMPARE(countSpy.count(), 2); - - menu->removeItem(menu->itemAt(1)); - QCOMPARE(menu->count(), 1); - QCOMPARE(countSpy.count(), 3); - - QScopedPointer item(menu->takeItem(0)); - QVERIFY(item); - QCOMPARE(menu->count(), 0); - QCOMPARE(countSpy.count(), 4); } void tst_QQuickMenu::mouse() { - if ((QGuiApplication::platformName() == QLatin1String("offscreen")) - || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QSKIP("Mouse hovering not functional on offscreen/minimal platforms"); - QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); QQuickApplicationWindow *window = helper.appWindow; - centerOnScreen(window); - moveMouseAway(window); window->show(); QVERIFY(QTest::qWaitForWindowActive(window)); @@ -160,7 +93,6 @@ menu->open(); QVERIFY(menu->isVisible()); QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); - QTRY_VERIFY(menu->isOpened()); QQuickItem *firstItem = menu->itemAt(0); QSignalSpy clickedSpy(firstItem, SIGNAL(clicked())); @@ -169,35 +101,30 @@ // Ensure that presses cause the current index to change, // so that the highlight acts as a way of illustrating press state. - QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, - QPoint(menu->leftPadding() + firstItem->width() / 2, menu->topPadding() + firstItem->height() / 2)); + QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(firstItem->width() / 2, firstItem->height() / 2)); QVERIFY(firstItem->hasActiveFocus()); - QCOMPARE(menu->currentIndex(), 0); QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(0)); QVERIFY(menu->isVisible()); - QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, - QPoint(menu->leftPadding() + firstItem->width() / 2, menu->topPadding() + firstItem->height() / 2)); + QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(firstItem->width() / 2, firstItem->height() / 2)); QCOMPARE(clickedSpy.count(), 1); QCOMPARE(triggeredSpy.count(), 1); - QTRY_COMPARE(visibleSpy.count(), 1); + QCOMPARE(visibleSpy.count(), 1); QVERIFY(!menu->isVisible()); QVERIFY(!window->overlay()->childItems().contains(menu->contentItem())); - QCOMPARE(menu->currentIndex(), -1); QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1)); menu->open(); QCOMPARE(visibleSpy.count(), 2); QVERIFY(menu->isVisible()); QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); - QTRY_VERIFY(menu->isOpened()); // Ensure that we have enough space to click outside of the menu. QVERIFY(window->width() > menu->contentItem()->width()); QVERIFY(window->height() > menu->contentItem()->height()); QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(menu->contentItem()->width() + 1, menu->contentItem()->height() + 1)); - QTRY_COMPARE(visibleSpy.count(), 3); + QCOMPARE(visibleSpy.count(), 3); QVERIFY(!menu->isVisible()); QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()->parentItem())); @@ -205,24 +132,6 @@ QCOMPARE(visibleSpy.count(), 4); QVERIFY(menu->isVisible()); QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); - QTRY_VERIFY(menu->isOpened()); - - // Hover-highlight through the menu items one by one - QQuickItem *prevHoverItem = nullptr; - QQuickItem *listView = menu->contentItem(); - for (int y = menu->topPadding(); y < listView->height(); ++y) { - QQuickItem *hoverItem = nullptr; - QVERIFY(QMetaObject::invokeMethod(listView, "itemAt", Q_RETURN_ARG(QQuickItem *, hoverItem), Q_ARG(qreal, 0), Q_ARG(qreal, listView->property("contentY").toReal() + y))); - if (!hoverItem || !hoverItem->isVisible() || hoverItem == prevHoverItem) - continue; - QTest::mouseMove(window, QPoint( - menu->leftPadding() + hoverItem->x() + hoverItem->width() / 2, - menu->topPadding() + hoverItem->y() + hoverItem->height() / 2)); - QTRY_VERIFY(hoverItem->property("highlighted").toBool()); - if (prevHoverItem) - QVERIFY(!prevHoverItem->property("highlighted").toBool()); - prevHoverItem = hoverItem; - } // Try pressing within the menu and releasing outside of it; it should close. // TODO: won't work until QQuickPopup::releasedOutside() actually gets emitted @@ -270,15 +179,12 @@ QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); QQuickApplicationWindow *window = helper.appWindow; - centerOnScreen(window); - moveMouseAway(window); window->show(); window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); QQuickMenu *menu = window->property("menu").value(); - QCOMPARE(menu->currentIndex(), -1); QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1)); QQuickMenuItem *firstItem = qobject_cast(menu->itemAt(0)); @@ -290,18 +196,13 @@ QCOMPARE(visibleSpy.count(), 1); QVERIFY(menu->isVisible()); QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); - QTRY_VERIFY(menu->isOpened()); QVERIFY(!firstItem->hasActiveFocus()); - QVERIFY(!firstItem->property("highlighted").toBool()); - QCOMPARE(menu->currentIndex(), -1); QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1)); QTest::keyClick(window, Qt::Key_Tab); QVERIFY(firstItem->hasActiveFocus()); QVERIFY(firstItem->hasVisualFocus()); - QVERIFY(firstItem->isHighlighted()); QCOMPARE(firstItem->focusReason(), Qt::TabFocusReason); - QCOMPARE(menu->currentIndex(), 0); QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(0)); QQuickMenuItem *secondItem = qobject_cast(menu->itemAt(1)); @@ -309,83 +210,41 @@ QTest::keyClick(window, Qt::Key_Tab); QVERIFY(!firstItem->hasActiveFocus()); QVERIFY(!firstItem->hasVisualFocus()); - QVERIFY(!firstItem->isHighlighted()); QVERIFY(secondItem->hasActiveFocus()); QVERIFY(secondItem->hasVisualFocus()); - QVERIFY(secondItem->isHighlighted()); QCOMPARE(secondItem->focusReason(), Qt::TabFocusReason); - QCOMPARE(menu->currentIndex(), 1); QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(1)); QSignalSpy secondTriggeredSpy(secondItem, SIGNAL(triggered())); QTest::keyClick(window, Qt::Key_Space); QCOMPARE(secondTriggeredSpy.count(), 1); - QTRY_COMPARE(visibleSpy.count(), 2); + QCOMPARE(visibleSpy.count(), 2); QVERIFY(!menu->isVisible()); QVERIFY(!window->overlay()->childItems().contains(menu->contentItem())); QVERIFY(!firstItem->hasActiveFocus()); QVERIFY(!firstItem->hasVisualFocus()); - QVERIFY(!firstItem->isHighlighted()); QVERIFY(!secondItem->hasActiveFocus()); QVERIFY(!secondItem->hasVisualFocus()); - QVERIFY(!secondItem->isHighlighted()); - QCOMPARE(menu->currentIndex(), -1); QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1)); - // Enter/return should also work. - // Open the menu. menu->open(); QCOMPARE(visibleSpy.count(), 3); QVERIFY(menu->isVisible()); - QTRY_VERIFY(menu->isOpened()); - // Give the first item focus. - QTest::keyClick(window, Qt::Key_Tab); - QVERIFY(firstItem->hasActiveFocus()); - QVERIFY(firstItem->hasVisualFocus()); - QVERIFY(firstItem->isHighlighted()); - QCOMPARE(firstItem->focusReason(), Qt::TabFocusReason); - QCOMPARE(menu->currentIndex(), 0); - QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(0)); - // Press enter. - QSignalSpy firstTriggeredSpy(firstItem, SIGNAL(triggered())); - QTest::keyClick(window, Qt::Key_Return); - QCOMPARE(firstTriggeredSpy.count(), 1); - QTRY_COMPARE(visibleSpy.count(), 4); - QVERIFY(!menu->isVisible()); - QVERIFY(!window->overlay()->childItems().contains(menu->contentItem())); - QVERIFY(!firstItem->hasActiveFocus()); - QVERIFY(!firstItem->hasVisualFocus()); - QVERIFY(!firstItem->isHighlighted()); - QVERIFY(!secondItem->hasActiveFocus()); - QVERIFY(!secondItem->hasVisualFocus()); - QVERIFY(!secondItem->isHighlighted()); - QCOMPARE(menu->currentIndex(), -1); - QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1)); - - menu->open(); - QCOMPARE(visibleSpy.count(), 5); - QVERIFY(menu->isVisible()); QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); - QTRY_VERIFY(menu->isOpened()); QVERIFY(!firstItem->hasActiveFocus()); QVERIFY(!firstItem->hasVisualFocus()); - QVERIFY(!firstItem->isHighlighted()); QVERIFY(!secondItem->hasActiveFocus()); QVERIFY(!secondItem->hasVisualFocus()); - QVERIFY(!secondItem->isHighlighted()); - QCOMPARE(menu->currentIndex(), -1); QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1)); QTest::keyClick(window, Qt::Key_Down); QVERIFY(firstItem->hasActiveFocus()); QVERIFY(firstItem->hasVisualFocus()); - QVERIFY(firstItem->isHighlighted()); QCOMPARE(firstItem->focusReason(), Qt::TabFocusReason); QTest::keyClick(window, Qt::Key_Down); QVERIFY(secondItem->hasActiveFocus()); QVERIFY(secondItem->hasVisualFocus()); - QVERIFY(secondItem->isHighlighted()); QCOMPARE(secondItem->focusReason(), Qt::TabFocusReason); QTest::keyClick(window, Qt::Key_Down); @@ -393,169 +252,45 @@ QVERIFY(thirdItem); QVERIFY(!firstItem->hasActiveFocus()); QVERIFY(!firstItem->hasVisualFocus()); - QVERIFY(!firstItem->isHighlighted()); QVERIFY(!secondItem->hasActiveFocus()); QVERIFY(!secondItem->hasVisualFocus()); - QVERIFY(!secondItem->isHighlighted()); QVERIFY(thirdItem->hasActiveFocus()); QVERIFY(thirdItem->hasVisualFocus()); - QVERIFY(thirdItem->isHighlighted()); QCOMPARE(thirdItem->focusReason(), Qt::TabFocusReason); // Key navigation shouldn't wrap by default. QTest::keyClick(window, Qt::Key_Down); QVERIFY(!firstItem->hasActiveFocus()); QVERIFY(!firstItem->hasVisualFocus()); - QVERIFY(!firstItem->isHighlighted()); QVERIFY(!secondItem->hasActiveFocus()); QVERIFY(!secondItem->hasVisualFocus()); - QVERIFY(!secondItem->isHighlighted()); QVERIFY(thirdItem->hasActiveFocus()); QVERIFY(thirdItem->hasVisualFocus()); - QVERIFY(thirdItem->isHighlighted()); QCOMPARE(thirdItem->focusReason(), Qt::TabFocusReason); QTest::keyClick(window, Qt::Key_Up); QVERIFY(!firstItem->hasActiveFocus()); QVERIFY(!firstItem->hasVisualFocus()); - QVERIFY(!firstItem->isHighlighted()); QVERIFY(secondItem->hasActiveFocus()); QVERIFY(secondItem->hasVisualFocus()); - QVERIFY(secondItem->isHighlighted()); QCOMPARE(secondItem->focusReason(), Qt::BacktabFocusReason); QVERIFY(!thirdItem->hasActiveFocus()); QVERIFY(!thirdItem->hasVisualFocus()); - QVERIFY(!thirdItem->isHighlighted()); QTest::keyClick(window, Qt::Key_Backtab); QVERIFY(firstItem->hasActiveFocus()); QVERIFY(firstItem->hasVisualFocus()); - QVERIFY(firstItem->isHighlighted()); QCOMPARE(firstItem->focusReason(), Qt::BacktabFocusReason); QVERIFY(!secondItem->hasActiveFocus()); QVERIFY(!secondItem->hasVisualFocus()); - QVERIFY(!secondItem->isHighlighted()); QVERIFY(!thirdItem->hasActiveFocus()); QVERIFY(!thirdItem->hasVisualFocus()); - QVERIFY(!thirdItem->isHighlighted()); QTest::keyClick(window, Qt::Key_Escape); - QTRY_COMPARE(visibleSpy.count(), 6); + QCOMPARE(visibleSpy.count(), 4); QVERIFY(!menu->isVisible()); } -// QTBUG-70181 -void tst_QQuickMenu::disabledMenuItemKeyNavigation() -{ - if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls) - QSKIP("This platform only allows tab focus for text controls"); - - QQuickApplicationHelper helper(this, QLatin1String("disabledMenuItemKeyNavigation.qml")); - - QQuickApplicationWindow *window = helper.appWindow; - centerOnScreen(window); - moveMouseAway(window); - window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); - QVERIFY(QGuiApplication::focusWindow() == window); - - QQuickMenu *menu = window->property("menu").value(); - QCOMPARE(menu->currentIndex(), -1); - QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1)); - - QQuickMenuItem *firstItem = qobject_cast(menu->itemAt(0)); - QVERIFY(firstItem); - - QQuickMenuItem *secondItem = qobject_cast(menu->itemAt(1)); - QVERIFY(secondItem); - - QQuickMenuItem *thirdItem = qobject_cast(menu->itemAt(2)); - QVERIFY(thirdItem); - - menu->setFocus(true); - menu->open(); - QVERIFY(menu->isVisible()); - QTRY_VERIFY(menu->isOpened()); - QVERIFY(!firstItem->hasActiveFocus()); - QVERIFY(!firstItem->property("highlighted").toBool()); - QCOMPARE(menu->currentIndex(), -1); - - QTest::keyClick(window, Qt::Key_Tab); - QVERIFY(firstItem->hasActiveFocus()); - QVERIFY(firstItem->hasVisualFocus()); - QVERIFY(firstItem->isHighlighted()); - QCOMPARE(firstItem->focusReason(), Qt::TabFocusReason); - QCOMPARE(menu->currentIndex(), 0); - - // Shouldn't be possible to give focus to a disabled menu item. - QTest::keyClick(window, Qt::Key_Down); - QVERIFY(!secondItem->hasActiveFocus()); - QVERIFY(!secondItem->hasVisualFocus()); - QVERIFY(!secondItem->isHighlighted()); - QVERIFY(thirdItem->hasActiveFocus()); - QVERIFY(thirdItem->hasVisualFocus()); - QVERIFY(thirdItem->isHighlighted()); - QCOMPARE(thirdItem->focusReason(), Qt::TabFocusReason); - - QTest::keyClick(window, Qt::Key_Up); - QVERIFY(firstItem->hasActiveFocus()); - QVERIFY(firstItem->hasVisualFocus()); - QVERIFY(firstItem->isHighlighted()); - QCOMPARE(firstItem->focusReason(), Qt::BacktabFocusReason); - - QTest::keyClick(window, Qt::Key_Escape); - QTRY_VERIFY(!menu->isVisible()); -} - -void tst_QQuickMenu::mnemonics() -{ -#ifdef Q_OS_MACOS - QSKIP("Mnemonics are not used on macOS"); -#endif - - QQuickApplicationHelper helper(this, QLatin1String("mnemonics.qml")); - - QQuickWindow *window = helper.window; - window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickMenu *menu = window->property("menu").value(); - QQuickAction *action = window->property("action").value(); - QQuickMenuItem *menuItem = window->property("menuItem").value(); - QQuickMenu *subMenu = window->property("subMenu").value(); - QQuickMenuItem *subMenuItem = window->property("subMenuItem").value(); - QVERIFY(menu && action && menuItem && subMenu && subMenuItem); - - menu->open(); - QTRY_VERIFY(menu->isOpened()); - - QSignalSpy actionSpy(action, &QQuickAction::triggered); - QVERIFY(actionSpy.isValid()); - QTest::keyClick(window, Qt::Key_A, Qt::AltModifier); // "&Action" - QCOMPARE(actionSpy.count(), 1); - - menu->open(); - QTRY_VERIFY(menu->isOpened()); - - QSignalSpy menuItemSpy(menuItem, &QQuickMenuItem::triggered); - QVERIFY(menuItemSpy.isValid()); - QTest::keyClick(window, Qt::Key_I, Qt::AltModifier); // "Menu &Item" - QCOMPARE(menuItemSpy.count(), 1); - - menu->open(); - QTRY_VERIFY(menu->isOpened()); - - QTest::keyClick(window, Qt::Key_M, Qt::AltModifier); // "Sub &Menu" - QTRY_VERIFY(subMenu->isOpened()); - - QSignalSpy subMenuItemSpy(subMenuItem, &QQuickMenuItem::triggered); - QVERIFY(subMenuItemSpy.isValid()); - QTest::keyClick(window, Qt::Key_S, Qt::AltModifier); // "&Sub Menu Item" - QCOMPARE(subMenuItemSpy.count(), 1); -} - void tst_QQuickMenu::menuButton() { if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls) @@ -578,7 +313,6 @@ menuButton->mapToScene(QPointF(menuButton->width() / 2, menuButton->height() / 2)).toPoint()); QCOMPARE(visibleSpy.count(), 1); QVERIFY(menu->isVisible()); - QTRY_VERIFY(menu->isOpened()); QTest::keyClick(window, Qt::Key_Tab); QQuickItem *firstItem = menu->itemAt(0); @@ -610,8 +344,6 @@ { QQuickApplicationHelper helper(this, QLatin1String("menuSeparator.qml")); QQuickWindow *window = helper.window; - centerOnScreen(window); - moveMouseAway(window); window->show(); QVERIFY(QTest::qWaitForWindowActive(window)); @@ -650,11 +382,8 @@ saveMenuItem->mapToScene(QPointF(saveMenuItem->width() / 2, saveMenuItem->height() / 2)).toPoint()); QTRY_VERIFY(!menu->isVisible()); - moveMouseAway(window); - menu->open(); QVERIFY(menu->isVisible()); - QTRY_VERIFY(menu->isOpened()); // Key navigation skips separators QTest::keyClick(window, Qt::Key_Down); @@ -748,1077 +477,6 @@ } } -void tst_QQuickMenu::popup() -{ - QQuickApplicationHelper helper(this, QLatin1String("popup.qml")); - QQuickApplicationWindow *window = helper.appWindow; - centerOnScreen(window); - moveMouseAway(window); - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickMenu *menu = window->property("menu").value(); - QVERIFY(menu); - - QQuickMenuItem *menuItem1 = window->property("menuItem1").value(); - QVERIFY(menuItem1); - - QQuickMenuItem *menuItem2 = window->property("menuItem2").value(); - QVERIFY(menuItem2); - - QQuickMenuItem *menuItem3 = window->property("menuItem3").value(); - QVERIFY(menuItem3); - - QQuickItem *button = window->property("button").value(); - QVERIFY(button); - -#if QT_CONFIG(cursor) - QPoint oldCursorPos = QCursor::pos(); - QPoint cursorPos = window->mapToGlobal(QPoint(11, 22)); - QCursor::setPos(cursorPos); - QTRY_COMPARE(QCursor::pos(), cursorPos); - - QVERIFY(QMetaObject::invokeMethod(window, "popupAtCursor")); - QCOMPARE(menu->parentItem(), window->contentItem()); - QCOMPARE(menu->currentIndex(), -1); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1); - const qreal elevenOrLeftMargin = qMax(qreal(11), menu->leftMargin()); - const qreal twentyTwoOrTopMargin = qMax(qreal(22), menu->topMargin()); - // If the Menu has large margins, it may be moved to stay within them. - // QTBUG-75503: QTRY_COMPARE doesn't use qFuzzyCompare() in all cases, - // meaning a lot of these comparisons could trigger a 10 second wait; - // use QTRY_VERIFY and qFuzzyCompare instead. - QTRY_VERIFY(qFuzzyCompare(menu->x(), elevenOrLeftMargin)); - QTRY_VERIFY(qFuzzyCompare(menu->y(), twentyTwoOrTopMargin)); - menu->close(); - - QVERIFY(QMetaObject::invokeMethod(window, "popupAtPos", Q_ARG(QVariant, QPointF(33, 44)))); - QCOMPARE(menu->parentItem(), window->contentItem()); - QCOMPARE(menu->currentIndex(), -1); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1); - QTRY_VERIFY(qFuzzyCompare(menu->x(), 33)); - QTRY_VERIFY(qFuzzyCompare(menu->y(), 44)); - menu->close(); - - QVERIFY(QMetaObject::invokeMethod(window, "popupAtCoord", Q_ARG(QVariant, 55), Q_ARG(QVariant, 66))); - QCOMPARE(menu->parentItem(), window->contentItem()); - QCOMPARE(menu->currentIndex(), -1); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1); - QTRY_VERIFY(qFuzzyCompare(menu->x(), 55)); - QTRY_VERIFY(qFuzzyCompare(menu->y(), 66)); - menu->close(); - - menu->setParentItem(nullptr); - QVERIFY(QMetaObject::invokeMethod(window, "popupAtParentCursor", Q_ARG(QVariant, QVariant::fromValue(button)))); - QCOMPARE(menu->parentItem(), button); - QCOMPARE(menu->currentIndex(), -1); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1); - QTRY_VERIFY(qFuzzyCompare(menu->x(), button->mapFromScene(QPointF(elevenOrLeftMargin, twentyTwoOrTopMargin)).x())); - QTRY_VERIFY(qFuzzyCompare(menu->y(), button->mapFromScene(QPointF(elevenOrLeftMargin, twentyTwoOrTopMargin)).y())); - menu->close(); - - menu->setParentItem(nullptr); - QVERIFY(QMetaObject::invokeMethod(window, "popupAtParentPos", Q_ARG(QVariant, QVariant::fromValue(button)), Q_ARG(QVariant, QPointF(-11, -22)))); - QCOMPARE(menu->parentItem(), button); - QCOMPARE(menu->currentIndex(), -1); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1); - // Don't need to worry about margins here because we're opening close - // to the center of the window. - QTRY_VERIFY(qFuzzyCompare(menu->x(), -11)); - QTRY_VERIFY(qFuzzyCompare(menu->y(), -22)); - QCOMPARE(menu->popupItem()->position(), button->mapToScene(QPointF(-11, -22))); - menu->close(); - - menu->setParentItem(nullptr); - QVERIFY(QMetaObject::invokeMethod(window, "popupAtParentCoord", Q_ARG(QVariant, QVariant::fromValue(button)), Q_ARG(QVariant, -33), Q_ARG(QVariant, -44))); - QCOMPARE(menu->parentItem(), button); - QCOMPARE(menu->currentIndex(), -1); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1); - QTRY_VERIFY(qFuzzyCompare(menu->x(), -33)); - QTRY_VERIFY(qFuzzyCompare(menu->y(), -44)); - QCOMPARE(menu->popupItem()->position(), button->mapToScene(QPointF(-33, -44))); - menu->close(); - - const qreal twelveOrLeftMargin = qMax(qreal(12), menu->leftMargin()); - cursorPos = window->mapToGlobal(QPoint(twelveOrLeftMargin, window->height() / 2)); - QCursor::setPos(cursorPos); - QTRY_COMPARE(QCursor::pos(), cursorPos); - - const QList menuItems = QList() << menuItem1 << menuItem2 << menuItem3; - for (QQuickMenuItem *menuItem : menuItems) { - menu->resetParentItem(); - - QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtCursor", Q_ARG(QVariant, QVariant::fromValue(menuItem)))); - QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem)); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem)); - QTRY_VERIFY(qFuzzyCompare(menu->x(), twelveOrLeftMargin)); - QTRY_VERIFY(qFuzzyCompare(menu->y(), window->height() / 2 - menu->topPadding() - menuItem->y())); - menu->close(); - - QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtPos", Q_ARG(QVariant, QPointF(33, window->height() / 3)), Q_ARG(QVariant, QVariant::fromValue(menuItem)))); - QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem)); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem)); - QTRY_VERIFY(qFuzzyCompare(menu->x(), 33)); - QTRY_VERIFY(qFuzzyCompare(menu->y(), window->height() / 3 - menu->topPadding() - menuItem->y())); - menu->close(); - - QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtCoord", Q_ARG(QVariant, 55), Q_ARG(QVariant, window->height() / 3 * 2), Q_ARG(QVariant, QVariant::fromValue(menuItem)))); - QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem)); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem)); - QTRY_VERIFY(qFuzzyCompare(menu->x(), 55)); - QTRY_COMPARE_WITH_TIMEOUT(menu->y(), window->height() / 3 * 2 - menu->topPadding() - menuItem->y(), 500); - menu->close(); - - menu->setParentItem(nullptr); - QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtParentCursor", Q_ARG(QVariant, QVariant::fromValue(button)), Q_ARG(QVariant, QVariant::fromValue(menuItem)))); - QCOMPARE(menu->parentItem(), button); - QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem)); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem)); - QTRY_VERIFY(qFuzzyCompare(menu->x(), button->mapFromScene(QPoint(twelveOrLeftMargin, window->height() / 2)).x())); - QTRY_VERIFY(qFuzzyCompare(menu->y(), button->mapFromScene(QPoint(twelveOrLeftMargin, window->height() / 2)).y() - menu->topPadding() - menuItem->y())); - menu->close(); - - menu->setParentItem(nullptr); - QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtParentPos", Q_ARG(QVariant, QVariant::fromValue(button)), Q_ARG(QVariant, QPointF(-11, -22)), Q_ARG(QVariant, QVariant::fromValue(menuItem)))); - QCOMPARE(menu->parentItem(), button); - QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem)); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem)); - QTRY_VERIFY(qFuzzyCompare(menu->x(), -11)); - QTRY_VERIFY(qFuzzyCompare(menu->y(), -22 - menu->topPadding() - menuItem->y())); - QCOMPARE(menu->popupItem()->position(), button->mapToScene(QPointF(-11, -22 - menu->topPadding() - menuItem->y()))); - menu->close(); - - menu->setParentItem(nullptr); - QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtParentCoord", Q_ARG(QVariant, QVariant::fromValue(button)), Q_ARG(QVariant, -33), Q_ARG(QVariant, -44), Q_ARG(QVariant, QVariant::fromValue(menuItem)))); - QCOMPARE(menu->parentItem(), button); - QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem)); - QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem)); - QTRY_VERIFY(qFuzzyCompare(menu->x(), -33)); - QTRY_VERIFY(qFuzzyCompare(menu->y(), -44 - menu->topPadding() - menuItem->y())); - QCOMPARE(menu->popupItem()->position(), button->mapToScene(QPointF(-33, -44 - menu->topPadding() - menuItem->y()))); - menu->close(); - } - - QCursor::setPos(oldCursorPos); - QTRY_COMPARE(QCursor::pos(), oldCursorPos); -#endif -} - -void tst_QQuickMenu::actions() -{ - QQuickApplicationHelper helper(this, QLatin1String("actions.qml")); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickMenu *menu = window->property("menu").value(); - QVERIFY(menu); - - QPointer action1 = menu->actionAt(0); - QVERIFY(!action1.isNull()); - - QPointer action3 = menu->actionAt(2); - QVERIFY(!action3.isNull()); - - QVERIFY(!menu->actionAt(1)); - QVERIFY(!menu->actionAt(3)); - - QPointer menuItem1 = qobject_cast(menu->itemAt(0)); - QVERIFY(!menuItem1.isNull()); - QCOMPARE(menuItem1->action(), action1.data()); - QCOMPARE(menuItem1->text(), "action1"); - - QPointer menuItem2 = qobject_cast(menu->itemAt(1)); - QVERIFY(!menuItem2.isNull()); - QVERIFY(!menuItem2->action()); - QCOMPARE(menuItem2->text(), "menuitem2"); - - QPointer menuItem3 = qobject_cast(menu->itemAt(2)); - QVERIFY(!menuItem3.isNull()); - QCOMPARE(menuItem3->action(), action3.data()); - QCOMPARE(menuItem3->text(), "action3"); - - QPointer menuItem4 = qobject_cast(menu->itemAt(3)); - QVERIFY(!menuItem4.isNull()); - QVERIFY(!menuItem4->action()); - QCOMPARE(menuItem4->text(), "menuitem4"); - - // takeAction(int) does not destroy the action, but does destroy the respective item - QCOMPARE(menu->takeAction(0), action1.data()); - QVERIFY(!menu->itemAt(3)); - QCoreApplication::sendPostedEvents(action1, QEvent::DeferredDelete); - QVERIFY(!action1.isNull()); - QCoreApplication::sendPostedEvents(menuItem1, QEvent::DeferredDelete); - QVERIFY(menuItem1.isNull()); - - // takeAction(int) does not destroy an item that doesn't have an action - QVERIFY(!menuItem2->subMenu()); - QVERIFY(!menu->takeAction(0)); - QCoreApplication::sendPostedEvents(menuItem2, QEvent::DeferredDelete); - QVERIFY(!menuItem2.isNull()); - - // addAction(Action) re-creates the respective item in the menu - menu->addAction(action1); - menuItem1 = qobject_cast(menu->itemAt(3)); - QVERIFY(!menuItem1.isNull()); - QCOMPARE(menuItem1->action(), action1.data()); - - // removeAction(Action) destroys both the action and the respective item - menu->removeAction(action1); - QVERIFY(!menu->itemAt(3)); - QCoreApplication::sendPostedEvents(action1, QEvent::DeferredDelete); - QVERIFY(action1.isNull()); - QCoreApplication::sendPostedEvents(menuItem1, QEvent::DeferredDelete); - QVERIFY(menuItem1.isNull()); -} - -void tst_QQuickMenu::removeTakeItem() -{ - QQuickApplicationHelper helper(this, QLatin1String("removeTakeItem.qml")); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickMenu *menu = window->property("menu").value(); - QVERIFY(menu); - - QPointer menuItem1 = window->property("menuItem1").value(); - QVERIFY(!menuItem1.isNull()); - QCOMPARE(menuItem1->menu(), menu); - - QPointer menuItem2 = window->property("menuItem2").value(); - QVERIFY(!menuItem2.isNull()); - QCOMPARE(menuItem2->menu(), menu); - - QPointer menuItem3 = window->property("menuItem3").value(); - QVERIFY(!menuItem3.isNull()); - QCOMPARE(menuItem3->menu(), menu); - - // takeItem(int) does not destroy - QVariant ret; - QVERIFY(QMetaObject::invokeMethod(window, "takeSecondItem", Q_RETURN_ARG(QVariant, ret))); - QCOMPARE(ret.value(), menuItem2); - QVERIFY(!menuItem2->menu()); - QCoreApplication::sendPostedEvents(menuItem2, QEvent::DeferredDelete); - QVERIFY(!menuItem2.isNull()); - - // removeItem(Item) destroys - QVERIFY(QMetaObject::invokeMethod(window, "removeFirstItem")); - QVERIFY(!menuItem1->menu()); - QCoreApplication::sendPostedEvents(menuItem1, QEvent::DeferredDelete); - QVERIFY(menuItem1.isNull()); - - // removeItem(null) must not call removeItem(0) - QVERIFY(QMetaObject::invokeMethod(window, "removeNullItem")); - QCOMPARE(menuItem3->menu(), menu); - QCoreApplication::sendPostedEvents(menuItem3, QEvent::DeferredDelete); - QVERIFY(!menuItem3.isNull()); - - // deprecated removeItem(int) does not destroy - QVERIFY(QMetaObject::invokeMethod(window, "removeFirstIndex")); - QVERIFY(!menuItem3->menu()); - QCoreApplication::sendPostedEvents(menuItem3, QEvent::DeferredDelete); - QVERIFY(!menuItem3.isNull()); -} - -void tst_QQuickMenu::subMenuMouse_data() -{ - QTest::addColumn("cascade"); - - QTest::newRow("cascading") << true; - QTest::newRow("non-cascading") << false; -} - -void tst_QQuickMenu::subMenuMouse() -{ - if ((QGuiApplication::platformName() == QLatin1String("offscreen")) - || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QSKIP("Mouse hovering not functional on offscreen/minimal platforms"); - - QFETCH(bool, cascade); - - QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml")); - QQuickApplicationWindow *window = helper.appWindow; - centerOnScreen(window); - moveMouseAway(window); - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickMenu *mainMenu = window->property("mainMenu").value(); - QVERIFY(mainMenu); - mainMenu->setCascade(cascade); - QCOMPARE(mainMenu->cascade(), cascade); - - QQuickMenu *subMenu1 = window->property("subMenu1").value(); - QVERIFY(subMenu1); - - QQuickMenu *subMenu2 = window->property("subMenu2").value(); - QVERIFY(subMenu2); - - QQuickMenu *subSubMenu1 = window->property("subSubMenu1").value(); - QVERIFY(subSubMenu1); - - mainMenu->open(); - QVERIFY(mainMenu->isVisible()); - QTRY_VERIFY(mainMenu->isOpened()); - QVERIFY(!subMenu1->isVisible()); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); - - // open the sub-menu with mouse click - QQuickMenuItem *subMenu1Item = qobject_cast(mainMenu->itemAt(1)); - QVERIFY(subMenu1Item); - QCOMPARE(subMenu1Item->subMenu(), subMenu1); - QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, subMenu1Item->mapToScene(QPoint(1, 1)).toPoint()); - QTRY_COMPARE(mainMenu->isVisible(), cascade); - QVERIFY(subMenu1->isVisible()); - QTRY_VERIFY(subMenu1->isOpened()); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); - - // open the cascading sub-sub-menu with mouse hover - QQuickMenuItem *subSubMenu1Item = qobject_cast(subMenu1->itemAt(2)); - QVERIFY(subSubMenu1Item); - QCOMPARE(subSubMenu1Item->subMenu(), subSubMenu1); - QTest::mouseMove(window, subSubMenu1Item->mapToScene(QPoint(1, 1)).toPoint()); - QCOMPARE(mainMenu->isVisible(), cascade); - QVERIFY(subMenu1->isVisible()); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); - if (cascade) { - QTRY_VERIFY(subSubMenu1->isVisible()); - QTRY_VERIFY(subSubMenu1->isOpened()); - } - - // close the sub-sub-menu with mouse hover over another parent menu item - QQuickMenuItem *subMenuItem1 = qobject_cast(subMenu1->itemAt(0)); - QVERIFY(subMenuItem1); - QVERIFY(!subMenuItem1->subMenu()); - QTest::mouseMove(window, subMenuItem1->mapToScene(QPoint(1, 1)).toPoint()); - QCOMPARE(mainMenu->isVisible(), cascade); - QVERIFY(subMenu1->isVisible()); - QVERIFY(!subMenu2->isVisible()); - QTRY_VERIFY(!subSubMenu1->isVisible()); - - // re-open the sub-sub-menu with mouse hover - QTest::mouseMove(window, subSubMenu1Item->mapToScene(QPoint(1, 1)).toPoint()); - QCOMPARE(mainMenu->isVisible(), cascade); - QVERIFY(subMenu1->isVisible()); - QVERIFY(!subMenu2->isVisible()); - if (!cascade) { - QVERIFY(!subSubMenu1->isVisible()); - } else { - QTRY_VERIFY(subSubMenu1->isVisible()); - QTRY_VERIFY(subSubMenu1->isOpened()); - } - - // close sub-menu and sub-sub-menu with mouse hover in the main menu - QQuickMenuItem *mainMenuItem1 = qobject_cast(mainMenu->itemAt(0)); - QVERIFY(mainMenuItem1); - QTest::mouseMove(window, mainMenuItem1->mapToScene(QPoint(1, 1)).toPoint()); - QCOMPARE(mainMenu->isVisible(), cascade); - QTRY_COMPARE(subMenu1->isVisible(), !cascade); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); - - // close all menus by click triggering an item - QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, mainMenuItem1->mapToScene(QPoint(1, 1)).toPoint()); - QTRY_VERIFY(!mainMenu->isVisible()); - QTRY_VERIFY(!subMenu1->isVisible()); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); -} - -void tst_QQuickMenu::subMenuDisabledMouse_data() -{ - subMenuMouse_data(); -} - -// QTBUG-69540 -void tst_QQuickMenu::subMenuDisabledMouse() -{ - if ((QGuiApplication::platformName() == QLatin1String("offscreen")) - || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QSKIP("Mouse hovering not functional on offscreen/minimal platforms"); - - QFETCH(bool, cascade); - - QQuickApplicationHelper helper(this, QLatin1String("subMenuDisabled.qml")); - QQuickApplicationWindow *window = helper.appWindow; - centerOnScreen(window); - moveMouseAway(window); - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickMenu *mainMenu = window->property("mainMenu").value(); - QVERIFY(mainMenu); - mainMenu->setCascade(cascade); - QCOMPARE(mainMenu->cascade(), cascade); - - QQuickMenuItem *menuItem1 = qobject_cast(mainMenu->itemAt(0)); - QVERIFY(menuItem1); - - QQuickMenu *subMenu = window->property("subMenu").value(); - QVERIFY(subMenu); - - mainMenu->open(); - QVERIFY(mainMenu->isVisible()); - QVERIFY(!menuItem1->isHighlighted()); - QVERIFY(!subMenu->isVisible()); - - // Open the sub-menu with a mouse click. - QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, menuItem1->mapToScene(QPoint(1, 1)).toPoint()); - // Need to use the TRY variant here when cascade is false, - // as e.g. Material style menus have transitions and don't close immediately. - QTRY_COMPARE(mainMenu->isVisible(), cascade); - QVERIFY(subMenu->isVisible()); - QVERIFY(menuItem1->isHighlighted()); - // Now the sub-menu is open. The current behavior is that the first menu item - // in the new menu is highlighted; make sure that we choose the next item if - // the first is disabled. - QQuickMenuItem *subMenuItem1 = qobject_cast(subMenu->itemAt(0)); - QVERIFY(subMenuItem1); - QQuickMenuItem *subMenuItem2 = qobject_cast(subMenu->itemAt(1)); - QVERIFY(subMenuItem2); - QVERIFY(!subMenuItem1->isHighlighted()); - QVERIFY(subMenuItem2->isHighlighted()); - - // Close all menus by clicking on the item that isn't disabled. - QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, subMenuItem2->mapToScene(QPoint(1, 1)).toPoint()); - QTRY_VERIFY(!mainMenu->isVisible()); - QTRY_VERIFY(!subMenu->isVisible()); -} - -void tst_QQuickMenu::subMenuKeyboard_data() -{ - QTest::addColumn("cascade"); - QTest::addColumn("mirrored"); - - QTest::newRow("cascading") << true << false; - QTest::newRow("cascading,mirrored") << true << true; - QTest::newRow("non-cascading") << false << false; - QTest::newRow("non-cascading,mirrored") << false << true; -} - -void tst_QQuickMenu::subMenuKeyboard() -{ - QFETCH(bool, cascade); - QFETCH(bool, mirrored); - - QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml")); - QQuickApplicationWindow *window = helper.appWindow; - centerOnScreen(window); - moveMouseAway(window); - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - if (mirrored) - window->setLocale(QLocale("ar_EG")); - - QQuickMenu *mainMenu = window->property("mainMenu").value(); - QVERIFY(mainMenu); - mainMenu->setCascade(cascade); - QCOMPARE(mainMenu->cascade(), cascade); - - QQuickMenu *subMenu1 = window->property("subMenu1").value(); - QVERIFY(subMenu1); - - QQuickMenu *subMenu2 = window->property("subMenu2").value(); - QVERIFY(subMenu2); - - QQuickMenu *subSubMenu1 = window->property("subSubMenu1").value(); - QVERIFY(subSubMenu1); - - mainMenu->open(); - QVERIFY(mainMenu->isVisible()); - QTRY_VERIFY(mainMenu->isOpened()); - QVERIFY(!subMenu1->isVisible()); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); - - // navigate to the sub-menu item and trigger it to open the sub-menu - QQuickMenuItem *subMenu1Item = qobject_cast(mainMenu->itemAt(1)); - QVERIFY(subMenu1Item); - QVERIFY(!subMenu1Item->isHighlighted()); - QCOMPARE(subMenu1Item->subMenu(), subMenu1); - QTest::keyClick(window, Qt::Key_Down); - QTest::keyClick(window, Qt::Key_Down); - QVERIFY(subMenu1Item->isHighlighted()); - QTest::keyClick(window, Qt::Key_Space); - QTRY_COMPARE(mainMenu->isVisible(), cascade); - QVERIFY(subMenu1->isVisible()); - QTRY_VERIFY(subMenu1->isOpened()); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); - - // navigate to the sub-sub-menu item and open it with the arrow key - QQuickMenuItem *subSubMenu1Item = qobject_cast(subMenu1->itemAt(2)); - QVERIFY(subSubMenu1Item); - QVERIFY(!subSubMenu1Item->isHighlighted()); - QCOMPARE(subSubMenu1Item->subMenu(), subSubMenu1); - QTest::keyClick(window, Qt::Key_Down); - QTest::keyClick(window, Qt::Key_Down); - QTest::keyClick(window, Qt::Key_Down); - QVERIFY(subSubMenu1Item->isHighlighted()); - QTRY_COMPARE(mainMenu->isVisible(), cascade); - QVERIFY(subMenu1->isVisible()); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); - QTest::keyClick(window, mirrored ? Qt::Key_Left : Qt::Key_Right); - QCOMPARE(mainMenu->isVisible(), cascade); - QTRY_COMPARE(subMenu1->isVisible(), cascade); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(subSubMenu1->isVisible()); - QTRY_VERIFY(subSubMenu1->isOpened()); - - // navigate within the sub-sub-menu - QQuickMenuItem *subSubMenuItem1 = qobject_cast(subSubMenu1->itemAt(0)); - QVERIFY(subSubMenuItem1); - QQuickMenuItem *subSubMenuItem2 = qobject_cast(subSubMenu1->itemAt(1)); - QVERIFY(subSubMenuItem2); - QVERIFY(subSubMenuItem1->isHighlighted()); - QVERIFY(!subSubMenuItem2->isHighlighted()); - QTest::keyClick(window, Qt::Key_Down); - QVERIFY(!subSubMenuItem1->isHighlighted()); - QVERIFY(subSubMenuItem2->isHighlighted()); - - // navigate to the parent menu with the arrow key - QTest::keyClick(window, mirrored ? Qt::Key_Right : Qt::Key_Left); - QVERIFY(subSubMenu1Item->isHighlighted()); - QCOMPARE(mainMenu->isVisible(), cascade); - QVERIFY(subMenu1->isVisible()); - QVERIFY(!subMenu2->isVisible()); - QTRY_VERIFY(!subSubMenu1->isVisible()); - - // navigate within the sub-menu - QQuickMenuItem *subMenuItem1 = qobject_cast(subMenu1->itemAt(0)); - QVERIFY(subMenuItem1); - QQuickMenuItem *subMenuItem2 = qobject_cast(subMenu1->itemAt(1)); - QVERIFY(subMenuItem2); - QVERIFY(!subMenuItem1->isHighlighted()); - QVERIFY(!subMenuItem2->isHighlighted()); - QVERIFY(subSubMenu1Item->isHighlighted()); - QTest::keyClick(window, Qt::Key_Up); - QVERIFY(!subMenuItem1->isHighlighted()); - QVERIFY(subMenuItem2->isHighlighted()); - QVERIFY(!subSubMenu1Item->isHighlighted()); - - // close the menus with esc - QTest::keyClick(window, Qt::Key_Escape); - QCOMPARE(mainMenu->isVisible(), cascade); - QTRY_VERIFY(!subMenu1->isVisible()); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); - QTest::keyClick(window, Qt::Key_Escape); - QTRY_VERIFY(!mainMenu->isVisible()); - QVERIFY(!subMenu1->isVisible()); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); -} - -void tst_QQuickMenu::subMenuDisabledKeyboard_data() -{ - subMenuKeyboard_data(); -} - -// QTBUG-69540 -void tst_QQuickMenu::subMenuDisabledKeyboard() -{ - QFETCH(bool, cascade); - QFETCH(bool, mirrored); - - QQuickApplicationHelper helper(this, QLatin1String("subMenuDisabled.qml")); - QQuickApplicationWindow *window = helper.appWindow; - centerOnScreen(window); - moveMouseAway(window); - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - if (mirrored) - window->setLocale(QLocale("ar_EG")); - - QQuickMenu *mainMenu = window->property("mainMenu").value(); - QVERIFY(mainMenu); - mainMenu->setCascade(cascade); - QCOMPARE(mainMenu->cascade(), cascade); - - QQuickMenuItem *menuItem1 = qobject_cast(mainMenu->itemAt(0)); - QVERIFY(menuItem1); - - QQuickMenu *subMenu = window->property("subMenu").value(); - QVERIFY(subMenu); - - mainMenu->open(); - QVERIFY(mainMenu->isVisible()); - QTRY_VERIFY(mainMenu->isOpened()); - QVERIFY(!menuItem1->isHighlighted()); - QVERIFY(!subMenu->isVisible()); - - // Highlight the top-level menu item. - QTest::keyClick(window, Qt::Key_Down); - QVERIFY(menuItem1->isHighlighted()); - - QQuickMenuItem *subMenuItem1 = qobject_cast(subMenu->itemAt(0)); - QVERIFY(subMenuItem1); - QQuickMenuItem *subMenuItem2 = qobject_cast(subMenu->itemAt(1)); - QVERIFY(subMenuItem2); - - // Open the sub-menu. - QTest::keyClick(window, mirrored ? Qt::Key_Left : Qt::Key_Right); - // The first sub-menu item is disabled, so it should highlight the second one. - QVERIFY(!subMenuItem1->isHighlighted()); - QVERIFY(subMenuItem2->isHighlighted()); - - // Close the menus with escape. - QTest::keyClick(window, Qt::Key_Escape); - QTRY_COMPARE(mainMenu->isVisible(), cascade); - QTRY_VERIFY(!subMenu->isVisible()); - QTest::keyClick(window, Qt::Key_Escape); - QTRY_VERIFY(!mainMenu->isVisible()); - QVERIFY(!subMenu->isVisible()); -} - -void tst_QQuickMenu::subMenuPosition_data() -{ - QTest::addColumn("cascade"); - QTest::addColumn("flip"); - QTest::addColumn("mirrored"); - QTest::addColumn("overlap"); - - QTest::newRow("cascading") << true << false << false << 0.0; - QTest::newRow("cascading,flip") << true << true << false << 0.0; - QTest::newRow("cascading,overlap") << true << false << false << 10.0; - QTest::newRow("cascading,flip,overlap") << true << true << false << 10.0; - QTest::newRow("cascading,mirrored") << true << false << true << 0.0; - QTest::newRow("cascading,mirrored,flip") << true << true << true << 0.0; - QTest::newRow("cascading,mirrored,overlap") << true << false << true << 10.0; - QTest::newRow("cascading,mirrored,flip,overlap") << true << true << true << 10.0; - QTest::newRow("non-cascading") << false << false << false << 0.0; -} - -void tst_QQuickMenu::subMenuPosition() -{ - QFETCH(bool, cascade); - QFETCH(bool, flip); - QFETCH(bool, mirrored); - QFETCH(qreal, overlap); - - QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml")); - QQuickApplicationWindow *window = helper.appWindow; - - // Ensure that the default size of the window fits three menus side by side. - QQuickMenu *mainMenu = window->property("mainMenu").value(); - QVERIFY(mainMenu); - window->setWidth(mainMenu->width() * 3 + mainMenu->leftMargin() + mainMenu->rightMargin()); - - // the default size of the window fits three menus side by side. - // when testing flipping, we resize the window so that the first - // sub-menu fits, but the second doesn't - if (flip) - window->setWidth(window->width() - mainMenu->width()); - - centerOnScreen(window); - moveMouseAway(window); - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - if (mirrored) - window->setLocale(QLocale("ar_EG")); - - mainMenu->setCascade(cascade); - QCOMPARE(mainMenu->cascade(), cascade); - mainMenu->setOverlap(overlap); - QCOMPARE(mainMenu->overlap(), overlap); - - QQuickMenu *subMenu1 = window->property("subMenu1").value(); - QVERIFY(subMenu1); - subMenu1->setCascade(cascade); - QCOMPARE(subMenu1->cascade(), cascade); - subMenu1->setOverlap(overlap); - QCOMPARE(subMenu1->overlap(), overlap); - - QQuickMenu *subMenu2 = window->property("subMenu2").value(); - QVERIFY(subMenu2); - subMenu2->setCascade(cascade); - QCOMPARE(subMenu2->cascade(), cascade); - subMenu2->setOverlap(overlap); - QCOMPARE(subMenu2->overlap(), overlap); - - QQuickMenu *subSubMenu1 = window->property("subSubMenu1").value(); - QVERIFY(subSubMenu1); - subSubMenu1->setCascade(cascade); - QCOMPARE(subSubMenu1->cascade(), cascade); - subSubMenu1->setOverlap(overlap); - QCOMPARE(subSubMenu1->overlap(), overlap); - - // choose the main menu position so that there's room for the - // sub-menus to cascade to the left when mirrored - if (mirrored) - mainMenu->setX(window->width() - mainMenu->width()); - - mainMenu->open(); - QVERIFY(mainMenu->isVisible()); - QTRY_VERIFY(mainMenu->isOpened()); - QVERIFY(!subMenu1->isVisible()); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); - - // open the sub-menu (never flips) - QQuickMenuItem *subMenu1Item = qobject_cast(mainMenu->itemAt(1)); - QVERIFY(subMenu1Item); - QCOMPARE(subMenu1Item->subMenu(), subMenu1); - emit subMenu1Item->triggered(); - QTRY_COMPARE(mainMenu->isVisible(), cascade); - QVERIFY(subMenu1->isVisible()); - QTRY_VERIFY(subMenu1->isOpened()); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(!subSubMenu1->isVisible()); - - if (cascade) { - QCOMPARE(subMenu1->parentItem(), subMenu1Item); - // vertically aligned to the parent menu item - QCOMPARE(subMenu1->popupItem()->y(), mainMenu->popupItem()->y() + subMenu1Item->y()); - if (mirrored) { - // on the left of the parent menu - QCOMPARE(subMenu1->popupItem()->x(), mainMenu->popupItem()->x() - subMenu1->width() + overlap); - } else { - // on the right of the parent menu - QCOMPARE(subMenu1->popupItem()->x(), mainMenu->popupItem()->x() + mainMenu->width() - overlap); - } - } else { - QCOMPARE(subMenu1->parentItem(), mainMenu->parentItem()); - // centered over the parent menu - QCOMPARE(subMenu1->popupItem()->x(), mainMenu->popupItem()->x() + (mainMenu->width() - subMenu1->width()) / 2); - QCOMPARE(subMenu1->popupItem()->y(), mainMenu->popupItem()->y() + (mainMenu->height() - subMenu1->height()) / 2); - } - - // open the sub-sub-menu (can flip) - QQuickMenuItem *subSubMenu1Item = qobject_cast(subMenu1->itemAt(2)); - QVERIFY(subSubMenu1Item); - QCOMPARE(subSubMenu1Item->subMenu(), subSubMenu1); - emit subSubMenu1Item->triggered(); - QTRY_COMPARE(mainMenu->isVisible(), cascade); - QTRY_COMPARE(subMenu1->isVisible(), cascade); - QVERIFY(!subMenu2->isVisible()); - QVERIFY(subSubMenu1->isVisible()); - QTRY_VERIFY(subSubMenu1->isOpened()); - - if (cascade) { - QCOMPARE(subSubMenu1->parentItem(), subSubMenu1Item); - // vertically aligned to the parent menu item - QCOMPARE(subSubMenu1->popupItem()->y(), subMenu1->popupItem()->y() + subSubMenu1Item->y()); - if (mirrored != flip) { - // on the left of the parent menu - QCOMPARE(subSubMenu1->popupItem()->x(), subMenu1->popupItem()->x() - subSubMenu1->width() + overlap); - } else { - // on the right of the parent menu - QCOMPARE(subSubMenu1->popupItem()->x(), subMenu1->popupItem()->x() + subMenu1->width() - overlap); - } - } else { - QCOMPARE(subSubMenu1->parentItem(), subMenu1->parentItem()); - // centered over the parent menu - QCOMPARE(subSubMenu1->popupItem()->x(), subMenu1->popupItem()->x() + (subMenu1->width() - subSubMenu1->width()) / 2); - QCOMPARE(subSubMenu1->popupItem()->y(), subMenu1->popupItem()->y() + (subMenu1->height() - subSubMenu1->height()) / 2); - } -} - -void tst_QQuickMenu::addRemoveSubMenus() -{ - QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml")); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickMenu *mainMenu = window->property("mainMenu").value(); - QVERIFY(mainMenu); - - QVERIFY(!mainMenu->menuAt(0)); - - QPointer subMenu1 = window->property("subMenu1").value(); - QVERIFY(!subMenu1.isNull()); - QCOMPARE(mainMenu->menuAt(1), subMenu1.data()); - - QVERIFY(!mainMenu->menuAt(2)); - - QPointer subMenu2 = window->property("subMenu2").value(); - QVERIFY(!subMenu2.isNull()); - QCOMPARE(mainMenu->menuAt(3), subMenu2.data()); - - QVERIFY(!mainMenu->menuAt(4)); - - QPointer subSubMenu1 = window->property("subSubMenu1").value(); - QVERIFY(!subSubMenu1.isNull()); - - // takeMenu(int) does not destroy the menu, but does destroy the respective item in the parent menu - QPointer subSubMenu1Item = qobject_cast(subMenu1->itemAt(2)); - QVERIFY(subSubMenu1Item); - QCOMPARE(subSubMenu1Item->subMenu(), subSubMenu1.data()); - QCOMPARE(subMenu1->takeMenu(2), subSubMenu1.data()); - QVERIFY(!subMenu1->itemAt(2)); - QCoreApplication::sendPostedEvents(subSubMenu1, QEvent::DeferredDelete); - QVERIFY(!subSubMenu1.isNull()); - QCoreApplication::sendPostedEvents(subSubMenu1Item, QEvent::DeferredDelete); - QVERIFY(subSubMenu1Item.isNull()); - - // takeMenu(int) does not destroy an item that doesn't present a menu - QPointer subMenuItem1 = qobject_cast(subMenu1->itemAt(0)); - QVERIFY(subMenuItem1); - QVERIFY(!subMenuItem1->subMenu()); - QVERIFY(!subMenu1->takeMenu(0)); - QCoreApplication::sendPostedEvents(subMenuItem1, QEvent::DeferredDelete); - QVERIFY(!subMenuItem1.isNull()); - - // addMenu(Menu) re-creates the respective item in the parent menu - subMenu1->addMenu(subSubMenu1); - subSubMenu1Item = qobject_cast(subMenu1->itemAt(2)); - QVERIFY(!subSubMenu1Item.isNull()); - - // removeMenu(Menu) destroys both the menu and the respective item in the parent menu - subMenu1->removeMenu(subSubMenu1); - QVERIFY(!subMenu1->itemAt(2)); - QCoreApplication::sendPostedEvents(subSubMenu1, QEvent::DeferredDelete); - QVERIFY(subSubMenu1.isNull()); - QCoreApplication::sendPostedEvents(subSubMenu1Item, QEvent::DeferredDelete); - QVERIFY(subSubMenu1Item.isNull()); -} - -void tst_QQuickMenu::scrollable_data() -{ - QTest::addColumn("qmlFilePath"); - - QTest::addRow("Window") << QString::fromLatin1("windowScrollable.qml"); - QTest::addRow("ApplicationWindow") << QString::fromLatin1("applicationWindowScrollable.qml"); -} - -void tst_QQuickMenu::scrollable() -{ - QFETCH(QString, qmlFilePath); - - QQuickApplicationHelper helper(this, qmlFilePath); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickMenu *menu = window->property("menu").value(); - menu->open(); - QVERIFY(menu->isVisible()); - - QQuickItem *contentItem = menu->contentItem(); - QCOMPARE(contentItem->property("interactive").toBool(), true); -} - -void tst_QQuickMenu::disableWhenTriggered_data() -{ - QTest::addColumn("menuItemIndex"); - QTest::addColumn("subMenuItemIndex"); - - QTest::addRow("Action") << 0 << -1; - QTest::addRow("MenuItem with Action") << 1 << -1; - QTest::addRow("MenuItem with Action declared outside menu") << 2 << -1; - QTest::addRow("MenuItem with no Action") << 3 << -1; - - QTest::addRow("Sub-Action") << 4 << 0; - QTest::addRow("Sub-MenuItem with Action declared inside") << 4 << 1; - QTest::addRow("Sub-MenuItem with Action declared outside menu") << 4 << 2; - QTest::addRow("Sub-MenuItem with no Action") << 4 << 3; -} - -// Tests that the menu is dismissed when a menu item sets "enabled = false" in onTriggered(). -void tst_QQuickMenu::disableWhenTriggered() -{ - if ((QGuiApplication::platformName() == QLatin1String("offscreen")) - || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QSKIP("Mouse hovering not functional on offscreen/minimal platforms"); - - QFETCH(int, menuItemIndex); - QFETCH(int, subMenuItemIndex); - - QQuickApplicationHelper helper(this, QLatin1String("disableWhenTriggered.qml")); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickMenu *menu = window->findChild("Menu"); - QVERIFY(menu); - - menu->open(); - QVERIFY(menu->isVisible()); - QTRY_VERIFY(menu->isOpened()); - - QPointer menuItem = qobject_cast(menu->itemAt(menuItemIndex)); - QVERIFY(menuItem); - - if (subMenuItemIndex == -1) { - // Click a top-level menu item. - QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, - menuItem->mapToScene(QPointF(menuItem->width() / 2, menuItem->height() / 2)).toPoint()); - QCOMPARE(menuItem->isEnabled(), false); - QTRY_VERIFY(!menu->isVisible()); - } else { - // Click a sub-menu item. - QPointer subMenu = menuItem->subMenu(); - QVERIFY(subMenu); - - QPointer subMenuItem = qobject_cast(subMenu->itemAt(subMenuItemIndex)); - QVERIFY(subMenuItem); - - // First, open the sub-menu. - QTest::mouseMove(window, menuItem->mapToScene(QPoint(1, 1)).toPoint()); - QTRY_VERIFY(subMenu->isVisible()); - QVERIFY(menuItem->isHovered()); - QTRY_VERIFY(subMenu->contentItem()->property("contentHeight").toReal() > 0.0); - - // Click the item. - QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, - subMenuItem->mapToScene(QPointF(subMenuItem->width() / 2, subMenuItem->height() / 2)).toPoint()); - QCOMPARE(subMenuItem->isEnabled(), false); - QTRY_VERIFY(!menu->isVisible()); - } -} - -void tst_QQuickMenu::menuItemWidth_data() -{ - QTest::addColumn("mirrored"); - - QTest::newRow("non-mirrored") << false; - QTest::newRow("mirrored") << true; -} - -void tst_QQuickMenu::menuItemWidth() -{ - QFETCH(bool, mirrored); - - QQuickApplicationHelper helper(this, QLatin1String("menuItemWidths.qml")); - QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - if (mirrored) - window->setLocale(QLocale("ar_EG")); - - QQuickMenu *menu = window->property("menu").value(); - QVERIFY(menu); - menu->open(); - QTRY_VERIFY(menu->isOpened()); - for (int i = 0; i < menu->count(); ++i) - QCOMPARE(menu->itemAt(i)->width(), menu->availableWidth()); -} - -void tst_QQuickMenu::menuItemWidthAfterMenuWidthChanged_data() -{ - QTest::addColumn("mirrored"); - - QTest::newRow("non-mirrored") << false; - QTest::newRow("mirrored") << true; -} - -void tst_QQuickMenu::menuItemWidthAfterMenuWidthChanged() -{ - QFETCH(bool, mirrored); - - QQuickApplicationHelper helper(this, QLatin1String("menuItemWidths.qml")); - QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - if (mirrored) - window->setLocale(QLocale("ar_EG")); - - QQuickMenu *menu = window->property("menu").value(); - QVERIFY(menu); - menu->open(); - QTRY_VERIFY(menu->isOpened()); - for (int i = 0; i < menu->count(); ++i) { - // Check that the width of menu items is correct before we resize the menu. - const QQuickItem *item = menu->itemAt(i); - QVERIFY2(qFuzzyCompare(item->width(), menu->availableWidth()), - qPrintable(QString::fromLatin1("Expected width of %1 to be %2, but it's %3") - .arg(item->objectName()).arg(menu->availableWidth()).arg(item->width()))); - } - - menu->setWidth(menu->width() + 10); - - // Check that the width of menu items is correct after we resize the menu. - for (int i = 0; i < menu->count(); ++i) { - // Check that the width of menu items is correct after we resize the menu. - const QQuickItem *item = menu->itemAt(i); - QVERIFY2(qFuzzyCompare(item->width(), menu->availableWidth()), - qPrintable(QString::fromLatin1("Expected width of %1 to be %2, but it's %3") - .arg(item->objectName()).arg(menu->availableWidth()).arg(item->width()))); - } -} - -void tst_QQuickMenu::menuItemWidthAfterImplicitWidthChanged_data() -{ - QTest::addColumn("mirrored"); - - QTest::newRow("non-mirrored") << false; - QTest::newRow("mirrored") << true; -} - -void tst_QQuickMenu::menuItemWidthAfterImplicitWidthChanged() -{ - QFETCH(bool, mirrored); - - QQuickApplicationHelper helper(this, QLatin1String("menuItemWidths.qml")); - QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - if (mirrored) - window->setLocale(QLocale("ar_EG")); - - QQuickMenu *menu = window->property("menu").value(); - QVERIFY(menu); - menu->open(); - QTRY_VERIFY(menu->isOpened()); - // Check that the width of the menu item is correct before we change its font size. - QQuickMenuItem *menuItem = qobject_cast(menu->itemAt(0)); - QCOMPARE(menuItem->width(), menu->availableWidth()); - - // Add some text to increase the implicitWidth of the MenuItem. - const qreal oldImplicitWidth = menuItem->implicitWidth(); - for (int i = 0; menuItem->implicitWidth() <= oldImplicitWidth; ++i) { - menuItem->setText(menuItem->text() + QLatin1String("---")); - if (i == 100) - QFAIL("Shouldn't need 100 iterations to increase MenuItem's implicitWidth; something is wrong here"); - } - - // Check that the width of the menu item is correct after we change its font size. - QCOMPARE(menuItem->width(), menu->availableWidth()); -} - -void tst_QQuickMenu::menuItemWidthAfterRetranslate() -{ - QQuickApplicationHelper helper(this, QLatin1String("menuItemWidths.qml")); - QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickMenu *menu = window->property("menu").value(); - QVERIFY(menu); - menu->open(); - QTRY_VERIFY(menu->isOpened()); - for (int i = 0; i < menu->count(); ++i) { - // Check that the width of each menu item is correct before we retranslate. - const QQuickItem *item = menu->itemAt(i); - QVERIFY2(qFuzzyCompare(item->width(), menu->availableWidth()), - qPrintable(QString::fromLatin1("Expected width of %1 to be %2, but it's %3") - .arg(item->objectName()).arg(menu->availableWidth()).arg(item->width()))); - } - - // Call retranslate() and cause all bindings to be re-evaluated. - helper.engine.retranslate(); - - for (int i = 0; i < menu->count(); ++i) { - // Check that the width of each menu item is correct after we retranslate. - const QQuickItem *item = menu->itemAt(i); - QVERIFY2(qFuzzyCompare(item->width(), menu->availableWidth()), - qPrintable(QString::fromLatin1("Expected width of %1 to be %2, but it's %3") - .arg(item->objectName()).arg(menu->availableWidth()).arg(item->width()))); - } -} - -QTEST_QUICKCONTROLS_MAIN(tst_QQuickMenu) +QTEST_MAIN(tst_QQuickMenu) #include "tst_qquickmenu.moc" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 800 - height: 800 - - Component { - id: menuBarItemComponent - - MenuBarItem { - contentItem: Text { - text: parent.text - color: "blue" - } - background: Rectangle { - color: "#00ff00" - } - } - } - - menuBar: MenuBar { - delegate: menuBarItemComponent - - Menu { - title: "Menu" - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenubar/data/empty.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenubar/data/empty.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenubar/data/empty.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenubar/data/empty.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -MenuBar { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenubar/data/menubar.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenubar/data/menubar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenubar/data/menubar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenubar/data/menubar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 400 - height: 400 - visible: true - - header: MenuBar { - MenuBarItem { - menu: Menu { - title: "&File" - MenuItem { text: "&Open..." } - MenuItem { text: "&Save" } - MenuItem { text: "Save &As..." } - MenuSeparator { } - MenuItem { text: "&Quit" } - } - } - MenuBarItem { - menu: Menu { - title: "&Edit" - MenuItem { text: "&Cut" } - MenuItem { text: "&Copy" } - MenuItem { text: "&Paste" } - } - } - MenuBarItem { - menu: Menu { - title: "&View" - Menu { - title: "&Alignment" - Menu { - title: "&Horizontal" - MenuItem { text: "&Left" } - MenuItem { text: "&Center" } - MenuItem { text: "&Right" } - } - Menu { - title: "&Vertical" - MenuItem { text: "&Top" } - MenuItem { text: "&Center" } - MenuItem { text: "&Bottom" } - } - } - } - } - - MenuBarItem { - menu: Menu { - title: "&Help" - MenuItem { text: "&About" } - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenubar/qquickmenubar.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenubar/qquickmenubar.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenubar/qquickmenubar.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenubar/qquickmenubar.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickmenubar -SOURCES += tst_qquickmenubar.cpp - -macos:CONFIG -= app_bundle - -QT += core-private gui-private qml-private quick-private testlib quicktemplates2-private - -include (../shared/util.pri) - -TESTDATA = data/* - -OTHER_FILES += \ - data/*.qml diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenubar/tst_qquickmenubar.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenubar/tst_qquickmenubar.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickmenubar/tst_qquickmenubar.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickmenubar/tst_qquickmenubar.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,569 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include "../shared/util.h" -#include "../shared/visualtestutil.h" -#include "../shared/qtest_quickcontrols.h" - -#include -#include -#include -#include -#include - -using namespace QQuickVisualTestUtil; - -class tst_qquickmenubar : public QQmlDataTest -{ - Q_OBJECT - -public: - -private slots: - void delegate(); - void mouse(); - void keys(); - void mnemonics(); - void addRemove(); -}; - -void tst_qquickmenubar::delegate() -{ - QQmlApplicationEngine engine(testFileUrl("empty.qml")); - QScopedPointer menuBar(qobject_cast(engine.rootObjects().value(0))); - QVERIFY(menuBar); - - QQmlComponent *delegate = menuBar->delegate(); - QVERIFY(delegate); - - QScopedPointer item(qobject_cast(delegate->create())); - QVERIFY(item); -} - -void tst_qquickmenubar::mouse() -{ - if ((QGuiApplication::platformName() == QLatin1String("offscreen")) - || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QSKIP("Mouse highlight not functional on offscreen/minimal platforms"); - - QQmlApplicationEngine engine(testFileUrl("menubar.qml")); - - QScopedPointer window(qobject_cast(engine.rootObjects().value(0))); - QVERIFY(window); - - centerOnScreen(window.data()); - moveMouseAway(window.data()); - QVERIFY(QTest::qWaitForWindowActive(window.data())); - - QQuickMenuBar *menuBar = window->property("header").value(); - QVERIFY(menuBar); - - QQuickMenu *fileMenuBarMenu = menuBar->menuAt(0); - QQuickMenu *editMenuBarMenu = menuBar->menuAt(1); - QQuickMenu *viewMenuBarMenu = menuBar->menuAt(2); - QQuickMenu *helpMenuBarMenu = menuBar->menuAt(3); - QVERIFY(fileMenuBarMenu && editMenuBarMenu && viewMenuBarMenu && helpMenuBarMenu); - - QQuickMenuBarItem *fileMenuBarItem = qobject_cast(fileMenuBarMenu->parentItem()); - QQuickMenuBarItem *editMenuBarItem = qobject_cast(editMenuBarMenu->parentItem()); - QQuickMenuBarItem *viewMenuBarItem = qobject_cast(viewMenuBarMenu->parentItem()); - QQuickMenuBarItem *helpMenuBarItem = qobject_cast(helpMenuBarMenu->parentItem()); - QVERIFY(fileMenuBarItem && editMenuBarItem && viewMenuBarItem && helpMenuBarItem); - - // highlight a menubar item - QTest::mouseMove(window.data(), fileMenuBarItem->mapToScene(QPointF(fileMenuBarItem->width() / 2, fileMenuBarItem->height() / 2)).toPoint()); - QVERIFY(fileMenuBarItem->isHighlighted()); - QVERIFY(!fileMenuBarMenu->isVisible()); - - // highlight another menubar item - QTest::mouseMove(window.data(), editMenuBarItem->mapToScene(QPointF(editMenuBarItem->width() / 2, editMenuBarItem->height() / 2)).toPoint()); - QVERIFY(!fileMenuBarItem->isHighlighted()); - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(!fileMenuBarMenu->isVisible()); - QVERIFY(!editMenuBarMenu->isVisible()); - - // trigger a menubar item to open a menu - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, editMenuBarItem->mapToScene(QPointF(editMenuBarItem->width() / 2, editMenuBarItem->height() / 2)).toPoint()); - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(editMenuBarMenu->isVisible()); - QTRY_VERIFY(editMenuBarMenu->isOpened()); - - // re-trigger a menubar item to hide the menu - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, editMenuBarItem->mapToScene(QPointF(editMenuBarItem->width() / 2, editMenuBarItem->height() / 2)).toPoint()); - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(editMenuBarItem->hasActiveFocus()); - QTRY_VERIFY(!editMenuBarMenu->isVisible()); - - // re-trigger a menubar item to show the menu again - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, editMenuBarItem->mapToScene(QPointF(editMenuBarItem->width() / 2, editMenuBarItem->height() / 2)).toPoint()); - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(editMenuBarMenu->isVisible()); - QTRY_VERIFY(editMenuBarMenu->isOpened()); - - // highlight another menubar item to open another menu - QTest::mouseMove(window.data(), helpMenuBarItem->mapToScene(QPointF(helpMenuBarItem->width() / 2, helpMenuBarItem->height() / 2)).toPoint()); - QVERIFY(!fileMenuBarItem->isHighlighted()); - QVERIFY(!editMenuBarItem->isHighlighted()); - QVERIFY(!viewMenuBarItem->isHighlighted()); - QVERIFY(helpMenuBarItem->isHighlighted()); - QVERIFY(!fileMenuBarMenu->isVisible()); - QVERIFY(!viewMenuBarMenu->isVisible()); - QVERIFY(helpMenuBarMenu->isVisible()); - QTRY_VERIFY(!editMenuBarMenu->isVisible()); - QTRY_VERIFY(helpMenuBarMenu->isOpened()); - - // trigger a menu item to close the menu - QQuickMenuItem *aboutMenuItem = qobject_cast(helpMenuBarMenu->itemAt(0)); - QVERIFY(aboutMenuItem); - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, aboutMenuItem->mapToScene(QPointF(aboutMenuItem->width() / 2, aboutMenuItem->height() / 2)).toPoint()); - QVERIFY(!helpMenuBarItem->isHighlighted()); - QTRY_VERIFY(!helpMenuBarMenu->isVisible()); - - // highlight a menubar item - QTest::mouseMove(window.data(), editMenuBarItem->mapToScene(QPointF(editMenuBarItem->width() / 2, editMenuBarItem->height() / 2)).toPoint()); - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(!helpMenuBarItem->isHighlighted()); - QVERIFY(!editMenuBarMenu->isVisible()); - QVERIFY(!helpMenuBarMenu->isVisible()); - - // trigger a menubar item to open a menu - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, viewMenuBarItem->mapToScene(QPointF(viewMenuBarItem->width() / 2, viewMenuBarItem->height() / 2)).toPoint()); - QVERIFY(!editMenuBarItem->isHighlighted()); - QVERIFY(viewMenuBarItem->isHighlighted()); - QVERIFY(viewMenuBarMenu->isVisible()); - QTRY_VERIFY(viewMenuBarMenu->isOpened()); - - // trigger a menu item to open a sub-menu - QQuickMenuItem *alignmentSubMenuItem = qobject_cast(viewMenuBarMenu->itemAt(0)); - QVERIFY(alignmentSubMenuItem); - QQuickMenu *alignmentSubMenu = alignmentSubMenuItem->subMenu(); - QVERIFY(alignmentSubMenu); - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, alignmentSubMenuItem->mapToScene(QPointF(alignmentSubMenuItem->width() / 2, alignmentSubMenuItem->height() / 2)).toPoint()); - QVERIFY(viewMenuBarMenu->isVisible()); - QVERIFY(alignmentSubMenu->isVisible()); - QTRY_VERIFY(alignmentSubMenu->isOpened()); - - // trigger a menu item to open a sub-sub-menu - QQuickMenuItem *verticalSubMenuItem = qobject_cast(alignmentSubMenu->itemAt(1)); - QVERIFY(verticalSubMenuItem); - QQuickMenu *verticalSubMenu = verticalSubMenuItem->subMenu(); - QVERIFY(verticalSubMenu); - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, verticalSubMenuItem->mapToScene(QPointF(verticalSubMenuItem->width() / 2, verticalSubMenuItem->height() / 2)).toPoint()); - QVERIFY(viewMenuBarMenu->isVisible()); - QVERIFY(alignmentSubMenu->isVisible()); - QVERIFY(verticalSubMenu->isVisible()); - QTRY_VERIFY(verticalSubMenu->isOpened()); - - // trigger a menu item to close the whole chain of menus - QQuickMenuItem *centerMenuItem = qobject_cast(verticalSubMenu->itemAt(1)); - QVERIFY(centerMenuItem); - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, centerMenuItem->mapToScene(QPointF(centerMenuItem->width() / 2, centerMenuItem->height() / 2)).toPoint()); - QVERIFY(!viewMenuBarItem->isHighlighted()); - QTRY_VERIFY(!viewMenuBarMenu->isVisible()); - QTRY_VERIFY(!alignmentSubMenu->isVisible()); - QTRY_VERIFY(!verticalSubMenu->isVisible()); - - // re-highlight the same menubar item - QTest::mouseMove(window.data(), viewMenuBarItem->mapToScene(QPointF(viewMenuBarItem->width() / 2, viewMenuBarItem->height() / 2)).toPoint()); - QVERIFY(viewMenuBarItem->isHighlighted()); - - // re-open the chain of menus - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, viewMenuBarItem->mapToScene(QPointF(viewMenuBarItem->width() / 2, viewMenuBarItem->height() / 2)).toPoint()); - QTRY_VERIFY(viewMenuBarMenu->isOpened()); - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, alignmentSubMenuItem->mapToScene(QPointF(alignmentSubMenuItem->width() / 2, alignmentSubMenuItem->height() / 2)).toPoint()); - QTRY_VERIFY(alignmentSubMenu->isOpened()); - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, verticalSubMenuItem->mapToScene(QPointF(verticalSubMenuItem->width() / 2, verticalSubMenuItem->height() / 2)).toPoint()); - QTRY_VERIFY(verticalSubMenu->isOpened()); - - // click outside to close the whole chain of menus - QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - 1, window->height() - 1)); - QVERIFY(!viewMenuBarItem->isHighlighted()); - QTRY_VERIFY(!viewMenuBarMenu->isVisible()); - QTRY_VERIFY(!alignmentSubMenu->isVisible()); - QTRY_VERIFY(!verticalSubMenu->isVisible()); -} - -void tst_qquickmenubar::keys() -{ - QQmlApplicationEngine engine(testFileUrl("menubar.qml")); - - QScopedPointer window(qobject_cast(engine.rootObjects().value(0))); - QVERIFY(window); - - centerOnScreen(window.data()); - moveMouseAway(window.data()); - QVERIFY(QTest::qWaitForWindowActive(window.data())); - - QQuickMenuBar *menuBar = window->property("header").value(); - QVERIFY(menuBar); - - QQuickMenu *fileMenuBarMenu = menuBar->menuAt(0); - QQuickMenu *editMenuBarMenu = menuBar->menuAt(1); - QQuickMenu *viewMenuBarMenu = menuBar->menuAt(2); - QQuickMenu *helpMenuBarMenu = menuBar->menuAt(3); - QVERIFY(fileMenuBarMenu && editMenuBarMenu && viewMenuBarMenu && helpMenuBarMenu); - - QQuickMenuBarItem *fileMenuBarItem = qobject_cast(fileMenuBarMenu->parentItem()); - QQuickMenuBarItem *editMenuBarItem = qobject_cast(editMenuBarMenu->parentItem()); - QQuickMenuBarItem *viewMenuBarItem = qobject_cast(viewMenuBarMenu->parentItem()); - QQuickMenuBarItem *helpMenuBarItem = qobject_cast(helpMenuBarMenu->parentItem()); - QVERIFY(fileMenuBarItem && editMenuBarItem && viewMenuBarItem && helpMenuBarItem); - - // trigger a menubar item to open a menu - editMenuBarItem->forceActiveFocus(); - QTest::keyClick(window.data(), Qt::Key_Space); - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(editMenuBarMenu->isVisible()); - QTRY_VERIFY(editMenuBarMenu->isOpened()); - QVERIFY(editMenuBarMenu->hasActiveFocus()); - - // navigate down to the menu - QQuickMenuItem *cutMenuItem = qobject_cast(editMenuBarMenu->itemAt(0)); - QVERIFY(cutMenuItem); - QVERIFY(!cutMenuItem->isHighlighted()); - QVERIFY(!cutMenuItem->hasActiveFocus()); - QTest::keyClick(window.data(), Qt::Key_Down); - QVERIFY(cutMenuItem->isHighlighted()); - QVERIFY(cutMenuItem->hasActiveFocus()); - - // navigate up, back to the menubar - QTest::keyClick(window.data(), Qt::Key_Up); - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(editMenuBarItem->hasActiveFocus()); - QTRY_VERIFY(!editMenuBarMenu->isVisible()); - QVERIFY(!cutMenuItem->isHighlighted()); - QVERIFY(!cutMenuItem->hasActiveFocus()); - - // navigate down to re-open the menu - QTest::keyClick(window.data(), Qt::Key_Down); - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(!editMenuBarItem->hasActiveFocus()); - QVERIFY(editMenuBarMenu->isVisible()); - QTRY_VERIFY(editMenuBarMenu->isOpened()); - QVERIFY(editMenuBarMenu->hasActiveFocus()); - QVERIFY(cutMenuItem->isHighlighted()); - QVERIFY(cutMenuItem->hasActiveFocus()); - - // navigate left in popup mode (menu open) - QTest::keyClick(window.data(), Qt::Key_Left); - QVERIFY(fileMenuBarItem->isHighlighted()); - QVERIFY(!editMenuBarItem->isHighlighted()); - QVERIFY(fileMenuBarMenu->isVisible()); - QTRY_VERIFY(fileMenuBarMenu->isOpened()); - QTRY_VERIFY(!editMenuBarMenu->isVisible()); - - // navigate left in popup mode (wrap) - QTest::keyClick(window.data(), Qt::Key_Left); - QVERIFY(helpMenuBarItem->isHighlighted()); - QVERIFY(!fileMenuBarItem->isHighlighted()); - QVERIFY(helpMenuBarMenu->isVisible()); - QTRY_VERIFY(helpMenuBarMenu->isOpened()); - QTRY_VERIFY(!fileMenuBarMenu->isVisible()); - - // navigate up to close the menu - QTest::keyClick(window.data(), Qt::Key_Up); - QVERIFY(helpMenuBarItem->isHighlighted()); - QTRY_VERIFY(!helpMenuBarMenu->isVisible()); - - // navigate right in non-popup mode (wrap) - QTest::keyClick(window.data(), Qt::Key_Right); - QVERIFY(fileMenuBarItem->isHighlighted()); - QVERIFY(!helpMenuBarItem->isHighlighted()); - QVERIFY(!fileMenuBarMenu->isVisible()); - QVERIFY(!helpMenuBarMenu->isVisible()); - - // navigate right in non-popup mode (menu closed) - QTest::keyClick(window.data(), Qt::Key_Right); - QVERIFY(!fileMenuBarItem->isHighlighted()); - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(!fileMenuBarMenu->isVisible()); - QVERIFY(!editMenuBarMenu->isVisible()); - - // open a menu - viewMenuBarItem->forceActiveFocus(); - QTest::keyClick(window.data(), Qt::Key_Space); - QVERIFY(viewMenuBarItem->isHighlighted()); - QVERIFY(viewMenuBarMenu->isVisible()); - QTRY_VERIFY(viewMenuBarMenu->isOpened()); - QVERIFY(!viewMenuBarItem->hasActiveFocus()); - QVERIFY(viewMenuBarMenu->hasActiveFocus()); - - // open a sub-menu - QQuickMenuItem *alignmentSubMenuItem = qobject_cast(viewMenuBarMenu->itemAt(0)); - QVERIFY(alignmentSubMenuItem); - QQuickMenu *alignmentSubMenu = alignmentSubMenuItem->subMenu(); - QVERIFY(alignmentSubMenu); - QTest::keyClick(window.data(), Qt::Key_Down); - QVERIFY(alignmentSubMenuItem->isHighlighted()); - QVERIFY(!alignmentSubMenu->isVisible()); - QTest::keyClick(window.data(), Qt::Key_Right); - QVERIFY(alignmentSubMenu->isVisible()); - QTRY_VERIFY(alignmentSubMenu->isOpened()); - - // open a sub-sub-menu - QQuickMenuItem *horizontalSubMenuItem = qobject_cast(alignmentSubMenu->itemAt(0)); - QVERIFY(horizontalSubMenuItem); - QVERIFY(horizontalSubMenuItem->isHighlighted()); - QQuickMenu *horizontalSubMenu = horizontalSubMenuItem->subMenu(); - QVERIFY(horizontalSubMenu); - QTest::keyClick(window.data(), Qt::Key_Right); - QVERIFY(viewMenuBarMenu->isVisible()); - QVERIFY(alignmentSubMenu->isVisible()); - QVERIFY(horizontalSubMenu->isVisible()); - QTRY_VERIFY(horizontalSubMenu->isOpened()); - - // navigate left to close a sub-menu - QTest::keyClick(window.data(), Qt::Key_Left); - QTRY_VERIFY(!horizontalSubMenu->isVisible()); - QVERIFY(viewMenuBarMenu->isVisible()); - QVERIFY(alignmentSubMenu->isVisible()); - - // navigate right to re-open the sub-menu - QTest::keyClick(window.data(), Qt::Key_Right); - QVERIFY(horizontalSubMenuItem->isHighlighted()); - QVERIFY(horizontalSubMenu->isVisible()); - QTRY_VERIFY(horizontalSubMenu->isOpened()); - - // navigate right to the next menubar menu - QTest::keyClick(window.data(), Qt::Key_Right); - QVERIFY(!viewMenuBarItem->isHighlighted()); - QVERIFY(helpMenuBarItem->isHighlighted()); - QVERIFY(helpMenuBarMenu->isVisible()); - QTRY_VERIFY(!viewMenuBarMenu->isVisible()); - QTRY_VERIFY(!alignmentSubMenu->isVisible()); - QTRY_VERIFY(!horizontalSubMenu->isVisible()); - QTRY_VERIFY(helpMenuBarMenu->isOpened()); - - // navigate back - QTest::keyClick(window.data(), Qt::Key_Left); - QVERIFY(!helpMenuBarItem->isHighlighted()); - QVERIFY(viewMenuBarItem->isHighlighted()); - QVERIFY(viewMenuBarMenu->isVisible()); - QTRY_VERIFY(!helpMenuBarMenu->isVisible()); - QTRY_VERIFY(viewMenuBarMenu->isOpened()); - - // re-open the chain of menus - QTest::keyClick(window.data(), Qt::Key_Down); - QVERIFY(alignmentSubMenuItem->isHighlighted()); - QTest::keyClick(window.data(), Qt::Key_Right); - QTRY_VERIFY(alignmentSubMenu->isOpened()); - QTest::keyClick(window.data(), Qt::Key_Right); - QTRY_VERIFY(horizontalSubMenu->isOpened()); - - // repeat escape to close the whole chain of menus one by one - QTest::keyClick(window.data(), Qt::Key_Escape); - QTRY_VERIFY(!horizontalSubMenu->isVisible()); - QVERIFY(viewMenuBarItem->isHighlighted()); - QVERIFY(viewMenuBarMenu->isVisible()); - QVERIFY(alignmentSubMenu->isVisible()); - - QTest::keyClick(window.data(), Qt::Key_Escape); - QTRY_VERIFY(!alignmentSubMenu->isVisible()); - QVERIFY(viewMenuBarItem->isHighlighted()); - QVERIFY(viewMenuBarMenu->isVisible()); - - QTest::keyClick(window.data(), Qt::Key_Escape); - QVERIFY(!viewMenuBarItem->isHighlighted()); - QTRY_VERIFY(!viewMenuBarMenu->isVisible()); -} - -void tst_qquickmenubar::mnemonics() -{ -#ifdef Q_OS_MACOS - QSKIP("Mnemonics are not used on macOS"); -#endif - - QQmlApplicationEngine engine(testFileUrl("menubar.qml")); - - QScopedPointer window(qobject_cast(engine.rootObjects().value(0))); - QVERIFY(window); - - centerOnScreen(window.data()); - moveMouseAway(window.data()); - QVERIFY(QTest::qWaitForWindowActive(window.data())); - - QQuickMenuBar *menuBar = window->property("header").value(); - QVERIFY(menuBar); - - QQuickMenu *fileMenuBarMenu = menuBar->menuAt(0); - QQuickMenu *editMenuBarMenu = menuBar->menuAt(1); - QQuickMenu *viewMenuBarMenu = menuBar->menuAt(2); - QQuickMenu *helpMenuBarMenu = menuBar->menuAt(3); - QVERIFY(fileMenuBarMenu && editMenuBarMenu && viewMenuBarMenu && helpMenuBarMenu); - - QQuickMenuBarItem *fileMenuBarItem = qobject_cast(fileMenuBarMenu->parentItem()); - QQuickMenuBarItem *editMenuBarItem = qobject_cast(editMenuBarMenu->parentItem()); - QQuickMenuBarItem *viewMenuBarItem = qobject_cast(viewMenuBarMenu->parentItem()); - QQuickMenuBarItem *helpMenuBarItem = qobject_cast(helpMenuBarMenu->parentItem()); - QVERIFY(fileMenuBarItem && editMenuBarItem && viewMenuBarItem && helpMenuBarItem); - - // trigger a menubar item to open a menu - QTest::keyClick(window.data(), Qt::Key_E, Qt::AltModifier); // "&Edit" - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(!editMenuBarItem->hasActiveFocus()); - QVERIFY(editMenuBarMenu->isVisible()); - QTRY_VERIFY(editMenuBarMenu->isOpened()); - QVERIFY(editMenuBarMenu->hasActiveFocus()); - - // re-trigger a menubar item to hide the menu - QTest::keyClick(window.data(), Qt::Key_E, Qt::AltModifier); // "&Edit" - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(editMenuBarItem->hasActiveFocus()); - QVERIFY(!editMenuBarMenu->hasActiveFocus()); - QTRY_VERIFY(!editMenuBarMenu->isVisible()); - - // re-trigger a menubar item to show the menu again - QTest::keyClick(window.data(), Qt::Key_E, Qt::AltModifier); // "&Edit" - QVERIFY(editMenuBarItem->isHighlighted()); - QVERIFY(editMenuBarMenu->isVisible()); - QTRY_VERIFY(editMenuBarMenu->isOpened()); - QVERIFY(editMenuBarMenu->hasActiveFocus()); - QVERIFY(!editMenuBarItem->hasActiveFocus()); - - // trigger another menubar item to open another menu - QTest::keyClick(window.data(), Qt::Key_H, Qt::AltModifier); // "&Help" - QVERIFY(!editMenuBarItem->isHighlighted()); - QVERIFY(helpMenuBarItem->isHighlighted()); - QVERIFY(!viewMenuBarMenu->isVisible()); - QVERIFY(helpMenuBarMenu->isVisible()); - QTRY_VERIFY(helpMenuBarMenu->isOpened()); - - // trigger a menu item to close the menu - QTest::keyClick(window.data(), Qt::Key_A, Qt::AltModifier); // "&About" - QVERIFY(!helpMenuBarItem->isHighlighted()); - QTRY_VERIFY(!helpMenuBarMenu->isVisible()); - - // trigger a menubar item to open a menu - QTest::keyClick(window.data(), Qt::Key_V, Qt::AltModifier); // "&View" - QVERIFY(!editMenuBarItem->isHighlighted()); - QVERIFY(viewMenuBarItem->isHighlighted()); - QVERIFY(viewMenuBarMenu->isVisible()); - QTRY_VERIFY(viewMenuBarMenu->isOpened()); - - // trigger a menu item to open a sub-menu - QQuickMenuItem *alignmentSubMenuItem = qobject_cast(viewMenuBarMenu->itemAt(0)); - QVERIFY(alignmentSubMenuItem); - QQuickMenu *alignmentSubMenu = alignmentSubMenuItem->subMenu(); - QVERIFY(alignmentSubMenu); - QTest::keyClick(window.data(), Qt::Key_A, Qt::AltModifier); // "&Alignment" - QVERIFY(viewMenuBarMenu->isVisible()); - QVERIFY(alignmentSubMenu->isVisible()); - QTRY_VERIFY(alignmentSubMenu->isOpened()); - - // trigger a menu item to open a sub-sub-menu - QQuickMenuItem *verticalSubMenuItem = qobject_cast(alignmentSubMenu->itemAt(1)); - QVERIFY(verticalSubMenuItem); - QQuickMenu *verticalSubMenu = verticalSubMenuItem->subMenu(); - QVERIFY(verticalSubMenu); - QTest::keyClick(window.data(), Qt::Key_V, Qt::AltModifier); // "&Vertical" - QVERIFY(viewMenuBarMenu->isVisible()); - QVERIFY(alignmentSubMenu->isVisible()); - QVERIFY(verticalSubMenu->isVisible()); - QTRY_VERIFY(verticalSubMenu->isOpened()); - - // trigger a menu item to close the whole chain of menus - QTest::keyClick(window.data(), Qt::Key_C, Qt::AltModifier); // "&Center" - QVERIFY(!viewMenuBarItem->isHighlighted()); - QTRY_VERIFY(!viewMenuBarMenu->isVisible()); - QTRY_VERIFY(!alignmentSubMenu->isVisible()); - QTRY_VERIFY(!verticalSubMenu->isVisible()); -} - -void tst_qquickmenubar::addRemove() -{ - QQmlApplicationEngine engine(testFileUrl("empty.qml")); - - QScopedPointer menuBar(qobject_cast(engine.rootObjects().value(0))); - QVERIFY(menuBar); - - QQmlComponent component(&engine); - component.setData("import QtQuick.Controls 2.0; Menu { }", QUrl()); - - QPointer menu1(qobject_cast(component.create())); - QVERIFY(!menu1.isNull()); - menuBar->addMenu(menu1.data()); - QCOMPARE(menuBar->count(), 1); - QCOMPARE(menuBar->menuAt(0), menu1.data()); - - QPointer menuBarItem1(qobject_cast(menuBar->itemAt(0))); - QVERIFY(menuBarItem1); - QCOMPARE(menuBarItem1->menu(), menu1.data()); - QCOMPARE(menuBar->itemAt(0), menuBarItem1.data()); - - QScopedPointer menu2(qobject_cast(component.create())); - QVERIFY(!menu2.isNull()); - menuBar->insertMenu(0, menu2.data()); - QCOMPARE(menuBar->count(), 2); - QCOMPARE(menuBar->menuAt(0), menu2.data()); - QCOMPARE(menuBar->menuAt(1), menu1.data()); - - QPointer menuBarItem2(qobject_cast(menuBar->itemAt(0))); - QVERIFY(menuBarItem2); - QCOMPARE(menuBarItem2->menu(), menu2.data()); - QCOMPARE(menuBar->itemAt(0), menuBarItem2.data()); - QCOMPARE(menuBar->itemAt(1), menuBarItem1.data()); - - // takeMenu(int) does not destroy the menu, but does destroy the respective item in the menubar - QCOMPARE(menuBar->takeMenu(1), menu1.data()); - QCOMPARE(menuBar->count(), 1); - QVERIFY(!menuBar->menuAt(1)); - QVERIFY(!menuBar->itemAt(1)); - QCoreApplication::sendPostedEvents(menu1.data(), QEvent::DeferredDelete); - QVERIFY(!menu1.isNull()); - QCoreApplication::sendPostedEvents(menuBarItem1, QEvent::DeferredDelete); - QVERIFY(menuBarItem1.isNull()); - - // addMenu(Menu) re-creates the respective item in the menubar - menuBar->addMenu(menu1.data()); - QCOMPARE(menuBar->count(), 2); - menuBarItem1 = qobject_cast(menuBar->itemAt(1)); - QVERIFY(!menuBarItem1.isNull()); - - // removeMenu(Menu) destroys both the menu and the respective item in the menubar - menuBar->removeMenu(menu1.data()); - QCOMPARE(menuBar->count(), 1); - QVERIFY(!menuBar->itemAt(1)); - QCoreApplication::sendPostedEvents(menu1.data(), QEvent::DeferredDelete); - QVERIFY(menu1.isNull()); - QCoreApplication::sendPostedEvents(menuBarItem1, QEvent::DeferredDelete); - QVERIFY(menuBarItem1.isNull()); -} - -QTEST_QUICKCONTROLS_MAIN(tst_qquickmenubar) - -#include "tst_qquickmenubar.moc" Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/foo@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/foo@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/foo@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/foo@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/foo@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/foo@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/foo.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/foo.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-all@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-all@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-all@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-all@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-all@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-all@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-all.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-all.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-bottomright@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-bottomright@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-bottomright@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-bottomright@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-bottomright@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-bottomright@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-bottomright.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-bottomright.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-topleft@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-topleft@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-topleft@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-topleft@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-topleft@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-topleft@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/inset-topleft.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/inset-topleft.9.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/ninepatchimage.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/ninepatchimage.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/ninepatchimage.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/ninepatchimage.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Imagine.impl 2.12 - -NinePatchImage { -} Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/padding@2x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/padding@2x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/padding@3x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/padding@3x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/padding@4x.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/padding@4x.9.png differ Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/data/padding.9.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/data/padding.9.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/qquickninepatchimage.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/qquickninepatchimage.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/qquickninepatchimage.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/qquickninepatchimage.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -CONFIG += testcase -macos:CONFIG -= app_bundle -TARGET = tst_qquickninepatchimage - -QT += core gui qml quick testlib -QT_PRIVATE += gui-private quick-private quickcontrols2-private - -include (../shared/util.pri) - -SOURCES += tst_qquickninepatchimage.cpp - -TESTDATA += \ - $$PWD/data/*.qml \ - $$PWD/data/*.png diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/tst_qquickninepatchimage.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/tst_qquickninepatchimage.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickninepatchimage/tst_qquickninepatchimage.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickninepatchimage/tst_qquickninepatchimage.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,254 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "../shared/util.h" -#include "../shared/visualtestutil.h" - -using namespace QQuickVisualTestUtil; - -class tst_qquickninepatchimage : public QQmlDataTest -{ - Q_OBJECT - -private slots: - void ninePatch_data(); - void ninePatch(); - void padding_data(); - void padding(); - void inset_data(); - void inset(); - void implicitSize_data(); - void implicitSize(); -}; - -static QImage grabItemToImage(QQuickItem *item) -{ - QSharedPointer result = item->grabToImage(); - QSignalSpy spy(result.data(), SIGNAL(ready())); - spy.wait(); - return result->image(); -} - -void tst_qquickninepatchimage::ninePatch_data() -{ - QTest::addColumn("dpr"); - QTest::addColumn("size"); - - // original size, downsized, stretched - const QList sizes = QList() - << QSize(40, 40) // original - << QSize(10, 40) // downsized (h) - << QSize(40, 10) // downsized (v) - << QSize(10, 10) // downsized (h & v) - << QSize(80, 40) // stretched (h) - << QSize(40, 80) // stretched (v) - << QSize(80, 80) // stretched (h & v) - << QSize(8, 8); // minimal (borders only) - - for (const QSize &sz : sizes) { - for (int dpr = 1; dpr <= 4; ++dpr) - QTest::newRow(qPrintable(QString::fromLatin1("DPR=%1, %2x%3").arg(dpr).arg(sz.width()).arg(sz.height()))) << dpr << sz; - } -} - -void tst_qquickninepatchimage::ninePatch() -{ - QFETCH(int, dpr); - QFETCH(QSize, size); - - QHighDpiScaling::setGlobalFactor(dpr); - - QQuickView view(testFileUrl("ninepatchimage.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickImage *ninePatchImage = qobject_cast(view.rootObject()); - QVERIFY(ninePatchImage); - ninePatchImage->setSource(testFileUrl("foo.9.png")); - ninePatchImage->setSize(size); - - const QImage ninePatchImageGrab = grabItemToImage(ninePatchImage).scaled(size * dpr); - - // Generate an image to compare against the actual 9-patch image. - QImage generatedImage(size * dpr, ninePatchImageGrab.format()); - generatedImage.fill(Qt::red); - - QImage blueRect(4 * dpr, 4 * dpr, ninePatchImageGrab.format()); - blueRect.fill(Qt::blue); - - QPainter painter(&generatedImage); - // Top-left - painter.drawImage(0, 0, blueRect); - // Top-right - painter.drawImage(generatedImage.width() - blueRect.width(), 0, blueRect); - // Bottom-right - painter.drawImage(generatedImage.width() - blueRect.width(), generatedImage.height() - blueRect.height(), blueRect); - // Bottom-left - painter.drawImage(0, generatedImage.height() - blueRect.height(), blueRect); - - if ((QGuiApplication::platformName() == QLatin1String("offscreen")) - || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Grabbing does not work on offscreen/minimal platforms", Abort); - - QCOMPARE(ninePatchImageGrab, generatedImage); -} - -void tst_qquickninepatchimage::padding_data() -{ - QTest::addColumn("dpr"); - - for (int dpr = 1; dpr <= 4; ++dpr) - QTest::newRow(qPrintable(QString::fromLatin1("DPR=%1").arg(dpr))) << dpr; -} - -void tst_qquickninepatchimage::padding() -{ - QFETCH(int, dpr); - - QHighDpiScaling::setGlobalFactor(dpr); - - QQuickView view(testFileUrl("ninepatchimage.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickImage *ninePatchImage = qobject_cast(view.rootObject()); - QVERIFY(ninePatchImage); - ninePatchImage->setSource(testFileUrl("padding.9.png")); - - QCOMPARE(ninePatchImage->property("topPadding").toReal(), 8); - QCOMPARE(ninePatchImage->property("leftPadding").toReal(), 18); - QCOMPARE(ninePatchImage->property("rightPadding").toReal(), 20); - QCOMPARE(ninePatchImage->property("bottomPadding").toReal(), 10); -} - -void tst_qquickninepatchimage::inset_data() -{ - QTest::addColumn("dpr"); - QTest::addColumn("file"); - QTest::addColumn("insets"); - - const QStringList files = QStringList() << "inset-all.9.png" << "inset-topleft.9.png" << "inset-bottomright.9.png"; - const QList insets = QList() << QMarginsF(2, 1, 3, 4) << QMarginsF(2, 1, 0, 0) << QMarginsF(0, 0, 3, 4); - - for (int i = 0; i < files.count(); ++i) { - QString file = files.at(i); - for (int dpr = 1; dpr <= 4; ++dpr) - QTest::newRow(qPrintable(QString::fromLatin1("%1 DPR=%2").arg(file).arg(dpr))) << dpr << file << insets.at(i); - } -} - -Q_DECLARE_METATYPE(QMarginsF) - -void tst_qquickninepatchimage::inset() -{ - QFETCH(int, dpr); - QFETCH(QString, file); - QFETCH(QMarginsF, insets); - - QHighDpiScaling::setGlobalFactor(dpr); - - QQuickView view(testFileUrl("ninepatchimage.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickImage *ninePatchImage = qobject_cast(view.rootObject()); - QVERIFY(ninePatchImage); - ninePatchImage->setSource(testFileUrl(file)); - - QCOMPARE(ninePatchImage->property("topInset").toReal(), insets.top()); - QCOMPARE(ninePatchImage->property("leftInset").toReal(), insets.left()); - QCOMPARE(ninePatchImage->property("rightInset").toReal(), insets.right()); - QCOMPARE(ninePatchImage->property("bottomInset").toReal(), insets.bottom()); -} - -void tst_qquickninepatchimage::implicitSize_data() -{ - QTest::addColumn("dpr"); - QTest::addColumn("file"); - QTest::addColumn("implicitSize"); - - const struct TestFile { - QString name; - QSizeF sizeHint; - } testFiles [] = { - { "foo.9.png", QSizeF(40, 40) }, - { "padding.9.png", QSizeF(40, 40) }, - { "inset-all.9.png", QSizeF(45, 45) }, - { "inset-topleft.9.png", QSizeF(42, 41) }, - { "inset-bottomright.9.png", QSizeF(43, 44) } - }; - - for (const TestFile &file : testFiles) { - for (int dpr = 1; dpr <= 4; ++dpr) - QTest::newRow(qPrintable(QString::fromLatin1("%1 DPR=%2").arg(file.name).arg(dpr))) << dpr << file.name << file.sizeHint; - } -} - -void tst_qquickninepatchimage::implicitSize() -{ - QFETCH(int, dpr); - QFETCH(QString, file); - QFETCH(QSizeF, implicitSize); - - QHighDpiScaling::setGlobalFactor(dpr); - - QQuickView view(testFileUrl("ninepatchimage.qml")); - QCOMPARE(view.status(), QQuickView::Ready); - view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); - - QQuickImage *ninePatchImage = qobject_cast(view.rootObject()); - QVERIFY(ninePatchImage); - ninePatchImage->setSource(testFileUrl(file)); - - QCOMPARE(ninePatchImage->implicitWidth(), implicitSize.width()); - QCOMPARE(ninePatchImage->implicitHeight(), implicitSize.height()); -} - -QTEST_MAIN(tst_qquickninepatchimage) - -#include "tst_qquickninepatchimage.moc" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/activeFocusOnClose1.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/activeFocusOnClose1.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/activeFocusOnClose1.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/activeFocusOnClose1.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/activeFocusOnClose2.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/activeFocusOnClose2.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/activeFocusOnClose2.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/activeFocusOnClose2.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/activeFocusOnClose3.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/activeFocusOnClose3.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/activeFocusOnClose3.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/activeFocusOnClose3.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/applicationwindow-hover.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/applicationwindow-hover.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/applicationwindow-hover.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/applicationwindow-hover.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/applicationwindow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/applicationwindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/applicationwindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/applicationwindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/applicationwindow-wheel.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/applicationwindow-wheel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/applicationwindow-wheel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/applicationwindow-wheel.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/cursor.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/cursor.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/cursor.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/cursor.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/dialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/dialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 - -Item { - width: 400 - height: 400 - objectName: "Rectangle" - - property alias dialog: dialog - - Dialog { - id: dialog - objectName: "Dialog" - width: 200 - height: 200 - anchors.centerIn: parent - visible: true - - Component.onCompleted: { - background.objectName = "DialogBackground" - contentItem.objectName = "DialogContentItem" - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/disabledPalette.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/disabledPalette.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/disabledPalette.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/disabledPalette.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -ApplicationWindow { - width: 400 - height: 400 - - property alias popup: popup - - function disableOverlay() { - popup.Overlay.overlay.enabled = false - } - - Popup { - id: popup - width: 200 - height: 200 - background: Rectangle { - color: popup.palette.base - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/grabber.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/grabber.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/grabber.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/grabber.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/nested.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/nested.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/nested.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/nested.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/orientation.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/orientation.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/orientation.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/orientation.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: 600 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/window-hover.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/window-hover.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/window-hover.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/window-hover.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/window.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/window.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/window.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/window.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/window-wheel.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/window-wheel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/data/window-wheel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/data/window-wheel.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/tst_qquickpopup.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/tst_qquickpopup.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickpopup/tst_qquickpopup.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickpopup/tst_qquickpopup.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -38,13 +38,10 @@ #include #include "../shared/util.h" #include "../shared/visualtestutil.h" -#include "../shared/qtest_quickcontrols.h" #include -#include #include #include -#include #include #include #include @@ -82,12 +79,8 @@ void cursorShape(); void componentComplete(); void closeOnEscapeWithNestedPopups(); - void enabled(); void orientation_data(); void orientation(); - void qquickview(); - void disabledPalette(); - void disabledParentPalette(); }; void tst_QQuickPopup::initTestCase() @@ -125,7 +118,7 @@ QVERIFY(overlay->childItems().contains(popupItem)); popup->close(); - QTRY_VERIFY(!popup->isVisible()); + QVERIFY(!popup->isVisible()); QVERIFY(!overlay->childItems().contains(popupItem)); popup->setVisible(true); @@ -133,7 +126,7 @@ QVERIFY(overlay->childItems().contains(popupItem)); popup->setVisible(false); - QTRY_VERIFY(!popup->isVisible()); + QVERIFY(!popup->isVisible()); QVERIFY(!overlay->childItems().contains(popupItem)); } @@ -170,7 +163,7 @@ QCOMPARE(closedSpy.count(), 0); popup->close(); - QTRY_COMPARE(visibleChangedSpy.count(), 2); + QCOMPARE(visibleChangedSpy.count(), 2); QCOMPARE(aboutToShowSpy.count(), 1); QCOMPARE(aboutToHideSpy.count(), 1); QCOMPARE(openedSpy.count(), 1); @@ -224,15 +217,6 @@ QQuickPopup *popup = window->property("popup").value(); QVERIFY(popup); - QQuickOverlayAttached *overlayAttached = qobject_cast(qmlAttachedPropertiesObject(popup)); - QVERIFY(overlayAttached); - QCOMPARE(overlayAttached->overlay(), overlay); - - QSignalSpy overlayAttachedPressedSignal(overlayAttached, SIGNAL(pressed())); - QSignalSpy overlayAttachedReleasedSignal(overlayAttached, SIGNAL(released())); - QVERIFY(overlayAttachedPressedSignal.isValid()); - QVERIFY(overlayAttachedReleasedSignal.isValid()); - QQuickButton *button = window->property("button").value(); QVERIFY(button); @@ -242,22 +226,18 @@ popup->open(); QVERIFY(popup->isVisible()); QVERIFY(overlay->isVisible()); - QTRY_VERIFY(popup->isOpened()); QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); QCOMPARE(overlayPressedSignal.count(), ++overlayPressCount); QCOMPARE(overlayReleasedSignal.count(), overlayReleaseCount); - QCOMPARE(overlayAttachedPressedSignal.count(), overlayPressCount); - QCOMPARE(overlayAttachedReleasedSignal.count(), overlayReleaseCount); - - QTRY_VERIFY(!popup->isVisible()); - QVERIFY(!overlay->isVisible()); QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); QCOMPARE(overlayPressedSignal.count(), overlayPressCount); QCOMPARE(overlayReleasedSignal.count(), overlayReleaseCount); // no modal-popups open - QCOMPARE(overlayAttachedPressedSignal.count(), overlayPressCount); - QCOMPARE(overlayAttachedReleasedSignal.count(), overlayReleaseCount); + + popup->close(); + QVERIFY(!popup->isVisible()); + QVERIFY(!overlay->isVisible()); popup->setDim(dim); popup->setModal(modal); @@ -267,22 +247,17 @@ popup->open(); QVERIFY(popup->isVisible()); QVERIFY(overlay->isVisible()); - QTRY_VERIFY(popup->isOpened()); QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); QCOMPARE(overlayPressedSignal.count(), ++overlayPressCount); QCOMPARE(overlayReleasedSignal.count(), overlayReleaseCount); - QCOMPARE(overlayAttachedPressedSignal.count(), overlayPressCount); - QCOMPARE(overlayAttachedReleasedSignal.count(), overlayReleaseCount); QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); QCOMPARE(overlayPressedSignal.count(), overlayPressCount); QCOMPARE(overlayReleasedSignal.count(), ++overlayReleaseCount); - QCOMPARE(overlayAttachedPressedSignal.count(), overlayPressCount); - QCOMPARE(overlayAttachedReleasedSignal.count(), overlayReleaseCount); - QTRY_VERIFY(!popup->isVisible()); - QVERIFY(!overlay->isVisible()); + QVERIFY(!popup->isVisible()); + QCOMPARE(overlay->isVisible(), popup->isVisible()); // touch popup->open(); @@ -305,17 +280,13 @@ QTest::touchEvent(window, device.data()).press(0, QPoint(1, 1)); QCOMPARE(overlayPressedSignal.count(), ++overlayPressCount); QCOMPARE(overlayReleasedSignal.count(), overlayReleaseCount); - QCOMPARE(overlayAttachedPressedSignal.count(), overlayPressCount); - QCOMPARE(overlayAttachedReleasedSignal.count(), overlayReleaseCount); QTest::touchEvent(window, device.data()).release(0, QPoint(1, 1)); QCOMPARE(overlayPressedSignal.count(), overlayPressCount); QCOMPARE(overlayReleasedSignal.count(), ++overlayReleaseCount); - QCOMPARE(overlayAttachedPressedSignal.count(), overlayPressCount); - QCOMPARE(overlayAttachedReleasedSignal.count(), overlayReleaseCount); - QTRY_VERIFY(!popup->isVisible()); - QVERIFY(!overlay->isVisible()); + QVERIFY(!popup->isVisible()); + QCOMPARE(overlay->isVisible(), popup->isVisible()); // multi-touch popup->open(); @@ -338,7 +309,7 @@ QCOMPARE(overlayReleasedSignal.count(), overlayReleaseCount); QTest::touchEvent(window, device.data()).release(0, button->mapToScene(QPointF(1, 1)).toPoint()).stationary(1); - QTRY_VERIFY(!popup->isVisible()); + QVERIFY(!popup->isVisible()); QVERIFY(!overlay->isVisible()); QVERIFY(!button->isPressed()); QCOMPARE(overlayPressedSignal.count(), overlayPressCount); @@ -385,12 +356,12 @@ QVERIFY(popup->isVisible()); QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); - QTRY_VERIFY(!popup2->isVisible()); + QVERIFY(!popup2->isVisible()); QVERIFY(popup->isVisible()); QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); QVERIFY(!popup2->isVisible()); - QTRY_VERIFY(!popup->isVisible()); + QVERIFY(!popup->isVisible()); } void tst_QQuickPopup::windowChange() @@ -416,28 +387,6 @@ popup.setParentItem(window.contentItem()); QCOMPARE(popup.window(), &window); QCOMPARE(spy.count(), 3); - - popup.resetParentItem(); - QVERIFY(!popup.window()); - QCOMPARE(spy.count(), 4); - - popup.setParent(&window); - popup.resetParentItem(); - QCOMPARE(popup.window(), &window); - QCOMPARE(spy.count(), 5); - - popup.setParent(this); - popup.resetParentItem(); - QVERIFY(!popup.window()); - QCOMPARE(spy.count(), 6); - - item.setParentItem(window.contentItem()); - popup.setParent(&item); - popup.resetParentItem(); - QCOMPARE(popup.window(), &window); - QCOMPARE(spy.count(), 7); - - popup.setParent(nullptr); } Q_DECLARE_METATYPE(QQuickPopup::ClosePolicy) @@ -490,55 +439,49 @@ popup->open(); QVERIFY(popup->isVisible()); - QTRY_VERIFY(popup->isOpened()); // press outside popup and its parent QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); if (closePolicy.testFlag(QQuickPopup::CloseOnPressOutside) || closePolicy.testFlag(QQuickPopup::CloseOnPressOutsideParent)) - QTRY_VERIFY(!popup->isVisible()); + QVERIFY(!popup->isVisible()); else QVERIFY(popup->isVisible()); popup->open(); QVERIFY(popup->isVisible()); - QTRY_VERIFY(popup->isOpened()); // release outside popup and its parent QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); if (closePolicy.testFlag(QQuickPopup::CloseOnReleaseOutside)) - QTRY_VERIFY(!popup->isVisible()); + QVERIFY(!popup->isVisible()); else QVERIFY(popup->isVisible()); popup->open(); QVERIFY(popup->isVisible()); - QTRY_VERIFY(popup->isOpened()); // press outside popup but inside its parent - QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x() + 1, button->y() + 1)); + QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x(), button->y())); if (closePolicy.testFlag(QQuickPopup::CloseOnPressOutside) && !closePolicy.testFlag(QQuickPopup::CloseOnPressOutsideParent)) - QTRY_VERIFY(!popup->isVisible()); + QVERIFY(!popup->isVisible()); else QVERIFY(popup->isVisible()); popup->open(); QVERIFY(popup->isVisible()); - QTRY_VERIFY(popup->isOpened()); // release outside popup but inside its parent - QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x() + 1, button->y() + 1)); + QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x(), button->y())); if (closePolicy.testFlag(QQuickPopup::CloseOnReleaseOutside) && !closePolicy.testFlag(QQuickPopup::CloseOnReleaseOutsideParent)) - QTRY_VERIFY(!popup->isVisible()); + QVERIFY(!popup->isVisible()); else QVERIFY(popup->isVisible()); popup->open(); QVERIFY(popup->isVisible()); - QTRY_VERIFY(popup->isOpened()); // press inside and release outside - QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x() + popup->x() + 1, - button->y() + popup->y() + 1)); + QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x() + popup->x(), button->y() + popup->y())); QVERIFY(popup->isVisible()); QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1)); QVERIFY(popup->isVisible()); @@ -546,7 +489,7 @@ // escape QTest::keyClick(window, Qt::Key_Escape); if (closePolicy.testFlag(QQuickPopup::CloseOnEscape)) - QTRY_VERIFY(!popup->isVisible()); + QVERIFY(!popup->isVisible()); else QVERIFY(popup->isVisible()); } @@ -569,27 +512,24 @@ focusedPopup->open(); QVERIFY(focusedPopup->isVisible()); - QTRY_VERIFY(focusedPopup->isOpened()); QVERIFY(focusedPopup->hasActiveFocus()); nonFocusedPopup->open(); QVERIFY(nonFocusedPopup->isVisible()); - QTRY_VERIFY(nonFocusedPopup->isOpened()); QVERIFY(focusedPopup->hasActiveFocus()); nonFocusedPopup->close(); - QTRY_VERIFY(!nonFocusedPopup->isVisible()); + QVERIFY(!nonFocusedPopup->isVisible()); QVERIFY(focusedPopup->hasActiveFocus()); // QTBUG-66113: force active focus on a popup that did not request focus nonFocusedPopup->open(); nonFocusedPopup->forceActiveFocus(); QVERIFY(nonFocusedPopup->isVisible()); - QTRY_VERIFY(nonFocusedPopup->isOpened()); QVERIFY(nonFocusedPopup->hasActiveFocus()); nonFocusedPopup->close(); - QTRY_VERIFY(!nonFocusedPopup->isVisible()); + QVERIFY(!nonFocusedPopup->isVisible()); QVERIFY(focusedPopup->hasActiveFocus()); } @@ -615,18 +555,16 @@ popup1->open(); QVERIFY(popup1->isVisible()); - QTRY_VERIFY(popup1->isOpened()); QVERIFY(popup1->hasActiveFocus()); popup2->open(); QVERIFY(popup2->isVisible()); - QTRY_VERIFY(popup2->isOpened()); QVERIFY(popup2->hasActiveFocus()); // Causes popup1.contentItem.forceActiveFocus() to be called, then closes popup2. QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, closePopup2Button->mapToScene(QPointF(closePopup2Button->width() / 2, closePopup2Button->height() / 2)).toPoint()); - QTRY_VERIFY(!popup2->isVisible()); + QVERIFY(!popup2->isVisible()); QVERIFY(popup1->hasActiveFocus()); } @@ -712,7 +650,7 @@ QVERIFY(!childButton->isHovered()); // hover the child button in a popup - QTest::mouseMove(window, QPoint(popup->x() + popup->width() / 2, popup->y() + popup->height() / 2)); + QTest::mouseMove(window, QPoint(2, 2)); QVERIFY(!parentButton->isHovered()); QVERIFY(childButton->isHovered()); @@ -862,35 +800,35 @@ QVERIFY(combo); menu->open(); - QTRY_COMPARE(menu->isOpened(), true); + QCOMPARE(menu->isVisible(), true); QCOMPARE(popup->isVisible(), false); QCOMPARE(combo->isVisible(), false); // click a menu item to open the popup QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(menu->width() / 2, menu->height() / 2)); - QTRY_COMPARE(menu->isVisible(), false); - QTRY_COMPARE(popup->isOpened(), true); + QCOMPARE(menu->isVisible(), false); + QCOMPARE(popup->isVisible(), true); QCOMPARE(combo->isVisible(), false); combo->open(); QCOMPARE(menu->isVisible(), false); QCOMPARE(popup->isVisible(), true); - QTRY_COMPARE(combo->isOpened(), true); + QCOMPARE(combo->isVisible(), true); // click outside to close both the combo popup and the parent popup QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - 1, window->height() - 1)); QCOMPARE(menu->isVisible(), false); - QTRY_COMPARE(popup->isVisible(), false); - QTRY_COMPARE(combo->isVisible(), false); + QCOMPARE(popup->isVisible(), false); + QCOMPARE(combo->isVisible(), false); menu->open(); - QTRY_COMPARE(menu->isOpened(), true); + QCOMPARE(menu->isVisible(), true); QCOMPARE(popup->isVisible(), false); QCOMPARE(combo->isVisible(), false); // click outside the menu to close it (QTBUG-56697) QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - 1, window->height() - 1)); - QTRY_COMPARE(menu->isVisible(), false); + QCOMPARE(menu->isVisible(), false); QCOMPARE(popup->isVisible(), false); QCOMPARE(combo->isVisible(), false); } @@ -909,18 +847,17 @@ popup->open(); QVERIFY(popup->isVisible()); - QTRY_VERIFY(popup->isOpened()); QQuickItem *textField = helper.appWindow->property("textField").value(); QVERIFY(textField); // Move the mouse over the text field. - const QPoint textFieldPos(popup->x() - 10, textField->height() / 2); + const QPoint textFieldPos(popup->x() - 10, popup->y() + popup->height() / 2); QTest::mouseMove(window, textFieldPos); QCOMPARE(window->cursor().shape(), textField->cursor().shape()); // Move the mouse over the popup where it overlaps with the text field. - const QPoint textFieldOverlapPos(popup->x() + 10, textField->height() / 2); + const QPoint textFieldOverlapPos(popup->x() + 10, popup->y() + popup->height() / 2); QTest::mouseMove(window, textFieldOverlapPos); QCOMPARE(window->cursor().shape(), popup->popupItem()->cursor().shape()); @@ -1015,26 +952,6 @@ QCOMPARE(stackView->depth(), 1); } -void tst_QQuickPopup::enabled() -{ - QQuickPopup popup; - QVERIFY(popup.isEnabled()); - QVERIFY(popup.popupItem()->isEnabled()); - - QSignalSpy enabledSpy(&popup, &QQuickPopup::enabledChanged); - QVERIFY(enabledSpy.isValid()); - - popup.setEnabled(false); - QVERIFY(!popup.isEnabled()); - QVERIFY(!popup.popupItem()->isEnabled()); - QCOMPARE(enabledSpy.count(), 1); - - popup.popupItem()->setEnabled(true); - QVERIFY(popup.isEnabled()); - QVERIFY(popup.popupItem()->isEnabled()); - QCOMPARE(enabledSpy.count(), 2); -} - void tst_QQuickPopup::orientation_data() { QTest::addColumn("orientation"); @@ -1065,112 +982,6 @@ QCOMPARE(popup->popupItem()->position(), position); } -void tst_QQuickPopup::qquickview() -{ - QQuickView view; - view.setObjectName("QQuickView"); - view.resize(400, 400); - view.setSource(testFileUrl("dialog.qml")); - QVERIFY(view.status() != QQuickView::Error); - view.contentItem()->setObjectName("QQuickViewContentItem"); - view.show(); - - QQuickDialog *dialog = view.rootObject()->property("dialog").value(); - QVERIFY(dialog); - QTRY_COMPARE(dialog->property("opened").toBool(), true); - - dialog->close(); - QTRY_COMPARE(dialog->property("visible").toBool(), false); - - // QTBUG-72746: shouldn't crash on application exit after closing a Dialog when using QQuickView. -} - -// TODO: also test it out without setting enabled directly on menu, but on a parent - -// QTBUG-73447 -void tst_QQuickPopup::disabledPalette() -{ - QQuickApplicationHelper helper(this, "disabledPalette.qml"); - - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickPopup *popup = window->property("popup").value(); - QVERIFY(popup); - - QSignalSpy popupEnabledSpy(popup, SIGNAL(enabledChanged())); - QVERIFY(popupEnabledSpy.isValid()); - QSignalSpy popupPaletteSpy(popup, SIGNAL(paletteChanged())); - QVERIFY(popupPaletteSpy.isValid()); - - QSignalSpy popupItemEnabledSpy(popup->popupItem(), SIGNAL(enabledChanged())); - QVERIFY(popupItemEnabledSpy.isValid()); - QSignalSpy popupItemPaletteSpy(popup->popupItem(), SIGNAL(paletteChanged())); - QVERIFY(popupItemPaletteSpy.isValid()); - - QPalette palette = popup->palette(); - palette.setColor(QPalette::Active, QPalette::Base, Qt::green); - palette.setColor(QPalette::Disabled, QPalette::Base, Qt::red); - popup->setPalette(palette); - QCOMPARE(popupPaletteSpy.count(), 1); - QCOMPARE(popupItemPaletteSpy.count(), 1); - QCOMPARE(popup->background()->property("color").value(), Qt::green); - - popup->setEnabled(false); - QCOMPARE(popupEnabledSpy.count(), 1); - QCOMPARE(popupItemEnabledSpy.count(), 1); - QCOMPARE(popupPaletteSpy.count(), 2); - QCOMPARE(popupItemPaletteSpy.count(), 2); - QCOMPARE(popup->background()->property("color").value(), Qt::red); -} - -void tst_QQuickPopup::disabledParentPalette() -{ - QQuickApplicationHelper helper(this, "disabledPalette.qml"); - - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - QQuickPopup *popup = window->property("popup").value(); - QVERIFY(popup); - - QSignalSpy popupEnabledSpy(popup, SIGNAL(enabledChanged())); - QVERIFY(popupEnabledSpy.isValid()); - QSignalSpy popupPaletteSpy(popup, SIGNAL(paletteChanged())); - QVERIFY(popupPaletteSpy.isValid()); - - QSignalSpy popupItemEnabledSpy(popup->popupItem(), SIGNAL(enabledChanged())); - QVERIFY(popupItemEnabledSpy.isValid()); - QSignalSpy popupItemPaletteSpy(popup->popupItem(), SIGNAL(paletteChanged())); - QVERIFY(popupItemPaletteSpy.isValid()); - - QPalette palette = popup->palette(); - palette.setColor(QPalette::Active, QPalette::Base, Qt::green); - palette.setColor(QPalette::Disabled, QPalette::Base, Qt::red); - popup->setPalette(palette); - QCOMPARE(popupPaletteSpy.count(), 1); - QCOMPARE(popupItemPaletteSpy.count(), 1); - QCOMPARE(popup->background()->property("color").value(), Qt::green); - - // Disable the overlay (which is QQuickPopupItem's parent) to ensure that - // the palette is changed when the popup is indirectly disabled. - popup->open(); - QTRY_VERIFY(popup->isOpened()); - QVERIFY(QMetaObject::invokeMethod(window, "disableOverlay")); - QVERIFY(!popup->isEnabled()); - QVERIFY(!popup->popupItem()->isEnabled()); - QCOMPARE(popup->background()->property("color").value(), Qt::red); - QCOMPARE(popupEnabledSpy.count(), 1); - QCOMPARE(popupItemEnabledSpy.count(), 1); - QCOMPARE(popupPaletteSpy.count(), 2); - QCOMPARE(popupItemPaletteSpy.count(), 2); - - popup->close(); - QTRY_VERIFY(!popup->isVisible()); -} - -QTEST_QUICKCONTROLS_MAIN(tst_QQuickPopup) +QTEST_MAIN(tst_QQuickPopup) #include "tst_qquickpopup.moc" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/custom.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/custom.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/custom.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/custom.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -[Controls] -Style=:/Custom - -[Custom] -Font\PixelSize=3 -Palette\WindowText=#ff0000 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/default.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/default.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/default.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/default.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -[Controls] -Style=Default - -[Default] -Font\PixelSize=3 -Palette\WindowText=#ff0000 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/dependencies.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Control { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/DummyStyle/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/DummyStyle/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/DummyStyle/Button.qml 1970-01-01 00:00:00.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/DummyStyle/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -0,0 +1,2 @@ +import QtQuick.Templates 2.0 as T +T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -import QtQuick.Templates 2.12 as T -T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/fusion.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/fusion.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/fusion.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/fusion.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -[Controls] -Style=Fusion - -[Fusion] -Font\PixelSize=3 -Palette\WindowText=#ff0000 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/imagine.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/imagine.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/imagine.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/imagine.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -[Controls] -Style=Imagine - -[Imagine] -Font\PixelSize=3 -Palette\WindowText=#ff0000 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/material.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/material.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/material.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/material.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -[Controls] -Style=Material - -[Material] -Font\PixelSize=3 -Palette\WindowText=#ff0000 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/universal.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/universal.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/data/universal.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/data/universal.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -[Controls] -Style=Universal - -[Universal] -Font\PixelSize=3 -Palette\WindowText=#ff0000 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/qquickstyle.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/qquickstyle.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/qquickstyle.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/qquickstyle.pro 2018-03-21 07:59:29.000000000 +0000 @@ -7,22 +7,4 @@ QT += quickcontrols2 testlib QT_PRIVATE += core-private gui-private quickcontrols2-private -include (../shared/util.pri) - TESTDATA = $$PWD/data/* - -qrcStyles1.files = $$files(qrcStyles1/QrcStyle1/*.qml) -qrcStyles1.prefix = / -RESOURCES += qrcStyles1 - -qrcStyles2.files = $$files(qrcStyles2/QrcStyle2/*.qml) -qrcStyles2.prefix = / -RESOURCES += qrcStyles2 - -qrcStyles3.files = $$files(qrcStyles3/QrcStyle3/*.qml) -qrcStyles3.prefix = / -RESOURCES += qrcStyles3 - -qrcStyles4.files = $$files(qrcStyles4/QrcStyle4/*.qml) -qrcStyles4.prefix = / -RESOURCES += qrcStyles4 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -import QtQuick.Templates 2.12 as T -T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -import QtQuick.Templates 2.12 as T -T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -import QtQuick.Templates 2.12 as T -T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -import QtQuick.Templates 2.12 as T -T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/tst_qquickstyle.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/tst_qquickstyle.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyle/tst_qquickstyle.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyle/tst_qquickstyle.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -39,58 +39,26 @@ #include #include #include -#include -#include #include -#include "../shared/util.h" - -class tst_QQuickStyle : public QQmlDataTest +class tst_QQuickStyle : public QObject { Q_OBJECT private slots: - void cleanup(); + void init(); void lookup(); - void configurationFile_data(); - void configurationFile(); void commandLineArgument(); void environmentVariables(); void availableStyles(); - void qrcStylePaths_data(); - void qrcStylePaths(); - void qrcInQtQuickControlsStylePathEnvVar_data(); - void qrcInQtQuickControlsStylePathEnvVar(); - -private: - void loadControls(); - void unloadControls(); }; -void tst_QQuickStyle::cleanup() +void tst_QQuickStyle::init() { - unloadControls(); - + QQuickStylePrivate::reset(); QGuiApplicationPrivate::styleOverride.clear(); qunsetenv("QT_QUICK_CONTROLS_STYLE"); - qunsetenv("QT_QUICK_CONTROLS_STYLE_PATH"); qunsetenv("QT_QUICK_CONTROLS_FALLBACK_STYLE"); - qunsetenv("QT_QUICK_CONTROLS_CONF"); -} - -void tst_QQuickStyle::loadControls() -{ - QQmlEngine engine; - QQmlComponent component(&engine); - component.setData("import QtQuick 2.0; import QtQuick.Controls 2.1; Control { }", QUrl()); - - QScopedPointer object(component.create()); - QVERIFY2(!object.isNull(), qPrintable(component.errorString())); -} - -void tst_QQuickStyle::unloadControls() -{ - qmlClearTypeRegistrations(); } void tst_QQuickStyle::lookup() @@ -102,65 +70,20 @@ QCOMPARE(QQuickStyle::name(), QString("Material")); QVERIFY(!QQuickStyle::path().isEmpty()); - loadControls(); + QQmlEngine engine; + QQmlComponent component(&engine); + component.setData("import QtQuick 2.0; import QtQuick.Controls 2.1; Control { }", QUrl()); - // The font size for editors in the (default) Normal variant is 16. - // If this is wrong, the style plugin may not have been loaded. - QCOMPARE(QQuickTheme::instance()->font(QQuickTheme::TextArea).pixelSize(), 16); + QScopedPointer object(component.create()); + QVERIFY(!object.isNull()); QCOMPARE(QQuickStyle::name(), QString("Material")); QVERIFY(!QQuickStyle::path().isEmpty()); } -void tst_QQuickStyle::configurationFile_data() -{ - QTest::addColumn("fileName"); - QTest::addColumn("expectedStyle"); - QTest::addColumn("expectedPath"); - - QTest::newRow("Default") << "default.conf" << "Default" << ""; - QTest::newRow("Fusion") << "fusion.conf" << "Fusion" << ""; - QTest::newRow("Imagine") << "imagine.conf" << "Imagine" << ""; - QTest::newRow("Material") << "material.conf" << "Material" << ""; - QTest::newRow("Universal") << "universal.conf" << "Universal" << ""; - QTest::newRow("Custom") << "custom.conf" << "Custom" << ":/"; -} - -void tst_QQuickStyle::configurationFile() -{ - QFETCH(QString, fileName); - QFETCH(QString, expectedStyle); - QFETCH(QString, expectedPath); - - qputenv("QT_QUICK_CONTROLS_CONF", testFile(fileName).toLocal8Bit()); - - // Load a control. The import causes the configuration file to be read. - QQmlEngine engine; - QQmlComponent labelComponent(&engine); - labelComponent.setData("import QtQuick 2.0; import QtQuick.Controls 2.12; Label {}", QUrl()); - - QScopedPointer object(labelComponent.create()); - QVERIFY2(!object.isNull(), qPrintable(labelComponent.errorString())); - - QCOMPARE(QQuickStyle::name(), expectedStyle); - if (!expectedPath.isEmpty()) - QCOMPARE(QQuickStyle::path(), expectedPath); - - // Test that fonts and palettes specified in configuration files are respected. - QQuickLabel *label = qobject_cast(object.data()); - QVERIFY(label); - // Make it small so that there's less possibility for the default/system - // pixel size to match it and give us false positives. - QCOMPARE(label->font().pixelSize(), 3); - QCOMPARE(label->palette().windowText(), Qt::red); -} - void tst_QQuickStyle::commandLineArgument() { QGuiApplicationPrivate::styleOverride = "CmdLineArgStyle"; - - loadControls(); - QCOMPARE(QQuickStyle::name(), QString("CmdLineArgStyle")); } @@ -176,14 +99,10 @@ { QString path = QFINDTESTDATA("data"); QVERIFY(!path.isEmpty()); + qputenv("QT_QUICK_CONTROLS_STYLE_PATH", path.toLocal8Bit()); - QQuickStyle::addStylePath(path); QStringList paths = QQuickStylePrivate::stylePaths(); -#ifndef Q_OS_WIN QVERIFY(paths.contains(path)); -#else - QVERIFY(paths.contains(path, Qt::CaseInsensitive)); -#endif const QStringList styles = QQuickStyle::availableStyles(); QVERIFY(!styles.isEmpty()); @@ -196,153 +115,6 @@ } } -void tst_QQuickStyle::qrcStylePaths_data() -{ - QTest::addColumn("stylePath"); - QTest::addColumn("expectedStyleName"); - - QTest::addRow("qrc:/qrcStyles1") << QString::fromLatin1("qrc:/qrcStyles1") << QString::fromLatin1("QrcStyle1"); - QTest::addRow(":/qrcStyles2") << QString::fromLatin1(":/qrcStyles2") << QString::fromLatin1("QrcStyle2"); -} - -void tst_QQuickStyle::qrcStylePaths() -{ - QFETCH(QString, stylePath); - QFETCH(QString, expectedStyleName); - - QQuickStyle::addStylePath(stylePath); - - const QStringList paths = QQuickStylePrivate::stylePaths(); - QString expectedStylePath = stylePath; - if (expectedStylePath.startsWith(QLatin1String("qrc"))) - expectedStylePath.remove(0, 3); - if (!paths.contains(expectedStylePath)) { - QString message; - QDebug stream(&message); - stream.nospace() << "QQuickStylePrivate::stylePaths() doesn't contain " << expectedStylePath << ":\n" << paths; - QFAIL(qPrintable(message)); - } - - const QStringList styles = QQuickStyle::availableStyles(); - QVERIFY(!styles.isEmpty()); - if (!styles.contains(expectedStyleName)) { - QString message; - QDebug stream(&message); - stream.nospace() << "QQuickStyle::availableStyles() doesn't contain " << expectedStyleName << ":\n" << styles; - QFAIL(qPrintable(message)); - } -} - -void tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar_data() -{ - QTest::addColumn("environmentVariable"); - QTest::addColumn("expectedAvailableStyles"); - - const QChar listSeparator = QDir::listSeparator(); - const QStringList defaultAvailableStyles = QQuickStyle::availableStyles(); - - { - QString environmentVariable; - QDebug stream(&environmentVariable); - // We use qrcStyles3 and qrcStyles4 in order to not conflict with - // qrcStylePaths(), since we currently have no way of clearing customStylePaths. - stream.noquote().nospace() << "/some/bogus/path/" << listSeparator - << ":/qrcStyles3"; - - QStringList expectedAvailableStyles = defaultAvailableStyles; - // We need to keep the Default style at the start of the list, - // as that's what availableStyles() does. - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle3")); - - QTest::addRow("%s", qPrintable(environmentVariable)) - << environmentVariable << expectedAvailableStyles; - } - - { - QString environmentVariable; - QDebug stream(&environmentVariable); - stream.noquote().nospace() << ":/qrcStyles4" << listSeparator - << "/some/bogus/path"; - - QStringList expectedAvailableStyles = defaultAvailableStyles; - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle4")); - - QTest::addRow("%s", qPrintable(environmentVariable)) - << environmentVariable << expectedAvailableStyles; - } - - { - QString environmentVariable; - QDebug stream(&environmentVariable); - stream.noquote().nospace() << ":/qrcStyles3" << listSeparator - << ":/qrcStyles4" << listSeparator - << QFINDTESTDATA("data/dummyStyles"); - - QStringList expectedAvailableStyles = defaultAvailableStyles; - expectedAvailableStyles.insert(1, QLatin1String("DummyStyle")); - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle4")); - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle3")); - - QTest::addRow("%s", qPrintable(environmentVariable)) - << environmentVariable << expectedAvailableStyles; - } - - { - QString environmentVariable; - QDebug stream(&environmentVariable); - stream.noquote().nospace() << QFINDTESTDATA("data/dummyStyles") << listSeparator - << ":/qrcStyles3" << listSeparator - << ":/qrcStyles4"; - - QStringList expectedAvailableStyles = defaultAvailableStyles; - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle4")); - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle3")); - expectedAvailableStyles.insert(1, QLatin1String("DummyStyle")); - - QTest::addRow("%s", qPrintable(environmentVariable)) - << environmentVariable << expectedAvailableStyles; - } - - { - QString environmentVariable; - QDebug stream(&environmentVariable); - // Same as the last row, except it adds a superfluous separator - // to ensure that it handles it gracefully rather than failing an assertion. - stream.noquote().nospace() << QFINDTESTDATA("data/dummyStyles") << listSeparator - << ":/qrcStyles3" << listSeparator - << ":/qrcStyles4" << listSeparator; - - QStringList expectedAvailableStyles = defaultAvailableStyles; - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle4")); - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle3")); - expectedAvailableStyles.insert(1, QLatin1String("DummyStyle")); - - QTest::addRow("%s", qPrintable(environmentVariable)) - << environmentVariable << expectedAvailableStyles; - } -} - -/* - Tests that qrc paths work with QT_QUICK_CONTROLS_STYLE_PATH. -*/ -void tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar() -{ - QFETCH(QString, environmentVariable); - QFETCH(QStringList, expectedAvailableStyles); - - qputenv("QT_QUICK_CONTROLS_STYLE_PATH", environmentVariable.toLocal8Bit()); - - const QStringList availableStyles = QQuickStyle::availableStyles(); - if (availableStyles != expectedAvailableStyles) { - QString failureMessage; - QDebug stream(&failureMessage); - stream << "Mismatch in actual vs expected available styles:" - << "\n Expected:" << expectedAvailableStyles - << "\n Actual:" << availableStyles; - QFAIL(qPrintable(failureMessage)); - } -} - QTEST_MAIN(tst_QQuickStyle) #include "tst_qquickstyle.moc" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates 2.1 as T T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/Control.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/Control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/Control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/Control.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates 2.1 as T T.Control { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates 2.1 as T T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates 2.1 as T T.Label { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates 2.1 as T T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/Label.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/Label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates 2.1 as T T.Label { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -import QtQuick.Templates 2.12 as T -T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -import QtQuick.Templates 2.12 as T -T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -import QtQuick.Templates 2.12 as T -T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -import QtQuick.Templates 2.12 as T -T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/ResourceStyle/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/ResourceStyle/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/ResourceStyle/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/ResourceStyle/Button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.12 as T +import QtQuick.Templates 2.1 as T T.Button { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/tst_qquickstyleselector.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/tst_qquickstyleselector.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickstyleselector/tst_qquickstyleselector.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickstyleselector/tst_qquickstyleselector.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -49,8 +49,6 @@ void select_data(); void select(); - - void platformSelectors(); }; void tst_QQuickStyleSelector::initTestCase() @@ -96,7 +94,7 @@ QTest::newRow("nosuch/label") << "Label.qml" << "NoSuchStyle" << "data" << "" << testFileUrl("Label.qml").toString(); QTest::newRow("/nosuch/label") << "Label.qml" << "NoSuchStyle" << dataDirectory() << "" << testFileUrl("Label.qml").toString(); - QTest::newRow("label->base") << "Label.qml" << "" << "data" << "FallbackStyle" << testFileUrl("Label.qml").toString(); + QTest::newRow("label->base") << "Label.qml" << "" << "data" << "FallbackStyle" << testFileUrl("FallbackStyle/Label.qml").toString(); QTest::newRow("/label->base") << "Label.qml" << "" << dataDirectory() << "FallbackStyle" << testFileUrl("Label.qml").toString(); QTest::newRow("fs/label->base") << "Label.qml" << "FileSystemStyle" << "data" << "FallbackStyle" << testFileUrl("FallbackStyle/Label.qml").toString(); QTest::newRow("/fs/label->base") << "Label.qml" << "FileSystemStyle" << dataDirectory() << "FallbackStyle" << testFileUrl("FallbackStyle/Label.qml").toString(); @@ -115,7 +113,7 @@ QTest::newRow("nosuch/button") << "Button.qml" << "NoSuchStyle" << "data" << "" << testFileUrl("Button.qml").toString(); QTest::newRow("/nosuch/button") << "Button.qml" << "NoSuchStyle" << dataDirectory() << "" << testFileUrl("Button.qml").toString(); - QTest::newRow("button->base") << "Button.qml" << "" << "data" << "FallbackStyle" << testFileUrl("Button.qml").toString(); + QTest::newRow("button->base") << "Button.qml" << "" << "data" << "FallbackStyle" << testFileUrl("FallbackStyle/Button.qml").toString(); QTest::newRow("/button->base") << "Button.qml" << "" << dataDirectory() << "FallbackStyle" << testFileUrl("Button.qml").toString(); QTest::newRow("fs/button->base") << "Button.qml" << "FileSystemStyle" << "data" << "FallbackStyle" << testFileUrl("FileSystemStyle/Button.qml").toString(); QTest::newRow("/fs/button->base") << "Button.qml" << "FileSystemStyle" << dataDirectory() << "FallbackStyle" << testFileUrl("FileSystemStyle/Button.qml").toString(); @@ -137,31 +135,10 @@ QQuickStyle::setFallbackStyle(fallback); QQuickStyleSelector selector; - selector.addSelector(style); - selector.addSelector(fallback); - selector.setPaths(QStringList() << dataDirectory() << ":/"); + selector.setBaseUrl(dataDirectoryUrl()); QCOMPARE(selector.select(file), expected); } -void tst_QQuickStyleSelector::platformSelectors() -{ - QQuickStyle::setStyle(QDir(dataDirectory()).filePath("PlatformStyle")); - - QQuickStyleSelector selector; - selector.addSelector("PlatformStyle"); - selector.setPaths(QStringList() << dataDirectory()); - -#if defined(Q_OS_LINUX) - QCOMPARE(selector.select("Button.qml"), testFileUrl("PlatformStyle/+linux/Button.qml").toString()); -#elif defined(Q_OS_MACOS) - QCOMPARE(selector.select("Button.qml"), testFileUrl("PlatformStyle/+macos/Button.qml").toString()); -#elif defined(Q_OS_WIN) - QCOMPARE(selector.select("Button.qml"), testFileUrl("PlatformStyle/+windows/Button.qml").toString()); -#else - QCOMPARE(selector.select("Button.qml"), testFileUrl("PlatformStyle/Button.qml").toString()); -#endif -} - QTEST_MAIN(tst_QQuickStyleSelector) #include "tst_qquickstyleselector.moc" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickuniversalstyle/data/tst_universal.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickuniversalstyle/data/tst_universal.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickuniversalstyle/data/tst_universal.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickuniversalstyle/data/tst_universal.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.2 import QtQuick.Window 2.2 import QtTest 1.0 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls 2.1 +import QtQuick.Controls.Universal 2.1 TestCase { id: testCase diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.7 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Universal 2.0 ApplicationWindow { width: 400 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickuniversalstyleconf/qtquickcontrols2.conf qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickuniversalstyleconf/qtquickcontrols2.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickuniversalstyleconf/qtquickcontrols2.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickuniversalstyleconf/qtquickcontrols2.conf 2018-03-21 07:59:29.000000000 +0000 @@ -4,7 +4,3 @@ [Universal] Background=#444444 Foreground=Red -Font\PixelSize=22 - -[Universal\Font] -Family=Courier diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -55,22 +55,16 @@ { QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); - QFont customFont; - customFont.setFamily("Courier"); - customFont.setPixelSize(22); - QQuickApplicationWindow *window = helper.appWindow; window->show(); QVERIFY(QTest::qWaitForWindowExposed(window)); - // We specified a custom background color and font, so the window should have them. + // We specified a custom background color, so the window should have it. QCOMPARE(window->property("color").value(), QColor("#444444")); - QCOMPARE(window->property("font").value(), customFont); - // We specified a custom foreground color and font, so the label should have them. + // We specified a custom foreground color, so the label should have it. QQuickItem *label = window->property("label").value(); QVERIFY(label); QCOMPARE(label->property("color").value(), QColor("#E51400")); - QCOMPARE(label->property("font").value(), customFont); } QTEST_MAIN(tst_qquickuniversalstyleconf) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/revisions/data/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/revisions/data/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/revisions/data/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/revisions/data/dependencies.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.8 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Universal 2.0 Control { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/sanity/data/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/sanity/data/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/sanity/data/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/sanity/data/dependencies.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Control { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/sanity/sanity.pro qtquickcontrols2-opensource-src-5.9.5/tests/auto/sanity/sanity.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/sanity/sanity.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/sanity/sanity.pro 2018-03-21 07:59:29.000000000 +0000 @@ -5,7 +5,7 @@ CONFIG += testcase macos:CONFIG -= app_bundle -include(../../auto/shared/util.pri) +DEFINES += QQC2_IMPORT_PATH=\\\"$$QQC2_SOURCE_TREE/src/imports\\\" SOURCES += \ $$PWD/tst_sanity.cpp diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/sanity/tst_sanity.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/sanity/tst_sanity.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/sanity/tst_sanity.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/sanity/tst_sanity.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -43,9 +43,6 @@ #include #include #include -#include "../../auto/shared/visualtestutil.h" - -using namespace QQuickVisualTestUtil; Q_GLOBAL_STATIC(QObjectList, qt_qobjects) @@ -137,12 +134,6 @@ m_errors += QString("%1:%2 : %3").arg(m_fileName).arg(node->firstSourceLocation().startLine).arg(error); } - void throwRecursionDepthError() final - { - m_errors += QString::fromLatin1("%1: Maximum statement or expression depth exceeded") - .arg(m_fileName); - } - private: QString m_fileName; QStringList m_errors; @@ -338,6 +329,39 @@ QTest::newRow(qPrintable(it.key())) << it.key() << it.value(); } +static void addTestRows(QQmlEngine *engine, const QString &sourcePath, const QString &targetPath, const QStringList &skiplist = QStringList()) +{ + // We cannot use QQmlComponent to load QML files directly from the source tree. + // For styles that use internal QML types (eg. material/Ripple.qml), the source + // dir would be added as an "implicit" import path overriding the actual import + // path (qtbase/qml/QtQuick/Controls.2/Material). => The QML engine fails to load + // the style C++ plugin from the implicit import path (the source dir). + // + // Therefore we only use the source tree for finding out the set of QML files that + // a particular style implements, and then we locate the respective QML files in + // the engine's import path. This way we can use QQmlComponent to load each QML file + // for benchmarking. + + const QFileInfoList entries = QDir(QQC2_IMPORT_PATH "/" + sourcePath).entryInfoList(QStringList("*.qml"), QDir::Files); + for (const QFileInfo &entry : entries) { + QString name = entry.baseName(); + if (!skiplist.contains(name)) { + const auto importPathList = engine->importPathList(); + for (const QString &importPath : importPathList) { + QString name = entry.dir().dirName() + "/" + entry.fileName(); + QString filePath = importPath + "/" + targetPath + "/" + entry.fileName(); + if (QFile::exists(filePath)) { + QTest::newRow(qPrintable(name)) << QUrl::fromLocalFile(filePath); + break; + } else if (QFile::exists(QQmlFile::urlToLocalFileOrQrc(filePath))) { + QTest::newRow(qPrintable(name)) << QUrl(filePath); + break; + } + } + } + } +} + void tst_Sanity::attachedObjects() { QFETCH(QUrl, url); @@ -361,11 +385,10 @@ void tst_Sanity::attachedObjects_data() { QTest::addColumn("url"); - addTestRowForEachControl(&engine, "calendar", "Qt/labs/calendar"); - addTestRowForEachControl(&engine, "controls", "QtQuick/Controls.2"); - addTestRowForEachControl(&engine, "controls/fusion", "QtQuick/Controls.2", QStringList() << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); - addTestRowForEachControl(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); - addTestRowForEachControl(&engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(&engine, "calendar", "Qt/labs/calendar"); + addTestRows(&engine, "controls", "QtQuick/Controls.2", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); + addTestRows(&engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } QTEST_MAIN(tst_Sanity) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/shared/qtest_quickcontrols.h qtquickcontrols2-opensource-src-5.9.5/tests/auto/shared/qtest_quickcontrols.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/shared/qtest_quickcontrols.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/shared/qtest_quickcontrols.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTEST_QUICKCONTROLS_H -#define QTEST_QUICKCONTROLS_H - -#include -#include -#include -#include -#include - -static QStringList testStyles() -{ - if (QQuickStyle::name().isEmpty()) - return QQuickStyle::availableStyles(); - return QStringList(QQuickStyle::name()); -} - -static int runTests(QObject *testObject, int argc, char *argv[]) -{ - int res = 0; - QTest::qInit(testObject, argc, argv); - const QByteArray testObjectName = QTestResult::currentTestObjectName(); - // setCurrentTestObject() takes a C string, which means we must ensure - // that the string we pass in lives long enough (i.e until the next call - // to setCurrentTestObject()), so store the name outside of the loop. - QByteArray testName; - const QStringList styles = testStyles(); - for (const QString &style : styles) { - qmlClearTypeRegistrations(); - QQuickStyle::setStyle(style); - testName = testObjectName + "::" + style.toLocal8Bit(); - QTestResult::setCurrentTestObject(testName); - res += QTest::qRun(); - } - QTestResult::setCurrentTestObject(testObjectName); - QTest::qCleanup(); - return res; -} - -#define QTEST_QUICKCONTROLS_MAIN(TestCase) \ -QT_BEGIN_NAMESPACE \ -QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \ -QT_END_NAMESPACE \ -int main(int argc, char *argv[]) \ -{ \ - qputenv("QML_NO_TOUCH_COMPRESSION", "1"); \ - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); \ - QGuiApplication app(argc, argv); \ - QTEST_ADD_GPU_BLACKLIST_SUPPORT \ - TestCase tc; \ - QTEST_SET_MAIN_SOURCE_PATH \ - return runTests(&tc, argc, argv); \ -} - -#endif // QTEST_QUICKCONTROLS_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/shared/util.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/shared/util.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/shared/util.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/shared/util.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -53,9 +53,7 @@ m_dataDirectory(QTest::qFindTestData("data", QT_QMLTEST_DATADIR, 0)), #endif - m_dataDirectoryUrl(m_dataDirectory.startsWith(QLatin1Char(':')) - ? QUrl(QLatin1String("qrc") + m_dataDirectory) - : QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/'))) + m_dataDirectoryUrl(QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/'))) { m_instance = this; } @@ -69,8 +67,7 @@ { QVERIFY2(!m_dataDirectory.isEmpty(), "'data' directory not found"); m_directory = QFileInfo(m_dataDirectory).absolutePath(); - if (m_dataDirectoryUrl.scheme() != QLatin1String("qrc")) - QVERIFY2(QDir::setCurrent(m_directory), qPrintable(QLatin1String("Could not chdir to ") + m_directory)); + QVERIFY2(QDir::setCurrent(m_directory), qPrintable(QLatin1String("Could not chdir to ") + m_directory)); } QString QQmlDataTest::testFile(const QString &fileName) const diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/shared/util.pri qtquickcontrols2-opensource-src-5.9.5/tests/auto/shared/util.pri --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/shared/util.pri 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/shared/util.pri 2018-03-21 07:59:29.000000000 +0000 @@ -1,14 +1,8 @@ -QT += testlib-private core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2 +QT += core-private gui-private qml-private quick-private quicktemplates2-private HEADERS += $$PWD/visualtestutil.h \ - $$PWD/util.h \ - $$PWD/qtest_quickcontrols.h + $$PWD/util.h SOURCES += $$PWD/visualtestutil.cpp \ $$PWD/util.cpp -android|ios { - DEFINES += QT_QMLTEST_DATADIR=\\\":/data\\\" -} else { - DEFINES += QT_QMLTEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\" -} -DEFINES += QQC2_IMPORT_PATH=\\\"$$QQC2_SOURCE_TREE/src/imports\\\" +DEFINES += QT_QMLTEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/shared/visualtestutil.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/shared/visualtestutil.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/shared/visualtestutil.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/shared/visualtestutil.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -38,10 +38,6 @@ #include #include -#include -#include -#include -#include bool QQuickVisualTestUtil::delegateVisible(QQuickItem *item) { @@ -73,63 +69,3 @@ } } -void QQuickVisualTestUtil::moveMouseAway(QQuickWindow *window) -{ -#if QT_CONFIG(cursor) // Get the cursor out of the way. - // Using "bottomRight() + QPoint(100, 100)" was causing issues on Ubuntu, - // where the window was positioned at the bottom right corner of the window - // (even after centering the window on the screen), so we use another position. - QCursor::setPos(window->geometry().bottomLeft() + QPoint(0, 10)); -#endif - - // make sure hover events from QQuickWindowPrivate::flushFrameSynchronousEvents() - // do not interfere with the tests - QEvent leave(QEvent::Leave); - QCoreApplication::sendEvent(window, &leave); -} - -void QQuickVisualTestUtil::centerOnScreen(QQuickWindow *window) -{ - const QRect screenGeometry = window->screen()->availableGeometry(); - const QPoint offset = QPoint(window->width() / 2, window->height() / 2); - window->setFramePosition(screenGeometry.center() - offset); -} - -void QQuickVisualTestUtil::addTestRowForEachControl(QQmlEngine *engine, const QString &sourcePath, const QString &targetPath, const QStringList &skiplist) -{ - // We cannot use QQmlComponent to load QML files directly from the source tree. - // For styles that use internal QML types (eg. material/Ripple.qml), the source - // dir would be added as an "implicit" import path overriding the actual import - // path (qtbase/qml/QtQuick/Controls.2/Material). => The QML engine fails to load - // the style C++ plugin from the implicit import path (the source dir). - // - // Therefore we only use the source tree for finding out the set of QML files that - // a particular style implements, and then we locate the respective QML files in - // the engine's import path. This way we can use QQmlComponent to load each QML file - // for benchmarking. - - const QFileInfoList entries = QDir(QQC2_IMPORT_PATH "/" + sourcePath).entryInfoList(QStringList("*.qml"), QDir::Files); - for (const QFileInfo &entry : entries) { - QString name = entry.baseName(); - if (!skiplist.contains(name)) { - const auto importPathList = engine->importPathList(); - for (const QString &importPath : importPathList) { - QString name = entry.dir().dirName() + "/" + entry.fileName(); - QString filePath = importPath + "/" + targetPath + "/" + entry.fileName(); - if (filePath.startsWith(":")) - filePath.prepend("qrc"); - if (QFile::exists(filePath)) { - QTest::newRow(qPrintable(name)) << QUrl::fromLocalFile(filePath); - break; - } else { - QUrl url(filePath); - filePath = QQmlFile::urlToLocalFileOrQrc(filePath); - if (!filePath.isEmpty() && QFile::exists(filePath)) { - QTest::newRow(qPrintable(name)) << url; - break; - } - } - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/shared/visualtestutil.h qtquickcontrols2-opensource-src-5.9.5/tests/auto/shared/visualtestutil.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/shared/visualtestutil.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/shared/visualtestutil.h 2018-03-21 07:59:29.000000000 +0000 @@ -54,10 +54,6 @@ bool delegateVisible(QQuickItem *item); - void centerOnScreen(QQuickWindow *window); - - void moveMouseAway(QQuickWindow *window); - /* Find an item with the specified objectName. If index is supplied then the item must also evaluate the {index} expression equal to index @@ -136,8 +132,6 @@ QQuickApplicationWindow *appWindow; QQuickWindow *window; }; - - void addTestRowForEachControl(QQmlEngine *engine, const QString &sourcePath, const QString &targetPath, const QStringList &skiplist = QStringList()); } #define QQUICK_VERIFY_POLISH(item) \ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/snippets/data/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/auto/snippets/data/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/snippets/data/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/snippets/data/dependencies.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,8 +1,8 @@ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.6 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.1 +import QtQuick.Controls.Material 2.1 +import QtQuick.Controls.Universal 2.1 import Qt.labs.calendar 1.0 Control { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/snippets/tst_snippets.cpp qtquickcontrols2-opensource-src-5.9.5/tests/auto/snippets/tst_snippets.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/auto/snippets/tst_snippets.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/auto/snippets/tst_snippets.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -103,8 +103,8 @@ QUrl url = QUrl::fromLocalFile(input); component.loadUrl(url); - QScopedPointer root(component.create()); - QVERIFY2(!root.isNull(), qPrintable(component.errorString())); + QObject *root = component.create(); + QVERIFY(root); QCOMPARE(component.status(), QQmlComponent::Ready); QVERIFY(component.errors().isEmpty()); @@ -132,10 +132,10 @@ output.insert(index, "-" + applicationStyle.toLower()); } - QQuickWindow *window = qobject_cast(root.data()); + QQuickWindow *window = qobject_cast(root); if (!window) { QQuickView *view = new QQuickView; - view->setContent(url, &component, root.data()); + view->setContent(url, &component, root); window = view; } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/creationtime/creationtime.pro qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/creationtime/creationtime.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/creationtime/creationtime.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/creationtime/creationtime.pro 2018-03-21 07:59:29.000000000 +0000 @@ -5,7 +5,7 @@ CONFIG += testcase macos:CONFIG -= app_bundle -include(../../auto/shared/util.pri) +DEFINES += QQC2_IMPORT_PATH=\\\"$$QQC2_SOURCE_TREE/src/imports\\\" SOURCES += \ tst_creationtime.cpp diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/creationtime/data/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/creationtime/data/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/creationtime/data/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/creationtime/data/dependencies.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,9 +1,7 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 +import QtQuick.Controls.Material 2.1 +import QtQuick.Controls.Universal 2.1 import Qt.labs.calendar 1.0 Control { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/creationtime/tst_creationtime.cpp qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/creationtime/tst_creationtime.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/creationtime/tst_creationtime.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/creationtime/tst_creationtime.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -37,10 +37,6 @@ #include #include -#include "../../auto/shared/visualtestutil.h" - -using namespace QQuickVisualTestUtil; - class tst_CreationTime : public QObject { Q_OBJECT @@ -51,12 +47,6 @@ void controls(); void controls_data(); - void fusion(); - void fusion_data(); - - void imagine(); - void imagine_data(); - void material(); void material_data(); @@ -75,6 +65,39 @@ engine.clearComponentCache(); } +static void addTestRows(QQmlEngine *engine, const QString &sourcePath, const QString &targetPath, const QStringList &skiplist = QStringList()) +{ + // We cannot use QQmlComponent to load QML files directly from the source tree. + // For styles that use internal QML types (eg. material/Ripple.qml), the source + // dir would be added as an "implicit" import path overriding the actual import + // path (qtbase/qml/QtQuick/Controls.2/Material). => The QML engine fails to load + // the style C++ plugin from the implicit import path (the source dir). + // + // Therefore we only use the source tree for finding out the set of QML files that + // a particular style implements, and then we locate the respective QML files in + // the engine's import path. This way we can use QQmlComponent to load each QML file + // for benchmarking. + + const QFileInfoList entries = QDir(QQC2_IMPORT_PATH "/" + sourcePath).entryInfoList(QStringList("*.qml"), QDir::Files); + for (const QFileInfo &entry : entries) { + QString name = entry.baseName(); + if (!skiplist.contains(name)) { + const auto importPathList = engine->importPathList(); + for (const QString &importPath : importPathList) { + QString name = entry.dir().dirName() + "/" + entry.fileName(); + QString filePath = importPath + "/" + targetPath + "/" + entry.fileName(); + if (QFile::exists(filePath)) { + QTest::newRow(qPrintable(name)) << QUrl::fromLocalFile(filePath); + break; + } else if (QFile::exists(QQmlFile::urlToLocalFileOrQrc(filePath))) { + QTest::newRow(qPrintable(name)) << QUrl(filePath); + break; + } + } + } + } +} + static void doBenchmark(QQmlEngine *engine, const QUrl &url) { QQmlComponent component(engine); @@ -99,31 +122,7 @@ void tst_CreationTime::controls_data() { QTest::addColumn("url"); - addTestRowForEachControl(&engine, "controls", "QtQuick/Controls.2", QStringList() << "ApplicationWindow"); -} - -void tst_CreationTime::fusion() -{ - QFETCH(QUrl, url); - doBenchmark(&engine, url); -} - -void tst_CreationTime::fusion_data() -{ - QTest::addColumn("url"); - addTestRowForEachControl(&engine, "controls/fusion", "QtQuick/Controls.2/Fusion", QStringList() << "ApplicationWindow" << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); -} - -void tst_CreationTime::imagine() -{ - QFETCH(QUrl, url); - doBenchmark(&engine, url); -} - -void tst_CreationTime::imagine_data() -{ - QTest::addColumn("url"); - addTestRowForEachControl(&engine, "controls/imagine", "QtQuick/Controls.2/Imagine", QStringList() << "ApplicationWindow"); + addTestRows(&engine, "controls", "QtQuick/Controls.2", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } void tst_CreationTime::material() @@ -135,7 +134,7 @@ void tst_CreationTime::material_data() { QTest::addColumn("url"); - addTestRowForEachControl(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "ApplicationWindow" << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); + addTestRows(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); } void tst_CreationTime::universal() @@ -147,7 +146,7 @@ void tst_CreationTime::universal_data() { QTest::addColumn("url"); - addTestRowForEachControl(&engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "ApplicationWindow" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(&engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } void tst_CreationTime::calendar() @@ -159,7 +158,7 @@ void tst_CreationTime::calendar_data() { QTest::addColumn("url"); - addTestRowForEachControl(&engine, "calendar", "Qt/labs/calendar"); + addTestRows(&engine, "calendar", "Qt/labs/calendar"); } QTEST_MAIN(tst_CreationTime) diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/objectcount/data/dependencies.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/objectcount/data/dependencies.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/objectcount/data/dependencies.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/objectcount/data/dependencies.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,9 +1,7 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Fusion 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 +import QtQuick.Controls.Material 2.1 +import QtQuick.Controls.Universal 2.1 import Qt.labs.calendar 1.0 Control { } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/objectcount/objectcount.pro qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/objectcount/objectcount.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/objectcount/objectcount.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/objectcount/objectcount.pro 2018-03-21 07:59:29.000000000 +0000 @@ -5,7 +5,7 @@ CONFIG += testcase macos:CONFIG -= app_bundle -include(../../auto/shared/util.pri) +DEFINES += QQC2_IMPORT_PATH=\\\"$$QQC2_SOURCE_TREE/src/imports\\\" SOURCES += \ tst_objectcount.cpp diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/objectcount/tst_objectcount.cpp qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/objectcount/tst_objectcount.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/objectcount/tst_objectcount.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/objectcount/tst_objectcount.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -38,9 +38,6 @@ #include #include #include -#include "../../auto/shared/visualtestutil.h" - -using namespace QQuickVisualTestUtil; static int qt_verbose = qgetenv("VERBOSE").toInt() != 0; @@ -91,13 +88,44 @@ qtHookData[QHooks::RemoveQObject] = 0; } +static void addTestRows(QQmlEngine *engine, const QString &sourcePath, const QString &targetPath, const QStringList &skiplist = QStringList()) +{ + // We cannot use QQmlComponent to load QML files directly from the source tree. + // For styles that use internal QML types (eg. material/Ripple.qml), the source + // dir would be added as an "implicit" import path overriding the actual import + // path (qtbase/qml/QtQuick/Controls.2/Material). => The QML engine fails to load + // the style C++ plugin from the implicit import path (the source dir). + // + // Therefore we only use the source tree for finding out the set of QML files that + // a particular style implements, and then we locate the respective QML files in + // the engine's import path. This way we can use QQmlComponent to load each QML file + // for benchmarking. + + const QFileInfoList entries = QDir(QQC2_IMPORT_PATH "/" + sourcePath).entryInfoList(QStringList("*.qml"), QDir::Files); + for (const QFileInfo &entry : entries) { + QString name = entry.baseName(); + if (!skiplist.contains(name)) { + const auto importPathList = engine->importPathList(); + for (const QString &importPath : importPathList) { + QString name = entry.dir().dirName() + "/" + entry.fileName(); + QString filePath = importPath + "/" + targetPath + "/" + entry.fileName(); + if (QFile::exists(filePath)) { + QTest::newRow(qPrintable(name)) << QUrl::fromLocalFile(filePath); + break; + } else if (QFile::exists(QQmlFile::urlToLocalFileOrQrc(filePath))) { + QTest::newRow(qPrintable(name)) << QUrl(filePath); + break; + } + } + } + } +} + static void initTestRows(QQmlEngine *engine) { - addTestRowForEachControl(engine, "controls", "QtQuick/Controls.2"); - addTestRowForEachControl(engine, "controls/fusion", "QtQuick/Controls.2/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); - addTestRowForEachControl(engine, "controls/imagine", "QtQuick/Controls.2/Imagine"); - addTestRowForEachControl(engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); - addTestRowForEachControl(engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(engine, "controls", "QtQuick/Controls.2", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); + addTestRows(engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } template diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_button.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_combobox.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_combobox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_combobox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_combobox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_container.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_container.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_container.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_container.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_control.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_control.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_control.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_control.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_dialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_dialog.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_dial.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_dial.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_drawer.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_frame.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_frame.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_label.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_label.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_menu.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_page.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_page.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_pane.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_pane.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_popup.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_popup.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_popup.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_popup.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_slider.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_stackview.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_stackview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_stackview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_stackview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_switch.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_textarea.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_textarea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_textarea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_textarea.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_textfield.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_textfield.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_textfield.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_textfield.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml 2018-03-21 07:59:29.000000000 +0000 @@ -1,6 +1,6 @@ -import QtQuick 2.12 +import QtQuick 2.0 import QmlBench 1.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 CreationBenchmark { id: root diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/global/global.cfg qtquickcontrols2-opensource-src-5.9.5/tests/global/global.cfg --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/global/global.cfg 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/global/global.cfg 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ - - - - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/buttons/ButtonLoader.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/buttons/ButtonLoader.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/buttons/ButtonLoader.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/buttons/ButtonLoader.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.8 +import QtQuick.Controls 2.1 Item { id: root @@ -92,7 +92,7 @@ Label { text: root.text - font.pixelSize: roundButton.font.pixelSize * 0.5 + font.pixelSize: roundButton.contentItem.font.pixelSize * 0.5 anchors.top: parent.bottom anchors.topMargin: 2 anchors.horizontalCenter: parent.horizontalCenter diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/buttons/buttons.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/buttons/buttons.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/buttons/buttons.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/buttons/buttons.qml 2018-03-21 07:59:29.000000000 +0000 @@ -47,10 +47,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 +import QtQuick.Controls.Material 2.1 +import QtQuick.Controls.Universal 2.1 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/CustomDialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/CustomDialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/CustomDialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/CustomDialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick.Controls 2.12 - -Dialog { - id: root - x: previousDialog ? previousDialog.x + previousDialog.width + space : 0 - y: previousDialog ? previousDialog.y : 0 - closePolicy: Dialog.NoAutoClose - visible: true - - property Dialog previousDialog - property int space: dialogSpacing - - Marker { - parent: root.footer.contentItem - visible: visualizeDialogButtonBoxContentItem - text: "footer.contentItem" - } - Marker { - parent: root.footer - visible: visualizeDialogButtonBox - text: "footer" - border.color: "red" - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/DialogLabel.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/DialogLabel.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/DialogLabel.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/DialogLabel.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick.Controls 2.12 - -Label { - x: dialog.x + (dialog.width - width) / 2 - y: dialog.y - height - width: dialog.width - wrapMode: Label.Wrap - - property Dialog dialog -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/dialogs.cpp qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/dialogs.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/dialogs.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/dialogs.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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 -#include - -int main(int argc, char *argv[]) -{ - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QGuiApplication app(argc, argv); - - QQmlApplicationEngine engine; - engine.load(QUrl("qrc:/dialogs.qml")); - - return app.exec(); -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/dialogs.pro qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/dialogs.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/dialogs.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/dialogs.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = dialogs -QT += qml quickcontrols2 - -SOURCES += dialogs.cpp -RESOURCES += \ - qtquickcontrols2.conf \ - dialogs.qml \ - Marker.qml \ - CustomDialog.qml \ - DialogLabel.qml diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/dialogs.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/dialogs.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/dialogs.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/dialogs.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,247 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -ApplicationWindow { - id: window - width: 1200 - height: 800 - title: "Buttons" - visible: true - - property alias visualizeDialogButtonBoxContentItem: visualizeDialogButtonBoxContentItemMenuItem.checked - property alias visualizeDialogButtonBox: visualizeDialogButtonBoxMenuItem.checked - - property int dialogSpacing: 60 - - header: ToolBar { - RowLayout { - anchors.fill: parent - Item { - Layout.fillWidth: true - } - - ToolButton { - text: "Settings" - onClicked: settingsMenu.open() - - Menu { - id: settingsMenu - width: 400 - - MenuItem { - id: visualizeDialogButtonBoxContentItemMenuItem - text: "Visualize DialogButtonBox contentItem" - checkable: true - } - - MenuItem { - id: visualizeDialogButtonBoxMenuItem - text: "Visualize DialogButtonBox" - checkable: true - } - } - } - } - } - - - DialogLabel { - text: "implicit width" - dialog: dialogImplicitWidthNoButtons - width: 100 - } - CustomDialog { - id: dialogImplicitWidthNoButtons - x: dialogSpacing - y: dialogSpacing - space: 200 - } - - DialogLabel { - text: "title, implicit width" - dialog: dialogImplicitWidthTitleNoButtons - width: 150 - } - CustomDialog { - id: dialogImplicitWidthTitleNoButtons - y: dialogSpacing - title: "Test" - previousDialog: dialogImplicitWidthNoButtons - space: 200 - } - - DialogLabel { - text: "title, fixed width" - dialog: dialogFixedWidthTitleNoButtons - } - CustomDialog { - id: dialogFixedWidthTitleNoButtons - y: dialogSpacing - width: 300 - title: "Test" - previousDialog: dialogImplicitWidthTitleNoButtons - space: 200 - } - - - DialogLabel { - text: "one standard button, implicit width" - dialog: dialogImplicitWidthOneButton - } - CustomDialog { - id: dialogImplicitWidthOneButton - x: dialogSpacing - y: dialogFixedWidthTitleNoButtons.y + dialogFixedWidthTitleNoButtons.height + dialogSpacing - standardButtons: Dialog.Ok - } - - DialogLabel { - text: "two standard buttons, implicit width" - dialog: dialogImplicitWidthTwoButtons - } - CustomDialog { - id: dialogImplicitWidthTwoButtons - standardButtons: Dialog.Ok | Dialog.Cancel - previousDialog: dialogImplicitWidthOneButton - } - - DialogLabel { - text: "three standard buttons, implicit width" - dialog: dialogImplicitWidthThreeButtons - } - CustomDialog { - id: dialogImplicitWidthThreeButtons - standardButtons: Dialog.Apply | Dialog.RestoreDefaults | Dialog.Cancel - previousDialog: dialogImplicitWidthTwoButtons - } - - - DialogLabel { - text: "text, one standard button, implicit width" - dialog: dialogTextImplicitWidthOneButton - } - CustomDialog { - id: dialogTextImplicitWidthOneButton - x: dialogSpacing - y: dialogImplicitWidthThreeButtons.y + dialogImplicitWidthThreeButtons.height + dialogSpacing - standardButtons: Dialog.Ok - - Label { - text: "A Label" - } - } - - DialogLabel { - text: "text, two standard buttons, implicit width" - dialog: dialogTextImplicitWidthTwoButtons - } - CustomDialog { - id: dialogTextImplicitWidthTwoButtons - standardButtons: Dialog.Ok | Dialog.Cancel - previousDialog: dialogTextImplicitWidthOneButton - - Label { - text: "A Label" - } - } - - DialogLabel { - text: "text, three standard buttons, implicit width" - dialog: dialogTextImplicitWidthThreeButtons - } - CustomDialog { - id: dialogTextImplicitWidthThreeButtons - standardButtons: Dialog.Apply | Dialog.RestoreDefaults | Dialog.Cancel - previousDialog: dialogTextImplicitWidthTwoButtons - - Label { - text: "A Label" - } - } - - - DialogLabel { - text: "one standard button, fixed width (300)" - dialog: dialogFixedWidthOneButton - } - CustomDialog { - id: dialogFixedWidthOneButton - x: dialogSpacing - y: dialogTextImplicitWidthThreeButtons.y + dialogTextImplicitWidthThreeButtons.height + dialogSpacing - width: 300 - standardButtons: Dialog.Ok - } - - DialogLabel { - text: "two standard buttons, fixed width (300)" - dialog: dialogFixedWidthTwoButtons - } - CustomDialog { - id: dialogFixedWidthTwoButtons - width: 300 - standardButtons: Dialog.Ok | Dialog.Cancel - previousDialog: dialogFixedWidthOneButton - } - - DialogLabel { - text: "three standard buttons, fixed width (300)" - dialog: dialogFixedWidthThreeButtons - } - CustomDialog { - id: dialogFixedWidthThreeButtons - width: 300 - standardButtons: Dialog.Apply | Dialog.RestoreDefaults | Dialog.Cancel - previousDialog: dialogFixedWidthTwoButtons - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/Marker.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/Marker.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/Marker.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/Marker.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 - -Rectangle { - anchors.fill: parent - color: "transparent" - border.color: "darkorange" - - property alias text: label.text - - Text { - id: label - font.pixelSize: Qt.application.font.pixelSize * 0.6 - color: parent.border.color - anchors.left: parent.left - anchors.bottom: parent.bottom - anchors.margins: 4 - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/qtquickcontrols2.conf qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/qtquickcontrols2.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/dialogs/qtquickcontrols2.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/dialogs/qtquickcontrols2.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -[Controls] -Style=Default -;Style=Fusion -;Style=Imagine -;Style=Material -;Style=Universal diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/fonts/main.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/fonts/main.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/fonts/main.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/fonts/main.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 +import QtQuick.Templates 2.1 as T +import QtQuick.Layouts 1.2 ApplicationWindow { visible: true diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: busyIndicator.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: button.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: button.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-button.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-button.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: button.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 +import QtQuick.Layouts 1.1 import QtQuick.Window 2.0 Window { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 +import QtQuick.Layouts 1.1 import QtQuick.Window 2.0 Window { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: column.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.7 +import QtQuick.Controls 2.0 +import QtQuick.Layouts 1.1 import QtQuick.Window 2.0 Window { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-combobox.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-combobox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-combobox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-combobox.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 +import QtQuick.Layouts 1.1 import QtQuick.Window 2.0 Window { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.2 Window { width: button.width diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: dial.implicitWidth + 20 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: dial.implicitWidth + 20 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-drawer.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-drawer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-drawer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-drawer.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 import QtQuick.Window 2.0 ApplicationWindow { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: column.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-menu.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-menu.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 // TODO: restore and finish https://codereview.qt-project.org/#/c/123948/ ApplicationWindow { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.7 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: progressBar.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.7 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: progressBar.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick 2.6 +import QtQuick.Controls 2.0 +import QtQuick.Layouts 1.1 import QtQuick.Window 2.0 Window { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: column.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: slider.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: 100 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.7 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: 100 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: 100 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-slider.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-slider.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: slider.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.7 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: slider.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.7 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 ApplicationWindow { width: 160 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.7 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 ApplicationWindow { width: 160 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.7 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 ApplicationWindow { width: 160 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.7 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 ApplicationWindow { width: 160 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: swipeDelegate.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: swipeDelegate.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: swipeDelegate.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.0 Window { width: 300 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: column.implicitWidth diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-switch.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-switch.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: 100 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import QtQuick.Window 2.0 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: 300 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.8 import QtQuick.Window 2.2 -import QtQuick.Controls 2.12 +import QtQuick.Controls 2.1 Window { width: frame.implicitWidth + 10 diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/manual.pro qtquickcontrols2-opensource-src-5.9.5/tests/manual/manual.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/manual.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/manual.pro 2018-03-21 07:59:29.000000000 +0000 @@ -7,6 +7,4 @@ styles \ testbench -qtConfig(systemtrayicon): SUBDIRS += systemtrayicon - qtHaveModule(widgets): SUBDIRS += viewinqwidget diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/screenshots/qtquickcontrols2.conf qtquickcontrols2-opensource-src-5.9.5/tests/manual/screenshots/qtquickcontrols2.conf --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/screenshots/qtquickcontrols2.conf 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/screenshots/qtquickcontrols2.conf 2018-03-21 07:59:29.000000000 +0000 @@ -1,5 +1,2 @@ [Controls] Style=Material - -[Material] -;Variant=Dense diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/screenshots/screenshots.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/screenshots/screenshots.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/screenshots/screenshots.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/screenshots/screenshots.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.0 import Qt.labs.folderlistmodel 2.1 ApplicationWindow { @@ -58,7 +58,7 @@ title: "Qt Quick Controls 2 - Screenshots" visible: true width: Math.max(600, loader.implicitWidth) - height: Math.max(600, loader.implicitHeight + header.implicitHeight + footer.implicitHeight) + height: Math.max(600, loader.implicitHeight) property string currentFilePath property url lastSaveUrl diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/shared/FontAwesomeIcon.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/shared/FontAwesomeIcon.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/shared/FontAwesomeIcon.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/shared/FontAwesomeIcon.qml 2018-03-21 07:59:29.000000000 +0000 @@ -47,7 +47,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 import "qrc:/shared" Text { diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/shared/FontAwesome.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/shared/FontAwesome.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/shared/FontAwesome.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/shared/FontAwesome.qml 2018-03-21 07:59:29.000000000 +0000 @@ -47,7 +47,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.12 +import QtQuick 2.6 pragma Singleton diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles/styles.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles/styles.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles/styles.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles/styles.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.1 ApplicationWindow { id: window diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles-cover-flow/CoverFlowDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles-cover-flow/CoverFlowDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles-cover-flow/CoverFlowDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles-cover-flow/CoverFlowDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtGraphicalEffects 1.12 -import QtQuick 2.12 - -Item { - id: root - width: PathView.view.delegateSize - height: width - z: PathView.zOrder - - transform: [ - Rotation { - angle: root.PathView.rotateY - origin.x: sourceImage.width / 2 - origin.y: sourceImage.height * 0.3 - axis.x: 0 - axis.y: 1 - axis.z: 0 - }, - Scale { - xScale: 1.0 - yScale: root.PathView.scale - origin.x: sourceImage.width / 2 - origin.y: sourceImage.height * 0.4 - } - ] - - Image { - id: sourceImage - width: root.PathView.view.delegateSize - height: width - fillMode: Image.PreserveAspectFit - source: "file:/" + docImagesDir + model.source - - Rectangle { - x: (sourceImage.width - sourceImage.paintedWidth) / 2 - width: sourceImage.paintedWidth + (index == 6 ? 2 : 1) - height: sourceImage.height - color: "transparent" - border.color: "#f4f4f4" - antialiasing: true - visible: !model.dark - } - } - - ShaderEffectSource { - id: reflection - sourceItem: sourceImage - y: sourceItem.height - width: sourceItem.width - height: sourceItem.height - - transform: [ - Rotation { - origin.x: reflection.width / 2 - origin.y: reflection.height / 2 - axis.x: 1 - axis.y: 0 - axis.z: 0 - angle: 180 - } - ] - } - - Rectangle { - objectName: sourceImage.source.toString().slice(-20) - x: (parent.width - sourceImage.paintedWidth) / 2// + (paintedWidthDiff > 0 ? 1.0 - paintedWidthDiff : 0) - y: reflection.y - width: sourceImage.paintedWidth + (index == 6 ? 2 : 1) - height: sourceImage.paintedHeight - - // TODO: figure out how to get perfect x/width without using the current width hack -// readonly property real paintedWidthDiff: sourceImage.paintedWidth - Math.floor(sourceImage.paintedWidth) - - gradient: Gradient { - GradientStop { - position: 0.0 - color: Qt.rgba(backgroundColor.r, backgroundColor.g, backgroundColor.b, 0.33) - } - GradientStop { - // This determines the point at which the reflection fades out. - position: 1.0 - color: backgroundColor - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles-cover-flow/CoverFlowPath.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles-cover-flow/CoverFlowPath.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles-cover-flow/CoverFlowPath.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles-cover-flow/CoverFlowPath.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,157 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 - -Path { - // Point 1 - property PathView pathView - - startX: 0 - startY: pathView.centerY - - PathAttribute { - name: "rotateY" - value: 50.0 - } - PathAttribute { - name: "scale" - value: 0.7 - } - PathAttribute { - name: "zOrder" - value: 1.0 - } - - // Line to point 2 - PathLine { - x: pathView.centerX - pathView.delegateSize * 0.4 - y: pathView.centerY - } - PathPercent { - value: 0.44 - } - PathAttribute { - name: "rotateY" - value: 50.0 - } - PathAttribute { - name: "scale" - value: 0.7 - } - PathAttribute { - name: "zOrder" - value: 10.0 - } - - // Quad to point 3 - PathQuad { - x: pathView.centerX - y: pathView.centerY + pathView.delegateSize * 0.04 - controlX: pathView.centerX - pathView.delegateSize * 0.2 - controlY: pathView.centerY + pathView.delegateSize * 0.04 - } - PathPercent { - value: 0.5 - } - PathAttribute { - name: "rotateY" - value: 0.0 - } - PathAttribute { - name: "scale" - value: 1.0 - } - PathAttribute { - name: "zOrder" - value: 50.0 - } - - // Quad to point 4 - PathQuad { - x: pathView.centerX + pathView.delegateSize * 0.4 - y: pathView.centerY - controlX: pathView.centerX + pathView.delegateSize * 0.2 - controlY: pathView.centerY + pathView.delegateSize * 0.04 - } - PathPercent { - value: 0.56 - } - PathAttribute { - name: "rotateY" - value: -50.0 - } - PathAttribute { - name: "scale" - value: 0.7 - } - PathAttribute { - name: "zOrder" - value: 10.0 - } - - // Line to point 5 - PathLine { - x: pathView.width - y: pathView.centerY - } - PathAttribute { - name: "rotateY" - value: -50.0 - } - PathAttribute { - name: "scale" - value: 0.7 - } - PathAttribute { - name: "zOrder" - value: 1.0 - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles-cover-flow/styles-cover-flow.cpp qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles-cover-flow/styles-cover-flow.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles-cover-flow/styles-cover-flow.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles-cover-flow/styles-cover-flow.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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 -#include -#include - -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc, argv); - - QQmlApplicationEngine engine; - engine.rootContext()->setContextProperty("docImagesDir", QString(DOC_IMAGES_DIR)); - engine.load(QUrl("qrc:/styles-cover-flow.qml")); - if (engine.rootObjects().isEmpty()) - return -1; - - return app.exec(); -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles-cover-flow/styles-cover-flow.pro qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles-cover-flow/styles-cover-flow.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles-cover-flow/styles-cover-flow.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles-cover-flow/styles-cover-flow.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = stylescoverflow -QT += quick quickcontrols2 - -SOURCES += \ - styles-cover-flow.cpp - -RESOURCES += \ - $$files(*.qml, true) - -DEFINES += DOC_IMAGES_DIR=\\\"$$PWD/../../../src/imports/controls/doc/images/\\\" diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles-cover-flow/styles-cover-flow.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles-cover-flow/styles-cover-flow.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/styles-cover-flow/styles-cover-flow.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/styles-cover-flow/styles-cover-flow.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Window 2.12 - -Window { - // Different delegate positions and widths and window background colors - // can cause some unwanted "rogue pixels", so an easy way to get it perfect - // is to mess with the width. - width: 814 - height: 512 - visible: true - color: backgroundColor - flags: Qt.FramelessWindowHint - - readonly property color backgroundColor: "#ffffff" - - Shortcut { - sequence: "Ctrl+Q" - onActivated: Qt.quit() - } - - PathView { - id: view - anchors.fill: parent - anchors.leftMargin: 130 - anchors.rightMargin: 130 - model: ListModel { - ListElement { source: "qtquickcontrols2-default.png"; dark: false } - ListElement { source: "qtquickcontrols2-fusion.png"; dark: false } - ListElement { source: "qtquickcontrols2-universal-light.png"; dark: false } - ListElement { source: "qtquickcontrols2-universal-dark.png"; dark: true } - ListElement { source: "qtquickcontrols2-material-dark.png"; dark: true } - ListElement { source: "qtquickcontrols2-imagine.png"; dark: false } - ListElement { source: "qtquickcontrols2-material-light.png"; dark: false } - } - - highlightRangeMode: PathView.StrictlyEnforceRange - preferredHighlightBegin: 0.5 - preferredHighlightEnd: 0.5 - pathItemCount: 9 - - property real centerX: width / 2 - property real centerY: height * 0.4 - property real delegateSize: 393 / 2 - - path: CoverFlowPath { - pathView: view - } - delegate: CoverFlowDelegate {} - } -} Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/systemtrayicon/images/qt_logo_green_256.png and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/manual/systemtrayicon/images/qt_logo_green_256.png differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/systemtrayicon/systemtrayicon.cpp qtquickcontrols2-opensource-src-5.9.5/tests/manual/systemtrayicon/systemtrayicon.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/systemtrayicon/systemtrayicon.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/systemtrayicon/systemtrayicon.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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 -#include - -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc, argv); - - QQmlApplicationEngine engine; - engine.load(QUrl("qrc:/files/systemtrayicon.qml")); - if (engine.rootObjects().isEmpty()) - return -1; - - return app.exec(); -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/systemtrayicon/systemtrayicon.pro qtquickcontrols2-opensource-src-5.9.5/tests/manual/systemtrayicon/systemtrayicon.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/systemtrayicon/systemtrayicon.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/systemtrayicon/systemtrayicon.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -TEMPLATE = app -TARGET = systemtrayicon -QT += quick quickcontrols2 - -SOURCES += \ - systemtrayicon.cpp - -RESOURCES += \ - systemtrayicon.qrc diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/systemtrayicon/systemtrayicon.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/systemtrayicon/systemtrayicon.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/systemtrayicon/systemtrayicon.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/systemtrayicon/systemtrayicon.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import Qt.labs.platform 1.0 - -ApplicationWindow { - id: window - - visible: true - title: "Qt Quick Controls 2 - System Tray Icon" - - MenuBar { - id: menuBar - - Menu { - id: fileMenu - title: qsTr("File") - - MenuItem { - id : quitItem - text : "Quit" - onTriggered: Qt.quit() - } - } - } - - SystemTrayIcon { - visible: true - iconSource: "qrc:/files/images/qt_logo_green_256.png" - - menu: Menu { - MenuItem { - text: qsTr("Quit") - onTriggered: Qt.quit() - } - } - - onActivated: console.log("Activated") - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/systemtrayicon/systemtrayicon.qrc qtquickcontrols2-opensource-src-5.9.5/tests/manual/systemtrayicon/systemtrayicon.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/systemtrayicon/systemtrayicon.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/systemtrayicon/systemtrayicon.qrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ - - - systemtrayicon.qml - images/qt_logo_green_256.png - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/assetfixer.cpp qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/assetfixer.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/assetfixer.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/assetfixer.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,564 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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 "assetfixer.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "directoryvalidator.h" - -Q_LOGGING_CATEGORY(lcAssetFixer, "qt.quick.controls.tools.testbench.assetfixer.brief") -Q_LOGGING_CATEGORY(lcAssetFixerVerbose, "qt.quick.controls.tools.testbench.assetfixer.verbose") - -static const QColor black = Qt::black; -static const QColor red = Qt::red; - -/* - This class: - - - Watches a given asset directory for changes. When it notices a change in the directory's - "last modification" time, it suggests that client code call fixAssets(). It suggests - rather than just doing it itself because the client code (QML) may want to wait a second - or two to see if more changes are coming before doing an expensive fixup, as exporting - a bunch of files into a directory will cause several directoryChanged() emissions from - QFileSystemWatcher. - - Fixes 9-patch image assets via the function below. -*/ - -/* - This function: - - - Crops the image to the area within the 9-patch lines if necessary. - This can happen if e.g. a shadow is applied to an asset in Illustrator - and it causes the image to be larger than necessary. - - Reduces the thickness of the 9-patch lines. This is necessary to enable - designers not to have to worry about creating one pixel-thick lines for - each DPI variant of an asset; they can simply export the asset at each - DPI variant as usual and this program will fix it for them. - - See README.md for more information. -*/ -bool cropImageToLines(QImage *image) -{ - QRect cropArea; - /* - We need to keep track of this because of the following case: - - ______________________ - ______________________ - || - oooooooooooooooooooooooo - || - - If we didn't keep track of thickness, the top edge's lines would be found fine, - but then we'd look at the bottom edge and we'd accidentally pick up the left edge's lines. - Keeping track of thickness ensures that we have some way of knowing if we're far enough - in for the line to belong to a certain edge. - - Note that this approach is still limited, as it doesn't account for the top edge, - but we have to start somewhere in order to find the thickness. - */ - int thickness = 0; - - bool cropTop = false; - bool foundOnePixelThick9PatchLine = false; - // We have to go row by row because otherwise we might find a pixel that - // belongs to e.g. the left edge. - for (int y = 0; y < qFloor(image->height() / 2.0) && !cropTop && !foundOnePixelThick9PatchLine; ++y) { - for (int x = 1; x < image->width() - 2 && !cropTop && !foundOnePixelThick9PatchLine; ++x) { - const QColor pixelColor = image->pixelColor(x, y); - if (pixelColor == black || pixelColor == red) { - if (y == 0) { - const QColor pixelColorBelow = image->pixelColor(x, y + 1); - if (pixelColorBelow != black && pixelColorBelow != red) { - // We've already found the top of the 9-patch line, and the row below it - // is a different color, so we know that it's one pixel thick, and that we're done. - // Note that we can't just assume all of the other edges are the same and return here, - // as we also need to account for e.g. shadows. - qCDebug(lcAssetFixerVerbose) << "found one-pixel-thick nine patch line on top edge at x" << x; - foundOnePixelThick9PatchLine = true; - thickness = 1; - } - } else { - // It's not already at the top edge, so crop the top edge. - cropTop = true; - - // Now that we've found the line, find out how thick it is. - for (int yy = y; yy < qFloor(image->height() / 2.0); ++yy) { - const QColor pixelColor = image->pixelColor(x, yy); - if (pixelColor == black || pixelColor == red) { - cropArea.setTop(yy); - } else { - break; - } - } - - // + 1 for the pixel that we leave in when cropping, - // another +1 for the fact that this else statement is only entered when y > 0 - if (thickness == 0) { - thickness = cropArea.top() - y + 2; - qCDebug(lcAssetFixerVerbose) << "found first croppable nine patch line on top edge at x" << x << "y" << y - << "with thickness" << thickness; - } else { - qCDebug(lcAssetFixerVerbose) << "found first croppable nine patch line on top edge at x" << x << "y" << y - << "using existing thickness of" << thickness; - } - } - } - } - } - - bool cropBottom = false; - foundOnePixelThick9PatchLine = false; - for (int y = image->height() - 1; y >= qCeil(image->height() / 2.0) && !cropBottom && !foundOnePixelThick9PatchLine; --y) { - for (int x = qMax(1, thickness); x < image->width() - 2 && !cropBottom && !foundOnePixelThick9PatchLine; ++x) { - const QColor pixelColor = image->pixelColor(x, y); - if (pixelColor == black || pixelColor == red) { - if (y == image->height() - 1) { - const QColor pixelColorAbove = image->pixelColor(x, y - 1); - if (pixelColorAbove != black && pixelColorAbove != red) { - // We've already found the bottom of the 9-patch line, and the row above it - // is a different color, so we know that it's one pixel thick, and that we're done. - qCDebug(lcAssetFixerVerbose) << "found one-pixel-thick nine patch line on bottom edge at x" << x; - foundOnePixelThick9PatchLine = true; - if (thickness == 0) - thickness = 1; - } - } else { - // It's not already at the bottom edge, so crop the bottom edge. - cropBottom = true; - - // Now that we've found the line, find out how thick it is. - for (int yy = y; yy >= qCeil(image->height() / 2.0); --yy) { - const QColor pixelColor = image->pixelColor(x, yy); - if (pixelColor == black || pixelColor == red) { - cropArea.setBottom(yy); - } else { - break; - } - } - - // + 1 for the pixel that we leave in when cropping, - // another +1 for the fact that this else statement is only entered when y < image->height() - 1 - if (thickness == 0) { - thickness = y - cropArea.bottom() + 2; - qCDebug(lcAssetFixerVerbose) << "found first croppable nine patch line on bottom edge at x" << x << "y" << y - << "with thickness" << thickness; - } else { - qCDebug(lcAssetFixerVerbose) << "found first croppable nine patch line on bottom edge at x" << x << "y" << y - << "using existing thickness of" << thickness; - } - } - break; - } - } - } - - bool cropLeft = false; - foundOnePixelThick9PatchLine = false; - for (int x = 0; x < qFloor(image->width() / 2.0) && !cropLeft && !foundOnePixelThick9PatchLine; ++x) { - for (int y = qMax(1, thickness); y < image->height() - 2 && !cropLeft && !foundOnePixelThick9PatchLine; ++y) { - const QColor pixelColor = image->pixelColor(x, y); - if (pixelColor == black || pixelColor == red) { - if (x == 0) { - const QColor pixelColorToTheRight = image->pixelColor(x + 1, y); - if (pixelColorToTheRight != black && pixelColorToTheRight != red) { - // We've already found the beginning of the 9-patch line, and the column after it - // is a different color, so we know that it's one pixel thick, and that we're done. - qCDebug(lcAssetFixerVerbose) << "found one-pixel-thick nine patch line on left edge at y" << y; - foundOnePixelThick9PatchLine = true; - } - } else { - // It's not already at the left edge, so crop the left edge. - cropLeft = true; - - // Now that we've found the line, find out how thick it is. - for (int xx = x; xx < qFloor(image->width() / 2.0); ++xx) { - const QColor pixelColor = image->pixelColor(xx, y); - if (pixelColor == black || pixelColor == red) { - cropArea.setLeft(xx); - } else { - break; - } - } - - // + 1 for the pixel that we leave in when cropping, - // another +1 for the fact that this else statement is only entered when x > 0 - if (thickness == 0) { - thickness = cropArea.left() - x + 2; - qCDebug(lcAssetFixerVerbose) << "found first croppable nine patch line on left edge at x" << x << "y" << y - << "with thickness" << thickness; - } else { - qCDebug(lcAssetFixerVerbose) << "found first croppable nine patch line on left edge at x" << x << "y" << y - << "using existing thickness of" << thickness; - } - } - } - } - } - - bool cropRight = false; - foundOnePixelThick9PatchLine = false; - for (int x = image->width() - 1; x >= qCeil(image->width() / 2.0) && !cropRight && !foundOnePixelThick9PatchLine; --x) { - for (int y = qMax(1, thickness); y < image->height() - 2 && !cropRight && !foundOnePixelThick9PatchLine; ++y) { - const QColor pixelColor = image->pixelColor(x, y); - if (pixelColor == black || pixelColor == red) { - if (x == image->width() - 1) { - const QColor pixelColorToTheLeft = image->pixelColor(x - 1, y); - if (pixelColorToTheLeft != black && pixelColorToTheLeft != red) { - // We've already found the end of the 9-patch line, and the column before it - // is a different color, so we know that it's one pixel thick, and that we're done. - qCDebug(lcAssetFixerVerbose) << "found one-pixel-thick nine patch line on right edge at y" << y; - foundOnePixelThick9PatchLine = true; - } - } else { - // It's not already at the right edge, so crop the right edge. - cropRight = true; - - // Now that we've found the line, find out how thick it is. - for (int xx = x; xx >= qCeil(image->width() / 2.0); --xx) { - const QColor pixelColor = image->pixelColor(xx, y); - if (pixelColor == black || pixelColor == red) { - cropArea.setRight(xx); - } else { - break; - } - } - - // + 1 for the pixel that we leave in when cropping, - // another +1 for the fact that this else statement is only entered when x < image->width() - 1 - if (thickness == 0) { - thickness = x - cropArea.right() + 2; - qCDebug(lcAssetFixerVerbose) << "found first croppable nine patch line on right edge at x" << x << "y" << y - << "with thickness" << thickness; - } else { - qCDebug(lcAssetFixerVerbose) << "found first croppable nine patch line on right edge at x" << x << "y" << y - << "using existing thickness of" << thickness; - } - } - break; - } - } - } - - const QRect copyArea(cropLeft ? cropArea.x() : (thickness ? thickness - 1 : 0), - cropTop ? cropArea.y() : (thickness ? thickness - 1 : 0), - cropRight ? cropArea.width() : image->width() - (thickness ? (thickness - 1) * 2 : 0), - cropBottom ? cropArea.height() : image->height() - (thickness ? (thickness - 1) * 2 : 0)); - - if (cropLeft | cropRight | cropTop | cropBottom) { - qCDebug(lcAssetFixerVerbose) << "cropping area" << copyArea; - *image = image->copy(copyArea); - return true; - } - - return false; -} - -AssetFixer::AssetFixer(QObject *parent) : - QObject(parent), - mComponentComplete(false), - mFirstWatch(true), - mShouldWatch(false), - mShouldFix(false), - mLastModified(QDateTime::fromSecsSinceEpoch(0)) -{ -} - -bool AssetFixer::shouldWatch() const -{ - return mShouldWatch; -} - -void AssetFixer::setShouldWatch(bool watch) -{ - if (watch == mShouldWatch) - return; - - stopWatching(); - - mShouldWatch = watch; - - startWatching(); - - emit shouldWatchChanged(); -} - -bool AssetFixer::shouldFix() const -{ - return mShouldFix; -} - -void AssetFixer::setShouldFix(bool fix) -{ - if (fix == mShouldFix) - return; - - mShouldFix = fix; - emit shouldFixChanged(); -} - -QString AssetFixer::assetDirectory() const -{ - return mAssetDirectory; -} - -void AssetFixer::setAssetDirectory(const QString &assetDirectory) -{ - if (assetDirectory == mAssetDirectory) - return; - - stopWatching(); - - const QString oldAssetDirectory = assetDirectory; - mAssetDirectory.clear(); - - if (isAssetDirectoryValid(assetDirectory)) { - mAssetDirectory = assetDirectory; - startWatching(); - } - - if (mAssetDirectory != oldAssetDirectory) - emit assetDirectoryChanged(); -} - -QUrl AssetFixer::assetDirectoryUrl() const -{ - return QUrl::fromLocalFile(mAssetDirectory); -} - -QDateTime AssetFixer::assetDirectoryLastModified() const -{ - return mLastModified; -} - -void AssetFixer::setAssetDirectoryLastModified(const QDateTime &assetDirectoryLastModified) -{ - if (assetDirectoryLastModified == mLastModified) - return; - - mLastModified = assetDirectoryLastModified; - emit assetDirectoryLastModifiedChanged(); -} - -void AssetFixer::componentComplete() -{ - mComponentComplete = true; -} - -void AssetFixer::classBegin() -{ -} - -void AssetFixer::onAssetsChanged() -{ - const QFileInfo fileInfo(mAssetDirectory); - const QDateTime lastModified = fileInfo.lastModified(); - - qCDebug(lcAssetFixer) << "Change in asset directory" << mAssetDirectory << "detected" - << "lastModified:" << lastModified; - const qint64 secsSinceLastModification = mLastModified.secsTo(lastModified); - if (secsSinceLastModification == 0) { - qCDebug(lcAssetFixer) << "Change in asset directory" << mAssetDirectory << "detected, " - << "but QFileInfo says the directory hasn't been modified; ignoring"; - } else { - setAssetDirectoryLastModified(lastModified); - - QString message; - if (lcAssetFixer().isDebugEnabled()) { - message = QString::fromLatin1("Change in asset directory %1 detected, and QFileInfo says that there have been " \ - "%2 seconds since it was previously last modified); %3").arg(mAssetDirectory).arg(secsSinceLastModification); - } - - if (shouldFix()) { - qCDebug(lcAssetFixer) << message.arg(QLatin1String("suggesting delayed fix")); - emit delayedFixSuggested(); - } else { - qCDebug(lcAssetFixer) << message.arg(QLatin1String("suggesting reload")); - emit reloadSuggested(); - } - } -} - -void AssetFixer::stopWatching() -{ - if (!mShouldWatch || mAssetDirectory.isEmpty() || !mComponentComplete) - return; - - disconnect(&mFileSystemWatcher, &QFileSystemWatcher::directoryChanged, this, &AssetFixer::onAssetsChanged); - mFileSystemWatcher.removePath(mAssetDirectory); -} - -void AssetFixer::startWatching() -{ - if (!mShouldWatch || mAssetDirectory.isEmpty() || !mComponentComplete || !isAssetDirectoryValid(mAssetDirectory)) - return; - - if (mFileSystemWatcher.addPath(mAssetDirectory)) { - // TODO: for some reason this is not called when an image is edited, but is when the same image is "touch"ed. - // We could add watchers for each file, but then the application might have to be limited to displaying - // the elements for one control at a time so that we don't breach the 256 file descriptor limit on some platforms: - // http://doc.qt.io/qt-5/qfilesystemwatcher.html#details - - // We only emit a signal here rather than automatically responding to it ourselves, - // because we want to give the UI time to start animations. - connect(&mFileSystemWatcher, &QFileSystemWatcher::directoryChanged, this, &AssetFixer::onAssetsChanged); - - const QFileInfo fileInfo(mAssetDirectory); - bool suggestFix = false; - if (mFirstWatch) { - mFirstWatch = false; - - // Here we check if the assets have been modified since the last time the application closed. - // Checking this avoids a slow startup (due to fixing up assets). - if (fileInfo.lastModified() > mLastModified) { - qCDebug(lcAssetFixer) << "asset directory" << mAssetDirectory << "was modified at" - << fileInfo.lastModified() << ", which is later than our last stored modification time of" - << mLastModified << "; suggesting fix"; - suggestFix = true; - } else { - qCDebug(lcAssetFixer) << "asset directory" << mAssetDirectory << "has not been modified since" - << "the application was last closed; a fix is not necessary"; - - // For some reason not all assets are updated if we don't do this. - emit reloadSuggested(); - } - - // Don't need to call setAssetDirectoryLastModified() here, as we should have gotten it from settings. - } else { - suggestFix = true; - } - - if (suggestFix) { - setAssetDirectoryLastModified(fileInfo.lastModified()); - emit fixSuggested(); - } - } else { - qWarning() << "Could not watch asset directory" << mAssetDirectory; - } -} - -bool AssetFixer::isAssetDirectoryValid(const QString &assetDirectory) -{ - DirectoryValidator validator; - validator.setPath(assetDirectory); - return validator.isValid(); -} - -void AssetFixer::clearImageCache() -{ - QQmlApplicationEngine *engine = qobject_cast(qmlEngine(this)); - if (!engine) { - qWarning() << "No QQmlApplicationEngine for AssetFixer - assets may not reload properly"; - return; - } - - QQuickWindow *window = qobject_cast(engine->rootObjects().first()); - if (!window) { - qWarning() << "No QQuickWindow - assets may not reload properly"; - return; - } - - // We can't seem to disable image caching on a per-Image basis (by the time the QQuickImages - // are available, the cache has already been filled), so we call this instead. - qCDebug(lcAssetFixer) << "Calling QQuickWindow::releaseResources() to clear pixmap cache"; - window->releaseResources(); -} - -void AssetFixer::fixAssets() -{ - if (!mShouldFix || !mComponentComplete || mAssetDirectory.isEmpty() || !isAssetDirectoryValid(mAssetDirectory)) - return; - - QDir assetDir(mAssetDirectory); - qCDebug(lcAssetFixer) << "Fixing up assets in" << assetDir.absolutePath() << "..."; - int filesChanged = 0; - - QStringList nameFilters; - nameFilters << QLatin1String("*.9.png"); - QDirIterator dirIt(assetDir.absolutePath(), nameFilters, QDir::Files | QDir::Readable | QDir::NoSymLinks); - while (dirIt.hasNext()) { - const QString imagePath = dirIt.next(); - - QImage image(imagePath); - if (image.isNull()) { - qWarning() << "Couldn't open image at" << imagePath; - return; - } - - qCDebug(lcAssetFixerVerbose).nospace() << "found " << imagePath << " (" << image.width() << "x" << image.height() << ") - " - << "checking if we need to crop 9-patch lines"; - - if (cropImageToLines(&image)) { - if (!image.save(imagePath)) { - qWarning() << "Couldn't save" << imagePath; - return; - } - - ++filesChanged; - } - } - - qCDebug(lcAssetFixer) << "Fixed" << filesChanged << "assets"; - - // Let the application know that it should reload the Imagine style's assets. - // Currently we always suggest a reload after fixing files, even if no files were fixed. - // This is because the default Imagine style assets are automatically loaded at first, and then we - // set a custom path shortly after, so we must ensure that the Imagine style is using the correct assets. - // Reloads are just a matter of changing Imagine.path, which is very fast. - emit reloadSuggested(); -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/assetfixer.h qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/assetfixer.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/assetfixer.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/assetfixer.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,126 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -#ifndef ASSETFIXER_H -#define ASSETFIXER_H - -#include -#include -#include -#include -#include - -class AssetFixer : public QObject, public QQmlParserStatus -{ - Q_OBJECT - Q_PROPERTY(bool shouldWatch READ shouldWatch WRITE setShouldWatch NOTIFY shouldWatchChanged FINAL) - Q_PROPERTY(bool shouldFix READ shouldFix WRITE setShouldFix NOTIFY shouldFixChanged FINAL) - Q_PROPERTY(QString assetDirectory READ assetDirectory WRITE setAssetDirectory NOTIFY assetDirectoryChanged FINAL) - Q_PROPERTY(QUrl assetDirectoryUrl READ assetDirectoryUrl NOTIFY assetDirectoryChanged FINAL) - Q_PROPERTY(QDateTime assetDirectoryLastModified READ assetDirectoryLastModified WRITE setAssetDirectoryLastModified - NOTIFY assetDirectoryLastModifiedChanged FINAL) - Q_INTERFACES(QQmlParserStatus) - -public: - explicit AssetFixer(QObject *parent = nullptr); - - bool shouldWatch() const; - void setShouldWatch(bool shouldWatch); - - bool shouldFix() const; - void setShouldFix(bool shouldFix); - - QString assetDirectory() const; - void setAssetDirectory(const QString &assetDirectory); - - QUrl assetDirectoryUrl() const; - - QDateTime assetDirectoryLastModified() const; - void setAssetDirectoryLastModified(const QDateTime &assetDirectoryLastModified); - -signals: - void shouldWatchChanged(); - void shouldFixChanged(); - void assetDirectoryChanged(); - void assetDirectoryLastModifiedChanged(); - - void fixSuggested(); - void delayedFixSuggested(); - void reloadSuggested(); - - void error(const QString &errorMessage); - -public slots: - void clearImageCache(); - void fixAssets(); - -protected: - void componentComplete() override; - void classBegin() override; - -private slots: - void onAssetsChanged(); - -private: - void stopWatching(); - void startWatching(); - - bool isAssetDirectoryValid(const QString &assetDirectory); - - bool mComponentComplete; - bool mFirstWatch; - bool mShouldWatch; - bool mShouldFix; - QString mAssetDirectory; - QFileSystemWatcher mFileSystemWatcher; - QDateTime mLastModified; -}; - -#endif // ASSETFIXER_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/clipboard.cpp qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/clipboard.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/clipboard.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/clipboard.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,124 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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 "clipboard.h" - -#include -#include -#include - -const QStringList keys = { - "Palette/window", - "Palette/windowText", - "Palette/base", - "Palette/text", - "Palette/button", - "Palette/buttonText", - "Palette/brightText", - "Palette/toolTipBase", - "Palette/toolTipText", - "Palette/light", - "Palette/midlight", - "Palette/dark", - "Palette/mid", - "Palette/shadow", - "Palette/highlight", - "Palette/highlightedText", - "Palette/link" -}; - -Clipboard::Clipboard(QObject *parent) : - QObject(parent) -{ -} - -// Converts the JS map into a big string and copies it to the clipboard. -void Clipboard::copy(const QJSValue &keyValueMap) -{ - QString paletteSettingsString; - QVariantMap map = keyValueMap.toVariant().value(); - const QList mapKeys = map.keys(); - for (const QString &key : mapKeys) { - paletteSettingsString += "Palette/" + key + "=" + map.value(key).toString() + ","; - } - - // Remove the trailing comma. - if (!paletteSettingsString.isEmpty()) - paletteSettingsString.chop(1); - - QGuiApplication::clipboard()->setText(paletteSettingsString); -} - -// Converts the big string into a JS map and returns it. -QVariant Clipboard::paste() const -{ - QClipboard *clipboard = QGuiApplication::clipboard(); - if (clipboard->text().isEmpty()) - return QVariant(); - - QVariantMap keyValueMap; - - const QStringList settingsList = clipboard->text().split(QLatin1Char(',')); - for (const QString &setting : settingsList) { - const QStringList keyValuePair = setting.split(QLatin1Char('=')); - if (keyValuePair.size() < 2) - continue; - - QString key = keyValuePair.first(); - if (keys.contains(key)) { - key.remove(QLatin1String("Palette/")); - const QString value = keyValuePair.last(); - - keyValueMap.insert(key, value); - } - } - - return QVariant(keyValueMap); -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/clipboard.h qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/clipboard.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/clipboard.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/clipboard.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -#ifndef CLIPBOARD_H -#define CLIPBOARD_H - -#include -#include -#include - -class Clipboard : public QObject -{ - Q_OBJECT -public: - explicit Clipboard(QObject *parent = nullptr); - -public slots: - void copy(const QJSValue &keyValueMap); - QVariant paste() const; - -// void copyPaletteSettingsToClipboard(); -// void importPaletteSettingsFromClipboard(); -}; - -#endif // CLIPBOARD_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/ColorEditor.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/ColorEditor.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/ColorEditor.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/ColorEditor.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -RowLayout { - property alias labelText: label.text - property string toolTipText - property alias color: textField.text - - ToolTip.text: toolTipText - ToolTip.visible: textField.hovered - - Layout.columnSpan: 2 - - Label { - id: label - - Layout.fillWidth: true - } - - TextField { - id: textField - - validator: RegExpValidator{ - regExp: /#?[0-9a-fA-F]*/ - } - - Layout.preferredWidth: 200 - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/ControlContainer.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/ControlContainer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/ControlContainer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/ControlContainer.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 - -Item { - id: container - - implicitWidth: delegate.implicitWidth - implicitHeight: delegate.implicitHeight - - property var controlMetaObject - property var states - - Loader { - id: delegate - sourceComponent: controlMetaObject ? controlMetaObject.component : null - - function is(state) { - return container.states.indexOf(state) !== -1 - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/BusyIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/BusyIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/BusyIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/BusyIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["mirrored"] - ] - - property Component component: BusyIndicator { - enabled: !is("disabled") - LayoutMirroring.enabled: is("mirrored") - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Button.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Button.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Button.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Button.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["pressed"], - ["checked"], - ["checked", "disabled"], - ["checked"], - ["highlighted"], - ["highlighted", "disabled"], - ["highlighted", "pressed"], - ["highlighted", "checked"], - ["highlighted", "checkable", "pressed"], - ["highlighted", "checkable", "checked"], - ["flat"], - ["flat", "disabled"], - ["flat", "pressed"], - ["flat", "checked"], - ["flat", "checkable"], - ["flat", "checkable", "pressed"], - ["flat", "checkable", "checked", "pressed"], - ["flat", "checkable", "highlighted"], - ["flat", "checkable", "highlighted", "pressed"], - ["flat", "checkable", "highlighted", "checked"] - ] - - property Component component: Button { - text: "Button" - enabled: !is("disabled") - flat: is("flat") - checkable: is("checkable") - checked: is("checked") - // Only set it if it's pressed, or the non-pressed examples will have no press effects - down: is("pressed") ? true : undefined - highlighted: is("highlighted") - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/CheckBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/CheckBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/CheckBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/CheckBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["pressed"], - ["checked"], - ["checked", "disabled"], - ["checked", "pressed"], - ["partially-checked"], - ["partially-checked", "disabled"], - ["partially-checked", "pressed"], - ] - - property Component component: CheckBox { - text: "CheckBox" - enabled: !is("disabled") - checkState: is("checked") ? Qt.Checked : is("partially-checked") ? Qt.PartiallyChecked : Qt.Unchecked - // Only set it if it's pressed, or the non-pressed examples will have no press effects - down: is("pressed") ? true : undefined - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/CheckDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/CheckDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/CheckDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/CheckDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["pressed"], - ["checked"], - ["checked", "disabled"], - ["checked", "pressed"], - ["partially-checked"], - ["partially-checked", "disabled"], - ["partially-checked", "pressed"], - ] - - property Component component: CheckDelegate { - text: "CheckDelegate" - enabled: !is("disabled") - checkState: is("checked") ? Qt.Checked : is("partially-checked") ? Qt.PartiallyChecked : Qt.Unchecked - // Only set it if it's pressed, or the non-pressed examples will have no press effects - down: is("pressed") ? true : undefined - focusPolicy: Qt.StrongFocus - } - - property Component exampleComponent: ListView { - implicitWidth: 200 - implicitHeight: 200 - clip: true - model: 20 - delegate: CheckDelegate { - width: parent.width - text: "CheckDelegate" - focusPolicy: Qt.StrongFocus - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ComboBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ComboBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ComboBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ComboBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["pressed"], - ["open"], - ["editable"], - ["editable", "disabled"] - ] - - property Component component: ComboBox { - enabled: !is("disabled") - // Only set it if it's pressed, or the non-pressed examples will have no press effects - down: is("pressed") ? true : undefined - editable: is("editable") - model: ["ComboBox", "Apple", "Bird", "Cat", "Dog", "Elephant"] - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/DelayButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/DelayButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/DelayButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/DelayButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["disabled", "checked"], - ["pressed"], - ["checked"], - ] - - property Component component: Component { - DelayButton { - text: "DelayButton" -// enabled: !is("disabled") - // Only set it if it's pressed, or the non-pressed examples will have no press effects -// down: is("pressed") ? true : undefined - onDownChanged: print("down", down) - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Dialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Dialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Dialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Dialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -// TODO -QtObject { - property string customControlName: qsTr("Dialog") - - property var supportedStates: [ - [], - ["modal"], - ["dim"] - ] - - property Component component: Button { - id: dialogButton - text: qsTr("Dialog") - hoverEnabled: true - - onClicked: dialog.open() - - Dialog { - id: dialog - x: (window.width - width) / 2 - y: (window.height - height) / 2 - standardButtons: Dialog.Ok | Dialog.Cancel - parent: window.contentItem - modal: is("modal") - dim: is("dim") || is("modal") - - Label { - text: "Lorem ipsum dolor sit amet, \nconsectetuer adipiscing elit, \n" - + "sed diam nonummy nibh euismod tincidunt ut \nlaoreet dolore magna aliquam erat volutpat." - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Dial.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Dial.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Dial.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Dial.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - // TODO: no down property to test this with -// ["pressed"] - ] - - property Component component: Dial { - enabled: !is("disabled") - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Frame.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Frame.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Frame.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Frame.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ] - - property Component component: Frame { - Label { - text: "Frame" - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/GroupBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/GroupBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/GroupBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/GroupBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ] - - property Component component: GroupBox { - title: qsTr("Title") - - Label { - text: qsTr("GroupBox") - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ItemDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ItemDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ItemDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ItemDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["pressed"], - ["highlighted"], - ["highlighted", "pressed"] - ] - - property Component component: ItemDelegate { - text: "ItemDelegate" - enabled: !is("disabled") - checkable: is("checkable") - // Only set it if it's pressed, or the non-pressed examples will have no press effects - down: is("pressed") ? true : undefined - highlighted: is("highlighted") - focusPolicy: Qt.StrongFocus - } - - property Component exampleComponent: ListView { - implicitWidth: 200 - implicitHeight: 200 - clip: true - model: 20 - delegate: ItemDelegate { - width: parent.width - text: "ItemDelegate" - focusPolicy: Qt.StrongFocus - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Label.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Label.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Label.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Label.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"] - ] - - property Component component: Label { - text: "Label with a link" - onTextChanged: print(text) - enabled: !is("disabled") - textFormat: Label.StyledText - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/MenuBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/MenuBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/MenuBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/MenuBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -// TODO -QtObject { - property string customControlName: qsTr("MenuBar & MenuBarItem") - - property var supportedStates: [ - [] - ] - - property Component component: MenuBar { - MenuBarItem { - text: qsTr("Normal") - } - MenuBarItem { - text: qsTr("Pressed") - down: true - } - MenuBarItem { - text: qsTr("Highlighted") - highlighted: true - } - MenuBarItem { - text: qsTr("Disabled") - enabled: false - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Menu.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Menu.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Menu.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Menu.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,121 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -// TODO -QtObject { - property string customControlName: qsTr("Menu, MenuItem & MenuSeparator") - - property var supportedStates: [ - [] - ] - - property Component component: Button { - id: menuButton - text: qsTr("Menu") - checked: menu.visible - checkable: true - - Menu { - id: menu - x: 1 - y: 1 + parent.height - visible: menuButton.checked - closePolicy: Popup.CloseOnPressOutsideParent - - MenuItem { - text: "Normal" - } - MenuItem { - text: "Pressed" - down: true - } - MenuItem { - text: "Disabled" - enabled: false - } - - MenuSeparator {} - - MenuItem { - text: "Checked" - checked: true - } - MenuItem { - text: "Checked + Pressed" - checked: true - down: true - } - MenuItem { - text: "Checked + Disabled" - checked: true - enabled: false - } - - MenuSeparator {} - - Menu { - title: "Submenu" - - MenuItem { - text: "Submenu item" - } - } - - Menu { - title: "Disabled Submenu" - enabled: false - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/PageIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/PageIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/PageIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/PageIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - // TODO: no down property to test this with -// ["pressed"] - ] - - property Component component: PageIndicator { - enabled: !is("disabled") - count: 5 - } - - property Component exampleComponent: ColumnLayout { - implicitWidth: 200 - implicitHeight: 200 - - // TODO: why doesn't this fill the ColumnLayout? :/ - StackLayout { - id: swipeView - currentIndex: pageIndicator.currentIndex - - Label { - text: qsTr("Page 1") - horizontalAlignment: Label.AlignHCenter - } - - Label { - text: qsTr("Page 2") - horizontalAlignment: Label.AlignHCenter - } - - Label { - text: qsTr("Page 3") - horizontalAlignment: Label.AlignHCenter - } - - Label { - text: qsTr("Page 4") - horizontalAlignment: Label.AlignHCenter - } - - Label { - text: qsTr("Page 5") - horizontalAlignment: Label.AlignHCenter - } - } - - PageIndicator { - id: pageIndicator - currentIndex: swipeView.currentIndex - count: swipeView.count - interactive: true - anchors.horizontalCenter: parent.horizontalCenter - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Page.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Page.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Page.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Page.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ] - - property Component component: Page { - width: 100 - height: 100 - - Label { - text: "Page" - anchors.centerIn: parent - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Pane.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Pane.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Pane.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Pane.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ] - - property Component component: Pane { - width: 100 - height: 100 - - Label { - text: "Pane" - anchors.centerIn: parent - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ProgressBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ProgressBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ProgressBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ProgressBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["indeterminate"] - ] - - property Component component: ProgressBar { - enabled: !is("disabled") - indeterminate: is("indeterminate") - value: 0.25 - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/RadioButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/RadioButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/RadioButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/RadioButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["pressed"], - ["checked"], - ["checked", "disabled"], - ["checked", "pressed"], - ] - - property Component component: Component { - RadioButton { - text: "RadioButton" - enabled: !is("disabled") - checked: is("checked") - // Only set it if it's pressed, or the non-pressed examples will have no press effects - down: is("pressed") ? true : undefined - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/RadioDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/RadioDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/RadioDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/RadioDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["pressed"], - ["checked"], - ["checked", "disabled"], - ["checked", "pressed"] - ] - - property Component component: Component { - RadioDelegate { - text: "RadioDelegate" - enabled: !is("disabled") - checked: is("checked") - // Only set it if it's pressed, or the non-pressed examples will have no press effects - down: is("pressed") ? true : undefined - focusPolicy: Qt.StrongFocus - } - } - - property Component exampleComponent: ListView { - implicitWidth: 200 - implicitHeight: 200 - clip: true - model: 20 - delegate: RadioDelegate { - width: parent.width - text: "RadioDelegate" - focusPolicy: Qt.StrongFocus - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/RangeSlider.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/RangeSlider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/RangeSlider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/RangeSlider.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - ["vertical"], - ["vertical", "disabled"], - ["vertical", "pressed"], - ["horizontal"], - ["horizontal", "disabled"], - ["horizontal", "pressed"] - ] - - property Component component: RangeSlider { - enabled: !is("disabled") - orientation: is("horizontal") ? Qt.Horizontal : Qt.Vertical - second.value: 0.5 - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/RoundButton.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/RoundButton.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/RoundButton.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/RoundButton.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["pressed"], - ["checked"], - ["checked", "disabled"], - ["highlighted"], - ["highlighted", "disabled"], - ["highlighted", "pressed"], - ["highlighted", "checked"], - ["highlighted", "checkable", "pressed"], - ["highlighted", "checkable", "checked"], - ["flat"], - ["flat", "disabled"], - ["flat", "pressed"], - ["flat", "checked"], - ["flat", "checkable"], - ["flat", "checkable", "pressed"], - ["flat", "checkable", "checked", "pressed"], - ["flat", "checkable", "highlighted"], - ["flat", "checkable", "highlighted", "pressed"], - ["flat", "checkable", "highlighted", "checked"] - ] - - property Component component: RoundButton { - text: "B" - enabled: !is("disabled") - flat: is("flat") - checkable: is("checkable") - // Only set it if it's pressed, or the non-pressed examples will have no press effects - down: is("pressed") ? true : undefined - highlighted: is("highlighted") - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ScrollBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ScrollBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ScrollBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ScrollBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,114 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - ["vertical"], - ["vertical", "disabled"], - ["vertical", "interactive"], - ["vertical", "interactive", "disabled"], - ["horizontal"], - ["horizontal", "disabled"], - ["horizontal", "interactive"], - ["horizontal", "interactive", "disabled"] - ] - - property Component component: Frame { - width: 100 - height: 100 - clip: true - - Label { - text: "ABCDEFG\nHIJKLMN" - font.pixelSize: 40 - x: -horizontalScrollBar.position * width - y: -verticalScrollBar.position * height - } - - ScrollBar { - id: verticalScrollBar - enabled: !is("disabled") - orientation: Qt.Vertical - interactive: is("interactive") - visible: is("vertical") - size: 0.3 - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: parent.bottom - - Binding { - target: verticalScrollBar - property: "active" - value: verticalScrollBar.visible - } - } - - ScrollBar { - id: horizontalScrollBar - enabled: !is("disabled") - orientation: Qt.Horizontal - interactive: is("interactive") - visible: is("horizontal") - size: 0.3 - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - - Binding { - target: horizontalScrollBar - property: "active" - value: horizontalScrollBar.visible - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ScrollIndicator.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ScrollIndicator.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ScrollIndicator.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ScrollIndicator.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - ["vertical"], - ["vertical", "disabled"], - ["horizontal"], - ["horizontal", "disabled"], - ] - - property Component component: Frame { - width: 100 - height: 100 - clip: true - - Label { - text: "ABCDEFG\nHIJKLMN" - font.pixelSize: 40 - x: horizontalScrollIndicator.position * width - y: verticalScrollIndicator.position * height - } - - ScrollIndicator { - id: verticalScrollIndicator - enabled: !is("disabled") - orientation: Qt.Vertical - active: true - visible: is("vertical") - size: 0.3 - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: parent.bottom - } - - ScrollIndicator { - id: horizontalScrollIndicator - enabled: !is("disabled") - orientation: Qt.Horizontal - active: true - visible: is("horizontal") - size: 0.3 - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - - Binding { - target: horizontalScrollIndicator - property: "active" - value: horizontalScrollIndicator.visible - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Slider.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Slider.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Slider.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Slider.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - ["vertical"], - ["vertical", "disabled"], - ["vertical", "pressed"], - ["horizontal"], - ["horizontal", "disabled"], - ["horizontal", "pressed"] - ] - - property Component component: Slider { - enabled: !is("disabled") - orientation: is("horizontal") ? Qt.Horizontal : Qt.Vertical - value: 0.5 - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/SpinBox.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/SpinBox.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/SpinBox.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/SpinBox.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["pressed"], - ["disabled"], - ["mirrored"], - ["mirrored", "pressed"], - ["mirrored", "disabled"], - ["editable"], - ["editable", "pressed"], - ["editable", "disabled"], - ["editable", "mirrored"], - ["editable", "mirrored", "pressed"], - ["editable", "mirrored", "disabled"] - ] - - property Component component: SpinBox { - value: 1 - enabled: !is("disabled") - editable: is("editable") - up.pressed: is("pressed") - - LayoutMirroring.enabled: is("mirrored") - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/SwipeDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/SwipeDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/SwipeDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/SwipeDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["pressed"], - ["highlighted"], - ["highlighted", "pressed"] - ] - - property Component actionComponent: Component { - Rectangle { - color: SwipeDelegate.pressed ? "#333" : "#444" - width: parent ? parent.width : 0 - height: parent ? parent.height: 0 - clip: true - - Label { - text: "Test" - color: "white" - anchors.centerIn: parent - } - } - } - - property Component component: SwipeDelegate { - id: swipeDelegate - text: "SwipeDelegate" - enabled: !is("disabled") - checkable: is("checkable") - // Only set it if it's pressed, or the non-pressed examples will have no press effects - down: is("pressed") ? true : undefined - highlighted: is("highlighted") - focusPolicy: Qt.StrongFocus - - swipe.left: actionComponent - swipe.right: actionComponent - } - - property Component exampleComponent: ListView { - implicitWidth: 200 - implicitHeight: 200 - clip: true - model: 20 - delegate: SwipeDelegate { - width: parent.width - text: "SwipeDelegate" - focusPolicy: Qt.StrongFocus - - swipe.left: actionComponent - swipe.right: actionComponent - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/SwitchDelegate.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/SwitchDelegate.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/SwitchDelegate.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/SwitchDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["pressed"], - ["highlighted"], - ["highlighted", "pressed"], - ["mirrored"] - ] - - property Component component: SwitchDelegate { - text: "SwitchDelegate" - enabled: !is("disabled") - // Only set it if it's pressed, or the non-pressed examples will have no press effects - down: is("pressed") ? true : undefined - highlighted: is("highlighted") - focusPolicy: Qt.StrongFocus - - LayoutMirroring.enabled: is("mirrored") - } - - property Component exampleComponent: ListView { - implicitWidth: 200 - implicitHeight: 200 - clip: true - model: 20 - delegate: SwitchDelegate { - width: parent.width - text: "SwitchDelegate" - focusPolicy: Qt.StrongFocus - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Switch.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Switch.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Switch.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Switch.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ["pressed"], - ["checked"], - ["checked", "disabled"], - ["checked", "disabled", "mirrored"], - ["checked", "pressed"], - ["checked", "pressed", "mirrored"], - ["mirrored"], - ] - - property Component component: Switch { - text: "Switch" - enabled: !is("disabled") - checked: is("checked") - // Only set it if it's pressed, or the non-pressed examples will have no press effects - down: is("pressed") ? true : undefined - - LayoutMirroring.enabled: is("mirrored") - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/TabBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/TabBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/TabBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/TabBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -// TODO -QtObject { - property string customControlName: qsTr("TabBar & TabButton") - - property var supportedStates: [ - ["header"], - ["header", "disabled"], - ["footer"], - ["footer", "disabled"] - ] - - property Component component: TabBar { - implicitHeight: tabButton1.implicitHeight - enabled: !is("disabled") - position: is("header") ? TabBar.Header : TabBar.Footer - - TabButton { - id: tabButton1 - text: qsTr("TabButton 1") - } - TabButton { - text: qsTr("TabButton 2") - } - TabButton { - text: qsTr("TabButton 3") - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/TextArea.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/TextArea.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/TextArea.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/TextArea.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ] - - property Component component: Column { - spacing: 10 - - TextArea { - text: "TextArea\nwith\ntext" - enabled: !is("disabled") - } - - TextArea { - placeholderText: "TextArea with placeholderText" - enabled: !is("disabled") - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/TextField.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/TextField.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/TextField.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/TextField.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"], - ] - - property Component component: Column { - spacing: 10 - - TextField { - text: "TextField with text" - enabled: !is("disabled") - } - - TextField { - placeholderText: "TextField with placeholderText" - enabled: !is("disabled") - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ToolBar.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ToolBar.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ToolBar.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ToolBar.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -// TODO -QtObject { - property string customControlName: qsTr("ToolBar, ToolButton & ToolSeparator") - - property var supportedStates: [ - ["header"], - ["header", "disabled"], - ["footer"], - ["footer", "disabled"] - ] - - property Component component: ToolBar { - enabled: !is("disabled") - position: is("header") ? ToolBar.Header : ToolBar.Footer - - RowLayout { - anchors.fill: parent - - ToolButton { - text: qsTr("ToolButton 1") - } - ToolButton { - text: qsTr("ToolButton 2") - } - - ToolSeparator {} - - ToolButton { - text: qsTr("ToolButton 3") - } - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ToolTip.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ToolTip.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/ToolTip.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/ToolTip.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -QtObject { - property var supportedStates: [ - [] - ] - - property Component component: Button { - text: qsTr("Hover over me") - - ToolTip.text: qsTr("ToolTip") - ToolTip.visible: hovered - ToolTip.delay: 500 - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Tumbler.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Tumbler.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/controls/Tumbler.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/controls/Tumbler.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -QtObject { - property var supportedStates: [ - [], - ["disabled"] - ] - - property Component component: Tumbler { - model: 20 - enabled: !is("disabled") - - LayoutMirroring.enabled: is("mirrored") - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/directoryvalidator.cpp qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/directoryvalidator.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/directoryvalidator.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/directoryvalidator.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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 "directoryvalidator.h" - -#include - -DirectoryValidator::DirectoryValidator(QObject *parent) : - QObject(parent) -{ -} - -QString DirectoryValidator::path() const -{ - return mPath; -} - -void DirectoryValidator::setPath(const QString &path) -{ - if (path == mPath) - return; - - const bool wasValid = isValid(); - const QString oldErrorMessage = mErrorMessage; - - mPath = path; - mErrorMessage.clear(); - - QFileInfo fileInfo(mPath); - if (!fileInfo.exists()) { - mErrorMessage = QLatin1String("Directory does not exist"); - } else { - if (!fileInfo.isDir()) { - mErrorMessage = QLatin1String("Not a directory"); - } - } - - if (isValid() != wasValid) - emit validChanged(); - - if (mErrorMessage != oldErrorMessage) - emit errorMessageChanged(); - - emit pathChanged(); -} - -bool DirectoryValidator::isValid() const -{ - return mErrorMessage.isEmpty(); -} - -QString DirectoryValidator::errorMessage() const -{ - return mErrorMessage; -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/directoryvalidator.h qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/directoryvalidator.h --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/directoryvalidator.h 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/directoryvalidator.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -#ifndef DIRECTORYVALIDATOR_H -#define DIRECTORYVALIDATOR_H - -#include - -class DirectoryValidator : public QObject -{ - Q_OBJECT - Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged FINAL) - Q_PROPERTY(bool valid READ isValid NOTIFY validChanged FINAL) - Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY errorMessageChanged FINAL) - -public: - explicit DirectoryValidator(QObject *parent = nullptr); - - QString path() const; - void setPath(const QString &path); - - bool isValid() const; - QString errorMessage() const; - -signals: - void pathChanged(); - void validChanged(); - void errorMessageChanged(); - -private: - void updateValid(); - - QString mPath; - QString mErrorMessage; -}; - -#endif // DIRECTORYVALIDATOR_H diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/ExampleContainer.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/ExampleContainer.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/ExampleContainer.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/ExampleContainer.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -Frame { - id: container - - property var controlMetaObject - - ColumnLayout { - id: exampleLayout - anchors.centerIn: parent - - Label { - text: !exampleLoader.active ? qsTr("Show example") : qsTr("Hide example") - - Layout.alignment: Qt.AlignHCenter - - MouseArea { - anchors.fill: parent - onClicked: exampleLoader.active = !exampleLoader.active - } - } - - Loader { - id: exampleLoader - active: false - sourceComponent: controlMetaObject ? controlMetaObject.exampleComponent : null - - Layout.preferredHeight: active ? item.implicitHeight : 0 - } - } -} Binary files /tmp/tmpICz8YC/aINUqMjc2v/qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/fonts/fontawesome.ttf and /tmp/tmpICz8YC/qCX6Eu2PhO/qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/fonts/fontawesome.ttf differ diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/fonts/LICENSE.txt qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/fonts/LICENSE.txt --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/fonts/LICENSE.txt 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/fonts/LICENSE.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Font license info - - -## Font Awesome - - Copyright (C) 2016 by Dave Gandy - - Author: Dave Gandy - License: SIL () - Homepage: http://fortawesome.github.com/Font-Awesome/ - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/fonts.qrc qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/fonts.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/fonts.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/fonts.qrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ - - - fonts/fontawesome.ttf - - diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/main.cpp qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/main.cpp --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/main.cpp 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/main.cpp 2018-03-21 07:59:29.000000000 +0000 @@ -48,45 +48,22 @@ ** ****************************************************************************/ -#include -#include #include -#include #include -#include -#include - -#include "assetfixer.h" -#include "clipboard.h" -#include "directoryvalidator.h" +#include int main(int argc, char *argv[]) { - QGuiApplication::setApplicationName("testbench"); - QGuiApplication::setOrganizationName("QtProject"); QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); - QSettings settings; - QString style = QQuickStyle::name(); - if (!style.isEmpty()) - settings.setValue("style", style); - else - QQuickStyle::setStyle(settings.value("style").isValid() ? settings.value("style").toString() : "Imagine"); - - if (QFontDatabase::addApplicationFont(":/fonts/fontawesome.ttf") == -1) { - qWarning() << "Failed to load fontawesome font"; - } + QUnifiedTimer::instance()->setSlowModeEnabled(app.arguments().contains("-slow")); + // These must be set before running. + // TODO: move style selection into app UI and use settings to save choices. + // qputenv("QT_QUICK_CONTROLS_STYLE", "material"); QQmlApplicationEngine engine; - - qmlRegisterType("App", 1, 0, "AssetFixer"); - qmlRegisterType("App", 1, 0, "Clipboard"); - qmlRegisterType("App", 1, 0, "DirectoryValidator"); - - engine.rootContext()->setContextProperty("availableStyles", QQuickStyle::availableStyles()); - engine.load(QUrl(QStringLiteral("qrc:/testbench.qml"))); return app.exec(); diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/qml.qrc qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/qml.qrc --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/qml.qrc 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/qml.qrc 2018-03-21 07:59:29.000000000 +0000 @@ -1,44 +1,5 @@ - ControlContainer.qml - controls/Button.qml - controls/CheckBox.qml - controls/RadioButton.qml - controls/CheckDelegate.qml - controls/ComboBox.qml - controls/DelayButton.qml - controls/Dial.qml - controls/Frame.qml - controls/GroupBox.qml - controls/ItemDelegate.qml - controls/Page.qml - controls/PageIndicator.qml - controls/Pane.qml - controls/ProgressBar.qml - controls/RadioDelegate.qml - controls/RangeSlider.qml - controls/RoundButton.qml - controls/ScrollBar.qml - controls/ScrollIndicator.qml - controls/Slider.qml - controls/SpinBox.qml - controls/SwipeDelegate.qml - controls/Switch.qml - controls/SwitchDelegate.qml - controls/TabBar.qml - controls/TextArea.qml - controls/TextField.qml - SettingsDialog.qml - ColorEditor.qml - controls/ToolBar.qml - controls/Dialog.qml - controls/Menu.qml - ExampleContainer.qml - controls/Label.qml - controls/ToolTip.qml - controls/Tumbler.qml - controls/BusyIndicator.qml testbench.qml - controls/MenuBar.qml diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/README.md qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/README.md --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/README.md 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/README.md 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -# Style Testbench - -The Style Testbench provides a way to quickly see how controls look in different states with a given style. - -When run with the Imagine style, the testbench will react to changes to image assets and automatically fix and reload them. -To use this functionality, click on the settings icon and then the settings menu item. -From there, check "Use Custom Imagine Style Assets" and provide a path to your custom assets in the text field. -If you want your 9-patch assets to be automatically fixed up (e.g. turn 4 pixel-thick 9-patch lines exported at -@4x to a 1 pixel-thick line), check "Fix Imagine Style Assets". - -## Custom Text colors - -To use custom text colors, enable the "Use Custom Palette" option in the settings dialog, and then provide colors in the relevant fields. As an example, the WindowText palette role affects text that is displayed directly against the window (labels, flat button text, etc.), ButtonText affects text that is displayed against a button's background, and so on. A full list of color roles can be found here: - -http://doc.qt.io/qt-5/qpalette.html#ColorRole-enum - -The custom text color settings apply to every style that supports palettes, until turned off. - -The "Copy Palette Settings To Clipboard" button in the settings dialog can be used to copy the current colors and share them with others. Once someone has your custom colors, they can import them with the "Imort Palette Settings From Clipboard" button. - -## Tips - -- Ensure that 9-patch lines are black (#000000) or red (#ff0000). If these colors are slightly - off (e.g. #010101), the assets won't display correctly when run in the application. -- Don't use pure black in assets that have black 9-patch lines, as this will confuse the asset fixer. - -## Shortcuts - -| Name | Shortcut | Shortcut (Mac) | Description | -|-------------------|--------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------------------| -| Use Custom Assets | Ctrl+Shift+C | ⌘+Shift+C | If using the Imagine style, toggles between the default assets and the user's custom assets. Custom assets are specified in the settings dialog. | -| Fix Custom Assets | Ctrl+Shift+X | ⌘+Shift+X | If using the Imagine style, manually fixes the assets. This is done automatically when "Automatically Fix Custom Assets" checkbox is checked. | -| Reload Assets | Ctrl+R | ⌘+R | If using the Imagine style, reloads the assets from disk. This is usually done automatically. | -| Search/Filter | Ctrl+F | ⌘+F | Filter the controls that are shown. Case-sensitive. | -| Quit | Ctrl+Q | ⌘+Q | Quit the application. | diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/SettingsDialog.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/SettingsDialog.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/SettingsDialog.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/SettingsDialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,453 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import QtQuick.Layouts 1.12 - -import App 1.0 - -Dialog { - id: settingsDialog - title: "Settings" - width: 500 - height: 400 - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - - Imagine.path: defaultImaginePath - - property alias imaginePathTextField: imaginePathTextField - property alias customImagineStyleCheckBox: customImagineStyleCheckBox - property alias autoFixImagineAssetsCheckBox: autoFixImagineAssetsCheckBox - - onAboutToShow: { - styleComboBox.currentIndex = styleComboBox.styleIndex - customImagineStyleCheckBox.checked = settings.useCustomImaginePath - imaginePathTextField.text = settings.imaginePath - autoFixImagineAssetsCheckBox.checked = settings.autoFixImagineAssets - - updatePaletteSettingsControls(paletteSettings) - } - - onAccepted: { - settings.style = styleComboBox.displayText - settings.useCustomImaginePath = customImagineStyleCheckBox.checked - settings.imaginePath = imaginePathTextField.text - settings.autoFixImagineAssets = autoFixImagineAssetsCheckBox.checked - - paletteSettings.useCustomPalette = useCustomPaletteCheckBox.checked - paletteSettings.window = windowColorEditor.color - paletteSettings.windowText = windowTextColorEditor.color - paletteSettings.base = baseColorEditor.color - paletteSettings.text = textColorEditor.color - paletteSettings.button = buttonColorEditor.color - paletteSettings.buttonText = buttonTextColorEditor.color - paletteSettings.brightText = brightTextColorEditor.color - paletteSettings.toolTipBase = toolTipBaseColorEditor.color - paletteSettings.toolTipText = toolTipTextColorEditor.color - paletteSettings.light = lightColorEditor.color - paletteSettings.midlight = midlightColorEditor.color - paletteSettings.dark = darkColorEditor.color - paletteSettings.mid = midColorEditor.color - paletteSettings.shadow = shadowColorEditor.color - paletteSettings.highlight = highlightColorEditor.color - paletteSettings.highlightedText = highlightedTextColorEditor.color - paletteSettings.link = linkColorEditor.color - } - - function updatePaletteSettingsControls(source) { - useCustomPaletteCheckBox.checked = paletteSettings.useCustomPalette - windowColorEditor.color = source.window - windowTextColorEditor.color = source.windowText - baseColorEditor.color = source.base - textColorEditor.color = source.text - buttonColorEditor.color = source.button - buttonTextColorEditor.color = source.buttonText - brightTextColorEditor.color = source.brightText - toolTipBaseColorEditor.color = source.toolTipBase - toolTipTextColorEditor.color = source.toolTipText - lightColorEditor.color = source.light - midlightColorEditor.color = source.midlight - darkColorEditor.color = source.dark - midColorEditor.color = source.mid - shadowColorEditor.color = source.shadow - highlightColorEditor.color = source.highlight - highlightedTextColorEditor.color = source.highlightedText - linkColorEditor.color = source.link - } - - function paletteSettingsMap() { - var map = ({}); - map.window = windowColorEditor.color - map.windowText = windowTextColorEditor.color - map.base = baseColorEditor.color - map.text = textColorEditor.color - map.button = buttonColorEditor.color - map.buttonText = buttonTextColorEditor.color - map.brightText = brightTextColorEditor.color - map.toolTipBase = toolTipBaseColorEditor.color - map.toolTipText = toolTipTextColorEditor.color - map.light = lightColorEditor.color - map.midlight = midlightColorEditor.color - map.dark = darkColorEditor.color - map.mid = midColorEditor.color - map.shadow = shadowColorEditor.color - map.highlight = highlightColorEditor.color - map.highlightedText = highlightedTextColorEditor.color - map.link = linkColorEditor.color - return map; - } - - Clipboard { - id: clipboard - } - - DirectoryValidator { - id: directoryValidator - path: imaginePathTextField.text - } - - contentItem: Flickable { - contentWidth: settingsDialog.availableWidth - contentHeight: contentLayout.implicitHeight - flickableDirection: Qt.Vertical - clip: true - - ColumnLayout { - id: contentLayout - anchors.fill: parent - - GroupBox { - title: qsTr("General") - Layout.fillWidth: true - - GridLayout { - columns: 2 - - Label { - text: "Style:" - } - - ComboBox { - id: styleComboBox - model: availableStyles - - property int styleIndex: -1 - - Component.onCompleted: { - styleIndex = find(settings.style, Qt.MatchFixedString) - if (styleIndex !== -1) - currentIndex = styleIndex - } - - Layout.fillWidth: true - } - - Item { - Layout.fillWidth: true - } - - Label { - text: "Restart required" - color: "#e41e25" - opacity: styleComboBox.currentIndex !== styleComboBox.styleIndex ? 1.0 : 0.0 - Layout.topMargin: 12 - Layout.maximumHeight: styleComboBox.currentIndex !== styleComboBox.styleIndex ? implicitHeight : 0 - } - } - } - - GroupBox { - title: qsTr("Imagine Style") - visible: usingImagineStyle - Layout.fillWidth: true - Layout.columnSpan: 2 - - GridLayout { - columns: 2 - anchors.fill: parent - - CheckBox { - id: customImagineStyleCheckBox - text: qsTr("Use Custom Assets") - enabled: usingImagineStyle - - Layout.columnSpan: 2 - } - - Label { - text: "Asset Path" - enabled: usingImagineStyle && customImagineStyleCheckBox.checked - } - - TextField { - id: imaginePathTextField - text: settings.imaginePath - enabled: usingImagineStyle && customImagineStyleCheckBox.checked - - Layout.preferredWidth: 200 - Layout.fillWidth: true - - ToolTip { - text: "Path to a folder that contains Imagine style image assets" - visible: imaginePathTextField.hovered - delay: 500 - parent: imaginePathTextField - - Imagine.path: defaultImaginePath - } - } - - Item { - Layout.fillWidth: true - } - - Label { - text: directoryValidator.errorMessage - color: "#e41e25" - opacity: !directoryValidator.valid ? 1.0 : 0.0 - elide: Label.ElideMiddle - Layout.topMargin: !directoryValidator.valid ? 12 : 0 - Layout.maximumHeight: !directoryValidator.valid ? implicitHeight : 0 - - Layout.fillWidth: true - } - - CheckBox { - id: autoFixImagineAssetsCheckBox - text: "Automatically Fix Custom Assets" - enabled: usingImagineStyle && customImagineStyleCheckBox.checked - - Layout.columnSpan: 2 - - ToolTip { - text: "If set, custom Imagine style assets will be modified to be compliant whenever they have changed on disk" - visible: autoFixImagineAssetsCheckBox.hovered - delay: 500 - parent: imaginePathTextField - - Imagine.path: defaultImaginePath - } - } - } - } - - GroupBox { - title: qsTr("Palette") - Layout.fillWidth: true - - GridLayout { - columns: 2 - anchors.fill: parent - - CheckBox { - id: useCustomPaletteCheckBox - text: qsTr("Use Custom Palette") - } - - ColorEditor { - id: windowColorEditor - labelText: qsTr("Window") - toolTipText: qsTr("A general background color.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: windowTextColorEditor - labelText: qsTr("WindowText") - toolTipText: qsTr("A general foreground color.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: baseColorEditor - labelText: qsTr("Base") - toolTipText: qsTr("Used mostly as the background color for text editor controls and items views. It is usually white or another light color.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: textColorEditor - labelText: qsTr("Text") - toolTipText: qsTr("The foreground color used with Base. This is usually the same as the WindowText, in which case it must provide good contrast with Window and Base.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: buttonColorEditor - labelText: qsTr("Button") - toolTipText: qsTr("The general button background color. This background can be different from Window as some styles require a different background color for buttons.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: buttonTextColorEditor - labelText: qsTr("ButtonText") - toolTipText: qsTr("A foreground color used with the Button color.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: brightTextColorEditor - labelText: qsTr("BrightText") - toolTipText: qsTr("A text color that is very different from WindowText, and contrasts well with e.g. Dark. Typically used for text that needs to be drawn where Text, WindowText or ButtonText would give poor contrast, such as on highlighted buttons.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: toolTipBaseColorEditor - labelText: qsTr("ToolTipBase") - toolTipText: qsTr("Used as the background color for tooltips.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: toolTipTextColorEditor - labelText: qsTr("ToolTipText") - toolTipText: qsTr("Used as the foreground color for tooltips.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: lightColorEditor - labelText: qsTr("Light") - toolTipText: qsTr("Lighter than Button.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: midlightColorEditor - labelText: qsTr("Midlight") - toolTipText: qsTr("Between Button and Light.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: darkColorEditor - labelText: qsTr("Dark") - toolTipText: qsTr("Darker than Button.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: midColorEditor - labelText: qsTr("Mid") - toolTipText: qsTr("Between Button and Dark.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: shadowColorEditor - labelText: qsTr("Shadow") - toolTipText: qsTr("A very dark color.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: highlightColorEditor - labelText: qsTr("Highlight") - toolTipText: qsTr("A color to indicate a selected item or the current item.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: linkColorEditor - labelText: qsTr("Link") - toolTipText: qsTr("A text color used for hyperlinks.") - enabled: useCustomPaletteCheckBox.checked - } - - ColorEditor { - id: highlightedTextColorEditor - labelText: qsTr("HighlightedText") - toolTipText: qsTr("A text color that contrasts with Highlight.") - enabled: useCustomPaletteCheckBox.checked - } - - Button { - text: qsTr("Copy Palette Settings To Clipboard") - enabled: useCustomPaletteCheckBox.checked - onClicked: clipboard.copy(paletteSettingsMap()) - - Layout.columnSpan: 2 - Layout.alignment: Qt.AlignRight - } - - Button { - text: qsTr("Import Palette Settings From Clipboard") - enabled: useCustomPaletteCheckBox.checked - onClicked: updatePaletteSettingsControls(clipboard.paste()) - - Layout.columnSpan: 2 - Layout.alignment: Qt.AlignRight - } - } - } - - Item { - Layout.fillHeight: true - } - } - } - - footer: DialogButtonBox { - Button { - text: qsTr("OK") - DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole - enabled: !imaginePathTextField.enabled || (imaginePathTextField.enabled && directoryValidator.valid) - } - Button { - text: qsTr("Cancel") - DialogButtonBox.buttonRole: DialogButtonBox.RejectRole - } - } -} diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/testbench.pro qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/testbench.pro --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/testbench.pro 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/testbench.pro 2018-03-21 07:59:29.000000000 +0000 @@ -1,20 +1,11 @@ TEMPLATE = app -QT += qml quick quickcontrols2 +QT += qml quick core-private CONFIG += c++11 -HEADERS += \ - assetfixer.h \ - directoryvalidator.h \ - clipboard.h +SOURCES += main.cpp -SOURCES += main.cpp \ - assetfixer.cpp \ - directoryvalidator.cpp \ - clipboard.cpp - -RESOURCES += qml.qrc \ - fonts.qrc +RESOURCES += qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/testbench.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/testbench.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/testbench/testbench.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/testbench/testbench.qml 2018-03-21 07:59:29.000000000 +0000 @@ -48,498 +48,872 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Imagine 2.12 -import Qt.labs.folderlistmodel 2.2 -import Qt.labs.settings 1.0 - -import App 1.0 +import QtQuick 2.6 +import QtQuick.Window 2.2 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 2.1 +import QtQuick.Controls.Material 2.1 +import QtQuick.Controls.Universal 2.1 ApplicationWindow { id: window visible: true - width: 1000 - height: 750 - title: "Style Testbench - " + settings.style + " Style" + (usingImagineStyle ? imagineTitleText : "") - - Imagine.path: defaultImaginePath - - readonly property bool usingImagineStyle: settings.style.toLowerCase() === "imagine" - // Some controls should be visible regardless of whether or not custom assets are lacking for it, - // so we use the default assets in some cases. - readonly property string defaultImaginePath: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Imagine/images/" - property bool settingsLoaded: false - readonly property string imagineTitleText: " - " + (settings.useCustomImaginePath ? settings.imaginePath : "Default Assets") - - LoggingCategory { - id: brief - name: "qt.quick.controls.tools.testbench.assetfixer.brief" - } + width: 750 + height: 1000 - Shortcut { - sequence: "Ctrl+F" - onActivated: searchTextField.forceActiveFocus() + Component.onCompleted: { + x = Screen.width / 2 - width / 2 + y = Screen.height / 2 - height / 2 } + Material.theme: themeSwitch.checked ? Material.Dark : Material.Light + Universal.theme: themeSwitch.checked ? Universal.Dark : Universal.Light + + property int controlSpacing: 10 + Shortcut { sequence: "Ctrl+Q" onActivated: Qt.quit() } - Action { - id: fixAssetsAction - text: qsTr("Fix Custom Assets") - shortcut: "Ctrl+Shift+X" - enabled: usingImagineStyle - onTriggered: assetFixer.manualFix() - } - - Action { - id: useCustomAssetsAction - text: qsTr("Use Custom Assets") - shortcut: "Ctrl+Shift+C" - enabled: usingImagineStyle - checkable: true - checked: settings.useCustomImaginePath - onTriggered: settings.useCustomImaginePath = !settings.useCustomImaginePath - } - - Action { - id: reloadAssetsAction - text: qsTr("Reload Assets") - shortcut: "Ctrl+R" - enabled: usingImagineStyle - onTriggered: assetFixer.reloadAssets() - } - - FontMetrics { - id: fontMetrics - } - - Settings { - id: settings - - property alias windowX: window.x - property alias windowY: window.y - property alias windowWidth: window.width - property alias windowHeight: window.height - - property string style: "Imagine" - - property bool useCustomImaginePath - property string imaginePath - property bool autoFixImagineAssets - property alias imagineDirLastModified: assetFixer.assetDirectoryLastModified - - Component.onCompleted: settingsLoaded = true - } + header: ToolBar { + Material.theme: Material.Dark - Settings { - id: paletteSettings + RowLayout { + anchors.fill: parent - category: "Palette" + ToolButton { + text: "Normal" + hoverEnabled: true + ToolTip.text: text + ToolTip.delay: 1000 + ToolTip.visible: hovered + onClicked: menu.visible ? menu.close() : menu.open() - property bool useCustomPalette - property string window - property string windowText - property string base - property string text - property string button - property string buttonText - property string brightText - property string toolTipBase - property string toolTipText - property string light - property string midlight - property string dark - property string mid - property string shadow - property string highlight - property string highlightedText - property string link - } + Menu { + id: menu + x: 1 + y: 1 + parent.height - header: ToolBar { - // Seems to be necessary to get the default assets to be used here, - // though it should inherit the window's path - Imagine.path: defaultImaginePath + MenuItem { + text: "Option 1" + checkable: true + } + MenuItem { + text: "Option 2" + checkable: true + } + MenuItem { + text: "Option 3" + checkable: true + } - RowLayout { - anchors.fill: parent + MenuSeparator {} + MenuItem { + text: "Option A" + } + } + } ToolButton { - text: "\uf0c9" - font.family: "fontawesome" - font.pixelSize: Qt.application.font.pixelSize * 1.6 - onClicked: drawer.open() + text: "Pressed" + down: true + hoverEnabled: true + ToolTip.text: text + ToolTip.delay: 1000 + ToolTip.visible: hovered + } + ToolButton { + text: "Checked" + checkable: true + checked: true + hoverEnabled: true + ToolTip.text: text + ToolTip.delay: 1000 + ToolTip.visible: hovered + } + ToolButton { + text: "Highlighted" + highlighted: true + hoverEnabled: true + ToolTip.text: text + ToolTip.delay: 1000 + ToolTip.visible: hovered + } + ToolButton { + text: "Disabled" + enabled: false } ToolSeparator {} - TextField { - id: searchTextField - placeholderText: "Search" + ToolButton { + text: "1" } + ToolButton { + text: "2" + } + + ToolSeparator {} Item { Layout.fillWidth: true } + Label { + text: "Light/Dark" + } + Switch { + id: themeSwitch + } + } + } - ToolButton { - id: optionsMenuButton - text: "\ue800" - font.family: "FontAwesome" - font.pixelSize: Qt.application.font.pixelSize * 1.6 - checked: optionsMenu.visible - checkable: true + footer: TabBar { + TabButton { + text: "Normal" + } + TabButton { + text: "Pressed" + down: true + } + TabButton { + text: "Disabled" + enabled: false + } + } - onClicked: optionsMenu.open() + Pane { + anchors.fill: parent - Menu { - id: optionsMenu - x: 1 - y: 1 + parent.height - visible: optionsMenuButton.checked - closePolicy: Popup.CloseOnPressOutsideParent + Flickable { + anchors.fill: parent + contentHeight: flow.height - Imagine.path: defaultImaginePath + Flow { + id: flow + width: parent.width + spacing: 30 - MenuItem { - text: qsTr("Open Asset Directory") - onClicked: Qt.openUrlExternally(assetFixer.assetDirectoryUrl) - enabled: usingImagineStyle - } + RowLayout { + spacing: window.controlSpacing - MenuItem { - action: reloadAssetsAction + Button { + text: "Normal" + } + Button { + text: "Pressed" + down: true + } + Button { + text: "Checked" + checked: true + } + Button { + text: "CH + PR" + checked: true + down: true } + Button { + text: "Disabled" + enabled: false + } + Button { + text: "CH + DIS" + enabled: false + checked: true + } + } - MenuItem { - action: useCustomAssetsAction + RowLayout { + spacing: window.controlSpacing + + Button { + text: "HI" + highlighted: true + } + Button { + text: "HI + PR" + highlighted: true + down: true + } + Button { + text: "HI + CH" + highlighted: true + checked: true + } + Button { + text: "HI+CH+PR" + highlighted: true + down: true + checked: true } + Button { + text: "HI + DIS" + highlighted: true + enabled: false + } + Button { + text: "HI+CH+DIS" + highlighted: true + enabled: false + checked: true + } + } - MenuItem { - action: fixAssetsAction + RowLayout { + spacing: window.controlSpacing * 2 + + Button { + text: "Normal" + } + Button { + text: "Pressed" + down: true + } + Button { + text: "Checked" + checked: true + } + Button { + text: "CH + PR" + checked: true + down: true } + Button { + text: "Disabled" + enabled: false + } + Button { + text: "CH + DIS" + enabled: false + checked: true + } + } - MenuSeparator {} + RowLayout { + spacing: window.controlSpacing * 2 - MenuItem { - id: settingsMenuItem - text: qsTr("Settings") - onTriggered: settingsDialog.open() + ColumnLayout { + RoundButton { + highlighted: true + Layout.alignment: Qt.AlignHCenter + } + Label { + text: "HI" + Layout.alignment: Qt.AlignHCenter + } + } + ColumnLayout { + RoundButton { + highlighted: true + down: true + Layout.alignment: Qt.AlignHCenter + } + Label { + text: "HI + PR" + Layout.alignment: Qt.AlignHCenter + } } + ColumnLayout { + RoundButton { + highlighted: true + checked: true + Layout.alignment: Qt.AlignHCenter + } + Label { + text: "HI + CH" + Layout.alignment: Qt.AlignHCenter + } + } + ColumnLayout { + RoundButton { + highlighted: true + down: true + checked: true + Layout.alignment: Qt.AlignHCenter + } + Label { + text: "HI+CH+PR" + Layout.alignment: Qt.AlignHCenter + } + } + ColumnLayout { + RoundButton { + highlighted: true + enabled: false + Layout.alignment: Qt.AlignHCenter + } + Label { + text: "HI + DIS" + Layout.alignment: Qt.AlignHCenter + } + } + ColumnLayout { + RoundButton { + highlighted: true + enabled: false + checked: true + Layout.alignment: Qt.AlignHCenter + } + Label { + text: "HI+CH+DIS" + Layout.alignment: Qt.AlignHCenter + } + } + } - MenuSeparator {} + RowLayout { + CheckBox { + text: "Normal" + } + CheckBox { + text: "Pressed" + down: true + } + CheckBox { + text: "Checked" + checked: true + } + CheckBox { + text: "CH + PR" + checked: true + down: true + } + CheckBox { + text: "Disabled" + enabled: false + } + CheckBox { + text: "CH + DIS" + checked: true + enabled: false + } + } - MenuItem { - text: qsTr("Quit") - onTriggered: Qt.quit() + RowLayout { + RadioButton { + text: "Normal" + } + RadioButton { + text: "Pressed" + down: true + } + RadioButton { + text: "Checked" + checked: true + } + RadioButton { + text: "CH + PR" + checked: true + down: true + } + RadioButton { + text: "Disabled" + enabled: false + } + RadioButton { + text: "CH + DIS" + checked: true + enabled: false } } - } - } - } - SettingsDialog { - id: settingsDialog + RowLayout { + Switch { + text: "Normal" + } + Switch { + text: "Pressed" + down: true + } + Switch { + text: "Checked" + checked: true + } + Switch { + text: "CH + PR" + checked: true + down: true + } + Switch { + text: "Disabled" + enabled: false + } + } - Imagine.path: defaultImaginePath - } + RowLayout { + ProgressBar { + value: 0.5 + } + ProgressBar { + value: 0.5 + indeterminate: true + } + ProgressBar { + value: 0.5 + enabled: false + } + } - Drawer { - id: drawer - width: parent.width * 0.33 - height: window.height - focus: false - modal: false - - Label { - text: "Drawer contents go here" - anchors.centerIn: parent - } - } + RowLayout { + Slider { + value: 0.5 + } + Slider { + value: 0.5 + pressed: true + } + Slider { + value: 0.5 + enabled: false + } + } - AssetFixer { - id: assetFixer - assetDirectory: settings.imaginePath - // Don't start watching until the settings have loaded, as AssetFixer can be completed before it. - // AssetFixer needs the settings in order to check the last modified time of the asset directory. - // Also, wait until the UI has been rendered for the first time so that we can show our busy indicators, etc. - shouldWatch: usingImagineStyle && settings.useCustomImaginePath && settingsLoaded && initialUiRenderDelayTimer.hasRun - shouldFix: (shouldWatch && settings.autoFixImagineAssets) || manuallyFixing - - onFixSuggested: autoFix() - onDelayedFixSuggested: assetFixerFileSystemDelayTimer.restart() - onReloadSuggested: reloadAssets() - - property bool manuallyFixing: false - - function reloadAssets() { - console.log(brief, "Reloading assets...") - // Clear the model, otherwise ListView will keep the old items around - // with the old assets, even after clearing the pixmap cache - listView.resettingModel = true - listView.model = null - window.Imagine.path = "" - assetReloadNextFrameTimer.start() - } + RowLayout { + RangeSlider { + first.value: 0.25 + second.value: 0.75 + } + RangeSlider { + first.value: 0.25 + first.pressed: true + second.value: 0.75 + } + RangeSlider { + first.value: 0.25 + second.value: 0.75 + enabled: false + } + } - function autoFix() { - // This is a bit of a hack, but I can't think of a nice way to solve it. - // The problem is that shouldWatch becomes true, causing startWatching() to be called. - // If a fix is suggested as a result of that, this function is called. - // However, the shouldFix binding hasn't been updated yet, so even though shouldWatch - // and settings.autoFixImagineAssets are both true (the properties that make up its binding), - // the if check below fails. So, we check for that case with effectiveShouldFix. - var effectiveShouldFix = shouldWatch && settings.autoFixImagineAssets; - if (shouldWatch && effectiveShouldFix && assetDirectory.length > 0) { - fixEmUp(); - } - } + RowLayout { + Item { + implicitWidth: normalGroupBox.width + implicitHeight: normalTextArea.implicitHeight + + TextArea { + id: normalTextArea + text: "Normal" + } + } + Item { + implicitWidth: normalGroupBox.width + implicitHeight: normalTextArea.implicitHeight - function manualFix() { - fixEmUp(true); - } + TextArea { + placeholderText: "Placeholder" + } + } + Item { + implicitWidth: normalGroupBox.width + implicitHeight: normalTextArea.implicitHeight + + TextArea { + text: "Disabled" + enabled: false + } + } + } - function fixEmUp(manually) { - assetFixer.manuallyFixing = !!manually + RowLayout { + Item { + implicitWidth: normalGroupBox.implicitWidth + implicitHeight: normalTextField.implicitHeight + + TextField { + id: normalTextField + text: "Normal" + } + } + Item { + implicitWidth: normalGroupBox.implicitWidth + implicitHeight: normalTextField.implicitHeight - // Disable image caching if it hasn't already been done. - assetFixer.clearImageCache() + TextField { + placeholderText: "Placeholder" + } + } + Item { + implicitWidth: normalGroupBox.implicitWidth + implicitHeight: normalTextField.implicitHeight + + TextField { + text: "Disabled" + enabled: false + } + } + } - busyIndicatorRow.visible = true - assetFixerAnimationDelayTimer.start() - } - } + RowLayout { + Item { + implicitWidth: normalGroupBox.implicitWidth + implicitHeight: normalSpinBox.implicitHeight - // The controls' assets don't always "reload" if the path is cleared and then set in the same frame, - // so we delay the setting to the next frame. - Timer { - id: assetReloadNextFrameTimer - interval: 0 - onTriggered: { - window.Imagine.path = Qt.binding(function() { - return settings.useCustomImaginePath && settings.imaginePath.length > 0 ? settings.imaginePath : undefined - }) - - infoToolTip.text = "Reloaded assets" - infoToolTip.timeout = 1500 - infoToolTip.open() + SpinBox { + id: normalSpinBox + } + } + Item { + implicitWidth: normalGroupBox.implicitWidth + implicitHeight: normalSpinBox.implicitHeight - listView.model = controlFolderListModel - listView.resettingModel = false + SpinBox { + up.pressed: true + } + } + Item { + implicitWidth: normalGroupBox.implicitWidth + implicitHeight: normalSpinBox.implicitHeight - console.log(brief, "... reloaded assets.") - } - } + SpinBox { + enabled: false + } + } + } - // When exporting or deleting a large amount of assets (not uncommon), - // the filesystem watcher seems to emit directoryChanged() every second or so, - // so rather than process hundreds of assets every time we get notified, delay - // it until we haven't been notified for a while. - Timer { - id: assetFixerFileSystemDelayTimer - interval: 2000 - onRunningChanged: { - if (running) { - infoToolTip.text = "Assets changed on disk - reloading in 2 seconds if no further changes are detected" - infoToolTip.timeout = 2000 - infoToolTip.open() - } - } - onTriggered: assetFixer.autoFix() - } + RowLayout { + Item { + implicitWidth: normalGroupBox.implicitWidth + implicitHeight: normalComboBox.implicitHeight + + ComboBox { + id: normalComboBox + model: 5 + } + } - // Gives the BusyIndicator animation a chance to start. - Timer { - id: assetFixerAnimationDelayTimer - interval: 100 - onTriggered: { - assetFixer.fixAssets() - busyIndicatorRow.visible = false - assetFixer.manuallyFixing = false - } - } + Item { + implicitWidth: normalGroupBox.implicitWidth + implicitHeight: normalComboBox.implicitHeight + + ComboBox { + pressed: true + model: ListModel { + ListElement { text: "Pressed" } + } + } + } - // Gives the UI a chance to render before the initial fixup. - Timer { - id: initialUiRenderDelayTimer - interval: 300 - running: true - onTriggered: hasRun = true + Item { + implicitWidth: normalGroupBox.implicitWidth + implicitHeight: normalComboBox.implicitHeight + + ComboBox { + enabled: false + model: ["Disabled"] + } + } + } - property bool hasRun: false - } + RowLayout { + GroupBox { + id: normalGroupBox + title: "Normal" + + Item { + implicitWidth: 200 + implicitHeight: 100 - function getControlElements(control) { - var props = []; - for (var p in control) { - if (p !== "component" && typeof control[p] === 'object') - props.push(p); - } - return props; - } + BusyIndicator { + anchors.centerIn: parent + } + } + } + GroupBox { + enabled: false + title: "Disabled" + + Item { + implicitWidth: 200 + implicitHeight: 100 - Pane { - id: contentPane - anchors.fill: parent + BusyIndicator { + anchors.centerIn: parent + } + } + } + GroupBox { + enabled: false + title: "." + label.visible: false + + Item { + implicitWidth: 200 + implicitHeight: 100 + + PageIndicator { + count: 5 + enabled: false + anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + } + } + } + } - Imagine.path: settings.useCustomImaginePath && settings.imaginePath.length > 0 ? settings.imaginePath : undefined + RowLayout { + Frame { + id: scrollBarFrame + + Item { + implicitWidth: 200 + implicitHeight: 100 - palette.window: effectiveColor(paletteSettings.window) - palette.windowText: effectiveColor(paletteSettings.windowText) - palette.base: effectiveColor(paletteSettings.base) - palette.text: effectiveColor(paletteSettings.text) - palette.button: effectiveColor(paletteSettings.button) - palette.buttonText: effectiveColor(paletteSettings.buttonText) - palette.brightText: effectiveColor(paletteSettings.brightText) - palette.toolTipBase: effectiveColor(paletteSettings.toolTipBase) - palette.toolTipText: effectiveColor(paletteSettings.toolTipText) - palette.light: effectiveColor(paletteSettings.light) - palette.midlight: effectiveColor(paletteSettings.midlight) - palette.dark: effectiveColor(paletteSettings.dark) - palette.mid: effectiveColor(paletteSettings.mid) - palette.shadow: effectiveColor(paletteSettings.shadow) - palette.highlight: effectiveColor(paletteSettings.highlight) - palette.highlightedText: effectiveColor(paletteSettings.highlightedText) - palette.link: effectiveColor(paletteSettings.link) + Label { + text: "Normal" + anchors.centerIn: parent + } - function effectiveColor(paletteColorString) { - return paletteSettings.useCustomPalette && paletteColorString.length > 0 ? paletteColorString : undefined - } + ScrollBar { + size: 0.3 + position: 0.2 + active: true + orientation: Qt.Vertical + height: parent.height + anchors.right: parent.right + } + } + } - FolderListModel { - id: controlFolderListModel - folder: "qrc:/controls" - showDirs: false - nameFilters: searchTextField.text.length > 0 ? ["*" + searchTextField.text + "*.qml"] : [] - caseSensitive: false - } + Frame { + Item { + implicitWidth: 200 + implicitHeight: 100 - ListView { - id: listView - anchors.fill: parent - spacing: 30 - visible: !busyIndicatorRow.visible && !resettingModel + Label { + text: "Pressed" + anchors.centerIn: parent + } - property bool resettingModel: false + ScrollBar { + size: 0.3 + position: 0.2 + active: true + orientation: Qt.Vertical + height: parent.height + anchors.right: parent.right + pressed: true + } + } + } - ScrollBar.vertical: ScrollBar { - parent: contentPane - anchors.top: parent.top - anchors.right: parent.right - anchors.bottom: parent.bottom - } + Frame { + Item { + implicitWidth: 200 + implicitHeight: 100 + enabled: false - model: controlFolderListModel - delegate: ColumnLayout { - id: rootDelegate - width: parent.width + Label { + text: "Disabled" + anchors.centerIn: parent + } - MenuSeparator { - Layout.fillWidth: true - visible: index !== 0 + ScrollBar { + size: 0.3 + position: 0.2 + active: true + orientation: Qt.Vertical + height: parent.height + anchors.right: parent.right + } + } + } } - Label { - text: customControlName.length === 0 ? model.fileBaseName : customControlName - font.pixelSize: Qt.application.font.pixelSize * 2 - } + RowLayout { + Frame { + Layout.preferredWidth: 100 + Layout.preferredHeight: 100 + + ScrollIndicator { + size: 0.3 + position: 0.2 + active: true + orientation: Qt.Vertical + height: parent.height + anchors.right: parent.right + } + } - readonly property var controlName: model.fileBaseName - readonly property var controlMetaObject: controlMetaObjectLoader.item - readonly property string customControlName: controlMetaObject && controlMetaObject.hasOwnProperty("customControlName") - ? controlMetaObject.customControlName : "" - readonly property var supportedStates: rootDelegate.controlMetaObject.supportedStates - readonly property int maxStateCombinations: { - var largest = 0; - for (var i = 0; i < supportedStates.length; ++i) { - var combinations = supportedStates[i]; - if (combinations.length > largest) - largest = combinations.length; + Frame { + Layout.preferredWidth: 100 + Layout.preferredHeight: 100 + + ScrollIndicator { + size: 0.3 + position: 0.2 + active: true + orientation: Qt.Vertical + height: parent.height + anchors.right: parent.right + enabled: false + } } - return largest; } - Loader { - id: controlMetaObjectLoader - source: "qrc" + model.filePath + RowLayout { + Frame { + Tumbler { + model: 5 + implicitWidth: 80 + implicitHeight: 100 + } + } + Frame { + Tumbler { + model: 5 + implicitWidth: 80 + implicitHeight: 100 + enabled: false + } + } } - Flow { - spacing: 10 - - Layout.fillWidth: true - - Repeater { - id: stateRepeater - model: rootDelegate.supportedStates + RowLayout { + Dial { + implicitWidth: 100 + implicitHeight: 100 + } + Dial { + implicitWidth: 100 + implicitHeight: 100 + enabled: false + } + } - ColumnLayout { - id: labelWithDelegatesColumn - spacing: 4 + ListModel { + id: checkableDelegateModel + ListElement { label: "Normal" } + ListElement { label: "Pressed"; press: true } + ListElement { label: "Checked"; check: true } + ListElement { label: "CH + PR"; check: true; press: true } + ListElement { label: "Disabled"; disabled: true } + } - readonly property var states: modelData - readonly property string statesAsString: states.join("\n") + RowLayout { + Frame { + Column { + width: 200 + + Repeater { + model: checkableDelegateModel + delegate: CheckDelegate { + text: label + width: parent.width + down: press + checked: check + enabled: !disabled + ButtonGroup.group: radioButtonGroup + } + } + } + } - Label { - text: statesAsString.length > 0 ? statesAsString : "normal" + ButtonGroup { + id: radioButtonGroup + } - // 4 is the most states for any element (Button) - Layout.preferredHeight: (fontMetrics.lineSpacing) * (rootDelegate.maxStateCombinations + 1) + Frame { + Column { + width: 200 + + Repeater { + model: checkableDelegateModel + delegate: RadioDelegate { + text: label + down: press + width: parent.width + checked: check + enabled: !disabled + ButtonGroup.group: radioButtonGroup + } } + } + } - ControlContainer { - id: controlContainer - objectName: controlName + "ControlContainer" - controlMetaObject: rootDelegate.controlMetaObject - states: labelWithDelegatesColumn.states - - Layout.alignment: Qt.AlignHCenter + Frame { + Column { + width: 200 + + Repeater { + model: checkableDelegateModel + delegate: SwitchDelegate { + text: label + width: parent.width + checked: check + down: press + enabled: !disabled + } } } } } - ExampleContainer { - id: exampleContainer - controlMetaObject: rootDelegate.controlMetaObject - visible: !!controlMetaObject.exampleComponent + ListModel { + id: regularDelegateModel + ListElement { label: "Normal" } + ListElement { label: "Pressed"; press: true } + ListElement { label: "Disabled"; disabled: true } + } - Layout.alignment: Qt.AlignHCenter - Layout.topMargin: visible ? 14 : 0 - Layout.fillWidth: true - Layout.preferredHeight: visible ? implicitHeight : 0 + RowLayout { + Frame { + Column { + width: 200 + + Repeater { + model: regularDelegateModel + delegate: ItemDelegate { + text: label + width: parent.width + down: press + enabled: !disabled + } + } + } + } + Frame { + Column { + id: listView + width: 200 + clip: true + + Repeater { + model: regularDelegateModel + delegate: SwipeDelegate { + id: swipeDelegate + text: label + width: parent.width + down: press + enabled: !disabled + + Component { + id: removeComponent + + Rectangle { + color: swipeDelegate.swipe.complete && swipeDelegate.pressed ? "#333" : "#444" + width: parent.width + height: parent.height + clip: true + + Label { + font.pixelSize: swipeDelegate.font.pixelSize + text: "Boop" + color: "white" + anchors.centerIn: parent + } + } + } + + swipe.left: removeComponent + swipe.right: removeComponent + } + } + } + } } } } } - - RowLayout { - id: busyIndicatorRow - anchors.centerIn: parent - visible: false - - BusyIndicator { - id: busyIndicator - running: visible - } - - Label { - text: qsTr("Fixing assets...") - font.pixelSize: Qt.application.font.pixelSize * 2 - } - } - - ToolTip { - id: infoToolTip - x: (parent.width - width) / 2 - y: parent.height - height - 40 - parent: window.contentItem - } } diff -Nru qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/viewinqwidget/main.qml qtquickcontrols2-opensource-src-5.9.5/tests/manual/viewinqwidget/main.qml --- qtquickcontrols2-opensource-src-5.12.5+dfsg/tests/manual/viewinqwidget/main.qml 2019-08-26 06:21:13.000000000 +0000 +++ qtquickcontrols2-opensource-src-5.9.5/tests/manual/viewinqwidget/main.qml 2018-03-21 07:59:29.000000000 +0000 @@ -34,8 +34,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.6 +import QtQuick.Controls 2.1 Item { visible: true