aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-141-1/+1
| | | | | Change-Id: I1f833490dc43827781d016583d71056ffbe65bd1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2v6.0.0-beta5Qt Submodule Update Bot2020-11-131-1/+1
| | | | | Change-Id: I0f31be6038a0f3f108419eb3ae8f66c207c7503c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Correct the style import names in snippetsVenugopal Shivashankar2020-11-131-4/+4
| | | | | | Change-Id: If8126bc760b4a0a4f7ee05a8d858c3ffdf63f64c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-131-1/+1
| | | | | Change-Id: I770f7c0e3716cc5958d1478f13131eb650594aa7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-131-1/+1
| | | | | Change-Id: Icbaf1eaea7a2a03f32d5650e41212cb36eb2f2bf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-121-1/+1
| | | | | Change-Id: Ief41f8b353e3cd4ed7d45bbb2f320aaf7602b10c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Un-blacklist tst_qquickdrawerShawn Rutledge2020-11-121-7/+0
| | | | | | | Fixes: QTBUG-88038 Fixes: QTBUG-88138 Change-Id: Id16f741675016b681aae7d306909be9a5c5ff168 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove usage of Qt4CompatiblePaintingAllan Sandfeld Jensen2020-11-122-12/+0
| | | | | | | Matching qtbase Change-Id: I1bd569995197158727ed5dff5b86e041c7af2177 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add Qt 6.0.0 changes fileJani Heikkinen2020-11-121-0/+17
| | | | | | | | | | Qt 6.0.0 is new major version for Qt and so on we don't need to list changes to the previous Qt release but quide readers to check porting quide. Task-number: QTBUG-88099 Change-Id: I8d85f76ce1e374b61020feb1385225388ec38fc2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* CMake: Handle installation of AUX_QML_FILESAlexandru Croitor2020-11-122-0/+132
| | | | | | | | | Use the new pro2cmake functionality to copy / install the files specified in AUX_QML_FILES entries. Task-number: QTBUG-87818 Change-Id: Ibdee35d54aaf37589d31d113bed67520b57fdbf2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-121-1/+1
| | | | | Change-Id: I65aefa42d0fe42a89a4af31f749ae0cde99098d2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Don't copy or assign QKeyEvent instancesVolker Hilsheimer2020-11-111-36/+48
| | | | | Change-Id: Id16f972a7f2c0f3c9c9d2fe1d14b9e0830a85a0a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Register native styles under 2.0 in addition to 6.0Mitch Curtis2020-11-1111-68/+121
| | | | | | | | | | | | | | | | | | Since we changed the logic that decides the default style, users with QML that imports 2.x versions of QtQuick.Controls will get errors if the default style that is chosen is a native style: qrc:/main.qml:53:1: module "QtQuick.Controls.macOS" version 2.15 is not installed qrc:/main.qml: Failed to load dependencies for module "QtQuick.Controls" version 2.15 We use PAST_MAJOR_VERSIONS to register the module for 2.x, and not just 6.0, and register the types of those styles under version 2.0 in addition to 6.0. This should not cause any problems for existing QML code. Fixes: QTBUG-87658 Change-Id: I976078c0aea3fbebe4e04f5ba4d8056c0ca7a0e6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QQuickStackView: Allow URLs in createElement()Ulf Hermann2020-11-111-0/+20
| | | | | | | | | | The value is intended to be a URL, therefore only accepting the string form is not enough. Task-number: QTBUG-88372 Change-Id: I4d31d1c5eacd49b7591f087c2e82c31b70a3bc1d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Follow up on change of QQmlListProperty to qsizetypeVolker Hilsheimer2020-11-1115-68/+68
| | | | | | | | | | | | | This deals with d7008c79d4ec023527ebfc118ad47f40075f244d in qtdeclarative which aligned QQmlListProperty with our container types. Note: not changing the respective APIs of the QQuick classes in this change. Ie. QQuickPlatformMenu::insertItem still operates on int as index, and QQuickMenuPrivate still stores currentIndex as int. This might need to be addressed in a follow-up commit. Fixes: QTBUG-88362 Change-Id: Ia663cfa47fa91c55997cdef288b2a866107a5f25 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2 manuallyLiang Qi2020-11-111-1/+1
| | | | | Change-Id: I37d6f77e3c7c8d18c9162e3ceaececbe9e23a4f0 Reviewed-by: Liang Qi <liang.qi@qt.io>
* QmlDesigner: Remove duplicate of repeatThomas Hartmann2020-11-102-13/+3
| | | | | | | | | | The autoRepeat property is already part of AbstractButton. I renamed "Repeat" to "Auto Repeat" Pick-to: 5.15 Change-Id: I4f22ebc18a2094e67c8f48263f84ab9eb7d497b6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* CMake: Make Gui and some other packages optionalAlexandru Croitor2020-11-101-2/+2
| | | | | | | | | | This allows a no-error configuration of a -no-gui Qt build. This results in skipping building qtquickcontrols2 when Gui / Quick are not available. qmake does the same. Task-number: QTBUG-88343 Change-Id: I074f62e4491278ec93f1c6225923111b5eadf2ec Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Document how to use Controls types in property declarationsMitch Curtis2020-11-094-2/+77
| | | | | | | Fixes: QTBUG-88222 Change-Id: I26ac9ce14fc86b3ada4e3024cb70b1ed4ce4755b Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2v6.0.0-beta4Qt Submodule Update Bot2020-11-091-1/+1
| | | | | Change-Id: Ie1d0bd19eb640691c6e03ee0a2e9f328c6e08f15 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Rename "Porting" pages to "Changes"Jerome Pasion2020-11-095-5/+5
| | | | | | | | | | | | | | The content in the porting guides are closer to a changelog than a porting guide. At this point, it is easier for maintainers and contributors to write in a changelog than a guide. This change should help with readability and is closer to the usage of "Changes" in documentation. Part of a rename in other submodules. Task-number: QTBUG-87156 Change-Id: Ib34fc9e3e5719c75fcd7d18d9d2cc7dd994c3116 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Fix broken links and other warningsVenugopal Shivashankar2020-11-094-4/+8
| | | | | | | | | | | | | | | | Fixed these warnings: qt5/qtquickcontrols2/src/quicktemplates2/qquickdialog.cpp:515: (qdoc) warning: Missing '}' qt5/qtquickcontrols2/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc:28: (qdoc) warning: Can't link to 'Creating Qt Quick Projects' qt5/qtquickcontrols2/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc:28: (qdoc) warning: Can't link to 'Differences with Qt Quick Controls 1' qt5/qtquickcontrols2/src/quicktemplates2/qquickdialog.cpp:505: (qdoc) warning: Can't link to 'Popup::' Change-Id: I7f66c7e3baa317af0890876ec7a7e9084997f324 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: use correct casing for Material style nameMitch Curtis2020-11-092-7/+7
| | | | | Change-Id: Ia2d10b9fd27c8e83bfd8ed8ae021391ba1df50f1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: Qt Labs Platform - Qt 6 porting guideMitch Curtis2020-11-091-1/+14
| | | | | | Task-number: QTBUG-88158 Change-Id: Idce6ec14216d5f09b4cc729677b17084defdee1b Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Qt Quick Controls 2 - Qt 6 porting guideMitch Curtis2020-11-091-0/+250
| | | | | | Fixes: QTBUG-88158 Change-Id: I25eb0d0fef161fdb7c63ae66d27244bb359ce0c2 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: remove all instances of \qmlpropertygroupMitch Curtis2020-11-0910-12/+0
| | | | | | | | This is apparently no longer necessary. Pick-to: 5.15 Change-Id: I0f45a84ced5118d248ffab4e745c4e2f2ce5738f Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: fix Qt Labs Platform Menu icon documentationMitch Curtis2020-11-091-4/+4
| | | | | | | | It was probably copy-pasted from MenuItem. Pick-to: 5.15 Change-Id: I20f7e107252346f52bf8c061fe18e1ca6a0bf150 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Doc: update Versions sectionMitch Curtis2020-11-091-5/+14
| | | | | | | | | Since not everyone will switch to Qt 6 instantly, and the Qt 6 docs will become the "current" docs that users see when they search online, it's good to keep the information about older versions around. Change-Id: I7efa6efa5a25a10f292160f5cb53b2ef17ad6d57 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-091-1/+1
| | | | | Change-Id: If0e90998df67eb98290be44fb4df7ee3167c0f98 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: remove Qt Quick Templates' Qt 6 porting guideMitch Curtis2020-11-091-42/+0
| | | | | | | | | | | While Qt Quick Templates does define the API for each type, it and Qt Quick Controls are quite closely intertwined, and it doesn't serve much value to have the porting guides separated. Task-number: QTBUG-88158 Change-Id: I9d5ee403049a17da1dc5e45e7d26bbd6c7b5b986 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-091-1/+1
| | | | | Change-Id: I05313f413390445bcfa88ff8a68b19ede92ee9cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-081-1/+1
| | | | | Change-Id: If4ba087aef12b40692a59f1406d3294f99fff05c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-081-1/+1
| | | | | Change-Id: I6d89acd9a6a2fe55c58f92c64b1ad4d99fea9f1d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-071-1/+1
| | | | | Change-Id: I7795837442b82f5f3cc5166fd0ee9161de9f1def Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-061-1/+1
| | | | | Change-Id: Ie7d9066d584bc1c99c487a88fca5afbfe1eb7e0c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix qdoc warningsVenugopal Shivashankar2020-11-0617-724/+67
| | | | | | | | | | | Mostly broken links to types and properties that are either dropped or renamed. Task-number: QTBUG-88141 Fixes: QTBUG-88141 Change-Id: I44789cdd1b8560a967b0b3868fd637deef488d88 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Drop the automotive example from Qt Creator welcome screenVenugopal Shivashankar2020-11-061-0/+1
| | | | | | | | | The example depends on QtGraphicalEffects which is not part of the 6.0 release. Task-number: QTBUG-88202 Change-Id: If266a0965bc3ca288d2ef45e130232cb1571462b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Native style/GroupBox: Add contentsMargins for GroupBox on WindowsJan Arve Sæther2020-11-061-0/+9
| | | | | | | | | | | QWindowsStyle did not add these margins because the layout did that. (It had a 9 pixel margin all around it) However, Qt Quick Controls2 expects that the contentPadding includes that margin. We therefore change the subControlRect implementation for (CC_GroupBox,SC_GroupBoxContents) to add those margins. Change-Id: I953a49340dc085716b4e9ecf736a5438e7cc4bbd Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-061-1/+1
| | | | | Change-Id: I06d5a8a4da7fec4e62bd0aa4ade1b3ea36fe2b40 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-051-1/+1
| | | | | Change-Id: I095e9d21bdfb6a8a94213d951cd5174d7d2f572b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: fix SplitView's inheritanceMitch Curtis2020-11-051-1/+1
| | | | | | | | | It inherits Container. Fixes: QTBUG-88184 Pick-to: 5.15 Change-Id: Ic4878c2b240dad2294569a48c4f39e82d377133a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-041-1/+1
| | | | | Change-Id: I6fc815e7e70cca5a45b1b756851c42ee5f6d32e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Native style: Enable windows styleJan Arve Sæther2020-11-041-7/+5
| | | | | | Task-number: QTBUG-86399 Change-Id: I634db1d4514a685743504748251e53703676881a Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2v6.0.0-beta3Qt Submodule Update Bot2020-11-041-1/+1
| | | | | Change-Id: Iab9bc68d38a01a800828da397af0d3bac10327db Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix QQuickHeaderView models to pass model testerVolker Hilsheimer2020-11-042-5/+14
| | | | | | | | | | | | | | | | Following 72e0d699cec09458ca9325035d477d4899e8e47b in qtbase, the model tester exercises additional code paths to verify correct row/columnCount implementations for flat models. This revealed a few bugs in the models used in QQuickHeaderView and the unit test: * neither QHeaderDataProxyModel nor the test models handled a valid parent index for calls to row/columnCount * QHeaderDataProxyModel::sibling passed the index on as parent Change-Id: I612e18030d837275614d61ce8987c93fff7f20a9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Blacklist Tumbler::test_itemsCorrectlyPositionedMitch Curtis2020-11-045-0/+20
| | | | | | | | | This has a long history of being flaky. Until we decide what to do with it, blacklist it to unblock CI. Task-number: QTBUG-70597 Change-Id: Ic115a345662fc61464065d678720c88597181d98 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Blacklist flickable and slider test cases for qquickdrawerMitch Curtis2020-11-041-0/+7
| | | | | | | | Unblock CI until these can be fixed properly. Task-number: QTBUG-88038 Change-Id: Ie7520e30a7df4b554ceba6411b88d2249ffbce5d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Filter touch presses and releases in QQDrawer::childMouseEventFilter()Shawn Rutledge2020-11-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | For pressPoint to be set, we must enter QQuickPopupPrivate::handlePress() but until now, Drawer has filtered a synthetic mouse press in order to get there. Now that Flickable is handling touch events directly, we have a new rule that if an item has acceptTouchEvents() == true, and also filters mouse or touch events, then it must filter touch events: QQuickWindowPrivate::sendFilteredPointerEventImpl() no longer constructs a synth-mouse event for that item, because it has declared that it knows how to handle touch events. This rule applies to Drawer. Setting pressPoint is also unnecessary, because it should always be the same as QEventPoint::scenePressPosition(). But refactoring all functions like handlePress(QQuickItem *item, const QPointF &point, ulong timestamp) (and handleMove and handleRelease) to take QEventPoint instead will be a larger refactoring. But until then, when pressPoint is not set, QQuickDrawerPrivate::grabTouch() usually sees the drag threshold being exceeded when it compares the current scene position against 0,0 which is why it takes the grab from some control inside (e.g. Slider). Fixes: QTBUG-88170 Change-Id: Ia88aed59695feb3d5fdabbbf276241e427ac9d89 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickStyleItem: use imageSize directlyRichard Moe Gustavsen2020-11-041-10/+9
| | | | | | | | There is no reason to calculate the image size over and over. Just calculate imgSize once. Change-Id: Idf49a64102de18ba535899d4a46085de79e7ca2f Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* QQuickStyleItem: reuse QImage when painting, if possibleRichard Moe Gustavsen2020-11-041-2/+7
| | | | | | | | | | If the size of the QImage we draw on hasn't changed between subsequent calls to paintControlToImage, we can just reuse the one we already got. This way we avoid creating and throwing away images unnecessary. Change-Id: Icf65bb8d9008a21e7114e588df46bc1e4cbdea97 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>