aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.0.0' in qt/qtquickcontrols2v6.0.0Qt Submodule Update Bot2020-12-041-1/+1
| | | | | Change-Id: I7a4148138262c9d9d06595bb2c2a776ca55309e9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-041-1/+1
| | | | | Change-Id: I23d32bfee6d6de5a12af64e5c138a6c68a4eb958 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qtquickcontrols2v6.0.0-rc2Qt Submodule Update Bot2020-12-011-1/+1
| | | | | Change-Id: I903fc1f363402d6c01c0460c02db46de98c44110 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-011-1/+1
| | | | | Change-Id: I01ab1a3f5de5614da239c5d1d0983b23667b5a86 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Windows, CT_LineEdit: don't take dpr into account when calculating geometryRichard Moe Gustavsen2020-12-011-5/+7
| | | | | | | | | | | | | | | | | The geometry calculated by the style should not take dpr into account. The nativestyle framework (and the scenegraph) understands that all geometry returned by QStyle will need to be scaled according to the dpr. We will for example set a dpr on the QPainter (or the QImage it draws on) before we ask QStyle to draw. This means that the style should not scale the geometry used in the drawing calls to QPainter since QPainter will do this automatically. (cherry picked from commit 3013fce9931913b4f38d4707cb1327be1727a1ef) Task-number: QTBUG-89006 Change-Id: Idfcc6690e0ae0062ca00cb829510d2b68c26ebd4 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* qquickstyleitem: ensure that the size of the node is at least the size of ↵Richard Moe Gustavsen2020-12-011-21/+20
| | | | | | | | | | | | | | | the texture The size of the node should not be smaller than the size of the texture. Otherwise the image will look truncated or wrapped. This is especially important now that the image can be scaled up to be dpr aligned. (cherry picked from commit 84c44a805adbd12401c645869a73c3cb92f44544) Task-number: QTBUG-89006 Change-Id: I0bd82faec89d6e7c2e79541a30d6b98200ebd5a0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Update dependencies on '6.0.0' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-301-1/+1
| | | | | Change-Id: Ib4282d0a1620b43d05fc4cd0bfc03c09f049bd41 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qquickstyleitem: let the image size be aligned with dprRichard Moe Gustavsen2020-11-302-8/+45
| | | | | | | | | | | | | | | The size of the image we paint the item on should have a size that will return a whole number when it's divided by the current dpr. Otherwise the texture mapping that occurs in the scenegraph later will work on fractions that will cause drawing glitches to occur. Fixes: QTBUG-89006 Change-Id: I5e65aebbda9598d88bef7af2398b3fe3f2d16a87 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit c24f5232ab3672e538259264c83b46671142c318) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* gallery: don't store QQuickStyle::name() in settings on startupMitch Curtis2020-11-301-5/+7
| | | | | | | | | | | | | | | It's no longer empty if not specified, so just skip that step altogether. Add the desktop styles to the list of selectable styles, but only on the correct platforms. Only set the style at startup if it wasn't specified via QT_QUICK_CONTROLS_STYLE. I tried to detect if a -style application argument was passed, but it doesn't show up in the list of arguments. Change-Id: I7c216372580a012693b7a01d138d79c8d46afe66 Fixes: QTBUG-88955 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 71249db0cb5feed40410486bcc4747abcf4f1ed9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix QDoc warnings Qt Quick ControlsNico Vertriest2020-11-302-3/+6
| | | | | | | | | | | | Non-existing links: - Qt Quick Calendar - Windows Style Wrong link to macOS style Change-Id: I410ef79d71d2ff25eea8cc090516b431e046fc0b Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 01851825f7a823c418cadbaccf78d32fc4440b49) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-301-1/+1
| | | | | Change-Id: I60700f300e8d0859f185c3c53545fef287a53bcd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Remove version numbers for import statement in snippetsJerome Pasion2020-11-2710-52/+52
| | | | | | | | | | | | -recommend using the import statement without versions for Qt 6.0 -update use of \qml snippet without \QtMinorVersion Task-number: QTBUG-87155 Change-Id: I338d4fb81b9709f2f342f250c07ddf66f116b1dd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 198db199e5e9f7f6bf8c2a8fdd870d46c5615256) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-251-1/+1
| | | | | Change-Id: I072ce7c53e1590acdbf02d2ae9f7b015e2b2a7f4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qtquickcontrols2v6.0.0-rc1Qt Submodule Update Bot2020-11-241-1/+1
| | | | | Change-Id: I9e0b705ca9a6bfc3e31256ec7f033ae5140d28ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Drop the \excludefromcreator meta tagVenugopal Shivashankar2020-11-241-3/+0
| | | | | | | | | | The example does not depend on the Qt Graphical Effects module now. Change-Id: Ia69bc16738f5f52aaea828409ef73bf0c68e371e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 4fac3dd5b5241a244148e7c567869f45e371e2d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-231-1/+1
| | | | | Change-Id: I94c6e9ecb0ede9137c42b763c6f469ff9b9dbb19 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-201-1/+1
| | | | | Change-Id: Ic9a3e53919172889dae71a2b4360061b29fb3126 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-201-1/+1
| | | | | Change-Id: I29517dab0ccf0e201dd262e1d68dc6e7bb63021c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-191-1/+1
| | | | | Change-Id: Ibbe4415061eac9b3d7c33f58dbc035bbd65e9398 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove glow effects from automotive exampleMitch Curtis2020-11-195-86/+13
| | | | | | | | | For now there is no way to do this without writing them ourselves. Since the effect was fairly subtle, we simply live without it for now. Task-number: QTBUG-88202 Change-Id: Ic2556258461f657eddef3a597d928a7a0a7604c4 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-191-1/+1
| | | | | Change-Id: Ibd65a9e8378981f7b5b7c0a3d53a2060e9b600ea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-181-1/+1
| | | | | Change-Id: I9bf3d375aab9d4e40b9eb2723882b81e0087ea4d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Complete add QtQuick.Layout dependency to native style qmldirFawzi Mohamed2020-11-181-1/+2
| | | | | | | | Cmake recreates the qmldir, so dependencies need to be listed in it too Fixes: QTBUG-88492 Change-Id: Ibcb7555216ba2804b545534d9ce8b304d6172f29 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add QtQuick.Layout dependency to native style qmldirFawzi Mohamed2020-11-181-1/+2
| | | | | | | | | | | | | | Without it qmlimportscanner misses the dependency of FocusFrame.qml and static builds fail to add the dependency leading to a QComponent is not ready error. This happens because the qml file is in a qrc, and thus not visible to qmlimportscanner. Adding a depends QtQuick.Layouts fixes it (and updating the controls dependency to drop the version) Fixes: QTBUG-88492 Change-Id: I9be3e26c3a03b663cb90618368f3480f141a6b04 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-181-1/+1
| | | | | Change-Id: I26cc5b01537fa12d6fc66a5baf5ed5c266e57e74 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Tag porting guides so that they show up in the listVolker Hilsheimer2020-11-172-0/+4
| | | | | Change-Id: I58a307b1bfae55b6c0b4d9663db817bea50b6b34 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* macOS: don't use a focus frame around TextAreaRichard Moe Gustavsen2020-11-172-35/+2
| | | | | | | | | | | As it turns out, text areas in general should not show a focus frame. We don't do that for widgets, and AppKit doesn't do that for NSTextView. And for good reason, we don't want to show a big focus ring around the whole text edit in e.g a text editor application. Change-Id: Idc344c9f8d9f4a11dce22b2d2284800f05cd551a Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Add link in Qt Quick Controls C++ pageJerome Pasion2020-11-171-1/+4
| | | | | | | | -link to Qt Quick Controls help navigation Task-number: QTBUG-87155 Change-Id: I65a5775c8754ee9a5fa5f669918a04026afde996 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Example: Drop "2" against "Qt Quick Controls" textVenugopal Shivashankar2020-11-175-10/+9
| | | | | | | | | | | | | This should ensure that the examples give the same message as the documentation. In addition, dropped a phrase about Qt Quick Controls claiming that it is designed for mobile and embedded. The latest version of controls covers the entire spectrum. Change-Id: Ia856fa47a6e6fc35f80bedc549378a00c7fbbc2a Pick-to: 5.15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-171-1/+1
| | | | | Change-Id: I6da9340f239712b103a3f30128e4439703c347ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-171-1/+1
| | | | | Change-Id: Ibf4d352a06e3d4884dafb9c385a851fdcb6804d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Highlight only the Gallery examples, with the correct nameVolker Hilsheimer2020-11-161-5/+1
| | | | | Change-Id: I0ea36493f49bb642886346164d0e1c300af9afa5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix static build using native stylesFawzi Mohamed2020-11-163-0/+31
| | | | | | | | | | | | Ensure that the qml registration function of macOS, Windows and native styles get linked and executed in static builds by referencing the initialization function in the plugin constructor. This is intrusive and ugly, but is the method currently used in other plugins. Fixes: QTBUG-88463 Change-Id: I1b41ec89116066f46818f40ad155d12f6e719ca7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-11-161-1/+1
| | | | | Change-Id: I6180f5ed8050ea8be0277802b5e7f46b09378a03 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use QChar constructor explicitlyVolker Hilsheimer2020-11-141-1/+1
| | | | | | | Prepare for upcoming changes in qtbase. Change-Id: Iace6fb0c99a0256b4665ff8ee6962c8ea837a74a Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* 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>