aboutsummaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove QMake project filesJoerg Bornemann2021-02-111-10/+0
| | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I4247294258629c92e80914518e9208019090c815 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Register C++ types declarativelyMitch Curtis2020-08-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Controls: rename the C++ module to qtquickcontrols2J-P Nurmi2016-04-131-3/+3
| | | | | Change-Id: I087a39baebc296a340739161874636926adaa56c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Templates: rename the C++ module to qtquicktemplates2J-P Nurmi2016-04-131-3/+3
| | | | | Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix style inheritance for popupsJ-P Nurmi2016-01-081-0/+1
| | | | | | Change-Id: I7bc36cb68e8d668fff2270e018de7eb1c71ccd20 Task-number: QTBUG-50347 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix build orderKonstantin Ritt2015-12-181-2/+2
| | | | | | | | `imports.depends` doesn't work for qmake -r. Change-Id: Ia853f4bca830ea199e8fe867ae5cde1ea722365b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add QQuickPaddedRectangleJ-P Nurmi2015-11-231-1/+2
| | | | | Change-Id: I72c535c2be99d345e1474a70e5c639f3b5a68e10 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename libQtQuickControls to libQtQuickTemplatesJ-P Nurmi2015-09-161-3/+3
| | | | | Change-Id: I1e663bb7be2be8b3d4edf0c038862cc2150aec40 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Extras: merge C++ lib to the QML pluginJ-P Nurmi2015-09-081-3/+1
| | | | | Change-Id: Idbbe9e0cf1b5b34027035a417fade7b0091da8c5 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Calendar: merge C++ lib to the QML pluginJ-P Nurmi2015-09-081-3/+1
| | | | | Change-Id: I7eeb0335fd88002c85f93136fc71dfb394788421 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Import the Qt Quick Controls 2 prototypeJ-P Nurmi2015-02-051-0/+10
Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>