aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/controls/data/tst_page.qml
Commit message (Collapse)AuthorAgeFilesLines
* Tie minor version of all imports to Qt's minor versionMitch Curtis2018-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-04-181-2/+5
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Page.qml src/imports/controls/fusion/Page.qml src/imports/controls/imagine/Page.qml src/imports/controls/material/Page.qml src/imports/controls/universal/Page.qml Change-Id: I5acf99d0d2009151d6daff9420d79cb06909c873
| * Page: fix implicitWidth bindingsJ-P Nurmi2018-04-171-2/+5
| | | | | | | | | | | | | | | | Don't add paddings to header and footer width when choosing the max. Padding affects content, not headers and footers. Change-Id: I92381762f97eab384b18510522bf788abecd8338 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Control: add implicitContentWidth|Height propertiesJ-P Nurmi2018-04-131-0/+8
|/ | | | | | | | | [ChangeLog][Controls][Control] Added implicitContentWidth and implicitContentHeight properties that can be used to simplify complex implicit size bindings. Change-Id: I6ccef572c013605058808ce2ad17f8bd82f49ef0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix tst_page::test_twoChildren()J-P Nurmi2017-07-201-2/+4
| | | | | | | | Allow the background to have an implicit size. The Imagine style has a background image so it has an implicit size. Change-Id: I39b41d265cb36959b198e6dac6024f6b91f3c5c6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Page: fix initial layouting of dynamically created instancesJ-P Nurmi2017-05-311-0/+37
| | | | | | Task-number: QTBUG-61109 Change-Id: I43d28a80ec1a46e836fa8a0f76ee65b0c1a24228 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-241-2/+12
| | | | | | | | | | Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_controls: update import versions for controls and templatesJ-P Nurmi2017-01-121-1/+1
| | | | | Change-Id: I104bc44c361351719449cab94dcb14c96e91e32f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-111-1/+1
|\ | | | | | | Change-Id: If797ac58344b20e8de4379343131c097247ba2f2
| * Welcome to 2017J-P Nurmi2017-01-091-1/+1
| | | | | | | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_page: add missing use of createTemporaryObject()Mitch Curtis2016-12-211-3/+1
| | | | | | | | | | | | | | I missed it in fa766648b234c65b9025ad62f3a29eb83d89ae8f. Change-Id: If3ba0700c1547fbc7af3671b5eeb364055880175 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | tst_page: use TestCase's new createTemporaryObject functionsMitch Curtis2016-12-171-19/+7
|/ | | | | | | | This ensures that the appropriate objects are destroyed at the end of each test function, even if the test fails. Change-Id: I7f61bb8da4b89af8fd3e5f508fe1a683484e799f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Page: support spacingJ-P Nurmi2016-10-261-0/+40
| | | | | | | | | | Add spacing support into QQuickPageLayout. Having spacing and padding separately gives more fine-grained control over the layout. Spacing is inserted between the header, content, and footer, but only when the respective building blocks are visible. Change-Id: Ia26a4c33c2756a603ca6d53aefac3a66414b36d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Page: provide implicit sizeJ-P Nurmi2016-10-251-0/+100
| | | | | | | | | | | | | | Even though the control was designed to be used as full-screen page, it can be sometimes useful to have non-fullscreen pages. In order to make Page behave well in layouts, it must provide a suitable implicit size. [ChangeLog][Controls][Page] Page has been made to calculate its implicit size based on the implicit size of the header, content, and footer plus paddings, and the implicit size of the background item. Task-number: QTBUG-56709 Change-Id: I0f40897df6e54d7bde01a464e24f0398b12bc865 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-08-091-0/+12
|\ | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickpage.cpp Change-Id: I4c8b62fb1d7c20c6d3c870eb47e0402a20051098
| * Page: take header & footer visibility into account in relayout()J-P Nurmi2016-08-091-0/+12
| | | | | | | | | | | | Task-number: QTBUG-55143 Change-Id: I4176d0f8902ee417fd5cb938b0f0902d480e80f6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump up all controls and templates imports to version 2.1J-P Nurmi2016-07-081-1/+1
|/ | | | | | | | | | | | Controls must import templates version 2.1 in order to "inherit" 1-revisioned properties, methods, and signals. So far, this has been done case by case, but it's less error prone and more clear to change them all. For example, if you ever see a source file pasted/linked somewhere, it's easy to identify the version it belongs to. Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-211-1/+1
| | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Tests: cleanup templates importsJ-P Nurmi2016-04-201-1/+0
| | | | | Change-Id: I160899629f8196d98637d649f7aed7eab8bf4244 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add PageJ-P Nurmi2016-01-181-0/+118
For page-specific headers & footers (ToolBars & TabBars). Change-Id: Ifafe9131655b74a14bc34cf69b4363013a9a2501 Task-number: QTBUG-50332 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 14:21:48 +0000