aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols2impl/qquickpaddedrectangle.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-6.2.6' into ↵Tarja Sundqvist2023-03-011-1/+3
|\ | | | | | | | | | | tqtc/lts-6.2-opensource Change-Id: Ie5a87ae61d8ed0429225353ad46e5232d60f4daa
| * Fix emission of QQuickPaddedRectangle::topPaddingChangedJoerg Bornemann2022-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...when setting the padding property. The topPaddingChanged signal is to be emitted if padding changed and no separate topPadding has been specified. Unlike the other *PaddingChanged signals, it was emitted if topPadding *was* specified. Fixes: QTBUG-104865 Change-Id: I8585c4b3f7aa70030b5c6e195516e1aba73e5c46 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit a08eb13e7a19f86119b9dcdb5ac3e72062fe7edc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * QuickControls2Impl: includemocsMarc Mutz2022-06-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Including moc files directly into their classes' TU tends to improve codegen and enables extended compiler warnings, e.g. about unused private functions or fields. Manual conflict resolutions: - dropped all includes into non-existing files Task-number: QTBUG-102948 Change-Id: If6f459ba6b7403a1703551fba571b0e1bdcf3b82 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 5d6ca34b2638cd567e633361c991ba95228c206c)
* | Revert "Update commercial license headers"Tarja Sundqvist2022-11-241-22/+22
|/ | | | | | | | | | | This reverts commit 74089697cf2a4961fb697100555b17ae2342d734. Revert of commercial license headers is required for the Qt 6.2.x opensource releases, Qt 6.2.5 onwards. Task-number: QTBUG-107760 Change-Id: Id49069cb5e5f261da185fd082dfb71deb259d387 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update commercial license headersTarja Sundqvist2022-06-041-22/+22
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtdeclarative. Examples, tests, or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4941 Change-Id: I32f554b0a8cb527f74d46f3c02b0e745d9fc5ddf Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Register C++ types declarativelyMitch Curtis2020-08-261-0/+211
Adapt to the new way of registering C++ types. The types need to be seen at compile time so that code can be generated that invokes them. This patch: - Adds QML_* macros where applicable. - Adapts the build system files to the new way of registering modules. - Splits up the QtQuick.Controls[.*].impl files into their own plugins, as we can only register one QML module per .pro file. - Removes C++ type registration calls in every plugin. - Moves private types from src/quickcontrols2/quickcontrols2.pro to src/quickcontrols2/impl/quickcontrols2-impl.pro. Some of these types need to be exposed to QML, but quickcontrols2.pro is already in use to declare the QtQuick.Controls import (and also provides the public C++ QQuickStyle API), and the new QML_IMPORT_NAME/VERSION syntax only allows one module per project. As some of the types that need to be exposed to QML are also referenced by some C++ code (e.g. tests, etc.), we just move all of the private types to the new library. Follow-up patches will register the QML types declaratively. Task-number: QTBUG-82922 Change-Id: Iaf9ee106237d61701d57a8896f3822304c8151a6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>