aboutsummaryrefslogtreecommitdiffstats
path: root/sync.profile
Commit message (Collapse)AuthorAgeFilesLines
* Register C++ types declarativelyMitch Curtis2020-08-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-241-13/+0
|\ | | | | | | | | | | | | Conflicts: sync.profile Change-Id: Ie87e9b6e2d976b6ed433a8d747a83cf0d27bed95
| * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-14/+0
| | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Icdcaa7ad856eb493448398f9180ecc4b642262d9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Controls: rename the C++ module to qtquickcontrols2J-P Nurmi2016-04-131-1/+1
| | | | | | | | | | Change-Id: I087a39baebc296a340739161874636926adaa56c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Templates: rename the C++ module to qtquicktemplates2J-P Nurmi2016-04-131-1/+1
| | | | | | | | | | Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-181-2/+2
| | | | | | | | | | | | | | | | | | The imports will be done later, as we don't want to change them until the module is releasable (which requires things like selection handles, etc.). Change-Id: I2140cff7058fc3b696e92ca8c0e5e06dca9a7c9c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Remove obsolete dependency to qtquickcontrolsJ-P Nurmi2016-02-291-1/+0
|/ | | | | | | QtQuick.Layouts have been moved to qtdeclarative. Change-Id: Ief6bfa83291db9cd91406a54ac336d2c668de7e6 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Add dependency to qtgraphicaleffects to sync.profileMitch Curtis2015-11-271-0/+1
| | | | | | | | | | qtquickcontrols' sync.profile already has this dependency, but that could technically change in the future, so we should declare our dependency explicitly. Change-Id: I17bd96638a42bf5e0a74d0c193dea72426afe12b Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add QQuickPaddedRectangleJ-P Nurmi2015-11-231-0/+1
| | | | | Change-Id: I72c535c2be99d345e1474a70e5c639f3b5a68e10 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Templates 2.0 to Qt.labs.templates 1.0J-P Nurmi2015-10-011-1/+1
| | | | | | Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename libQtQuickControls to libQtQuickTemplatesJ-P Nurmi2015-09-161-1/+1
| | | | | Change-Id: I1e663bb7be2be8b3d4edf0c038862cc2150aec40 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* sync.profile: do not depend on dev branchLiang Qi2015-09-091-4/+4
| | | | | Change-Id: Ic8d1dae7971611d6598d2ff74570f01755a97dce Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Extras: merge C++ lib to the QML pluginJ-P Nurmi2015-09-081-1/+0
| | | | | Change-Id: Idbbe9e0cf1b5b34027035a417fade7b0091da8c5 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Calendar: merge C++ lib to the QML pluginJ-P Nurmi2015-09-081-1/+0
| | | | | Change-Id: I7eeb0335fd88002c85f93136fc71dfb394788421 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add qtquickcontrols as a dependency for the CI (need qtquicklayouts)J-P Nurmi2015-03-181-0/+1
| | | | | Change-Id: Ie50285eddfc1e6f659c285cbd8a570bdbdd047bd Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Add sync.profileFrederik Gladhorn2015-03-091-3/+3
| | | | | Change-Id: Ibf6efe4fb57ae75ef846474e47a6f800793abf7a Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Import the Qt Quick Controls 2 prototypeJ-P Nurmi2015-02-051-0/+19
Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>