aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/controls.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove QMake project filesJoerg Bornemann2021-02-111-20/+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>
* Fix static buildEskil Abrahamsen Blomfeldt2020-10-091-1/+1
| | | | | | | | The register_types() function was optimized away by the linker and the imports would not be found. Change-Id: I3d98602daf78996399630b7b1296cc5dc0d3da05 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Bump import version to 6.0Mitch Curtis2020-08-261-1/+1
| | | | | | Task-number: QTBUG-82922 Change-Id: I2eb924eaaaddbe75d342f59f5fb3cd30c4a84fef Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Remove ".2" from TARGETPATH, resource prefixes, etc.Mitch Curtis2020-08-261-1/+1
| | | | | | | | | | | | Qt Quick Controls 1 will be removed in Qt 6, so now we can have the simplified path for ourselves. Having the .2 in the path causes issues for importing now that the version is being bumped to 6. Task-number: QTBUG-82922 Change-Id: I0b92cdd44c42c19b1c82e7b9a7959b86ac26c6e2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Register C++ types declarativelyMitch Curtis2020-08-261-1/+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>
* Move Default style out into its own pluginMitch Curtis2020-08-261-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In upcoming patches, we start registering C++ types declaratively. A condition of doing so requires that each .pro corresponds to one QML module. This conflicts with the QtQuick.Controls import, which currently does quite a lot: - Registers (and selects) QML files for the style that was set - Registers private C++ utility types (such as IconLabel) that are useful for all styles under the QtQuick.Controls.impl import - Registers private C++ types that are only useful for the Default style (such as BusyIndicatorImpl). The reason it does so much can probably be explained by the intended usage of Qt Quick Controls 2; when you do import QtQuick.Controls 2.0 you get access to the QML types (e.g. Button) that the style you're using provides. So if you're using the Material style, you'll get a Material style button. API-wise, the button is identical to any other button, because the types in QtQuick.Templates are what we advertise as the public API. If we didn't have this functionality, users would need to import specific style imports to use controls, and the convenience of being able to simply start the application with a different style by e.g. passing an application argument would be lost. To support declarative registration of types while also supporting the existing use cases, we split out the Default-style-specific stuff into a QtQuick.Controls.Default import. Task-number: QTBUG-82922 Change-Id: Ib4f1620cae78d7acdc13d9ac0752a020bc22f3ea Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Copy Qt Quick Designer-related files also for static buildsKai Koehne2020-02-031-1/+1
| | | | | | | | | | | | | | | Make sure that the 'designer' directory is copied to the build directory, or installed, also for static builds. This reverts the !static condition introduced to fix a build breakage in 01d076d0e81e5 . Anyhow, I couldn't reproduce the original problem (QTBUG-51708), nor is it clear why it was caused by the static build. Fixes: QTBUG-75682 Change-Id: I47af3907e464d4fd9e9965ac28545b7350f450ee Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Update plugins.qmltypes for QtQuick.ControlsKai Koehne2019-04-111-1/+1
| | | | | | | This amends 1693a19fd557c857ef4f43ab303ea1056790481e Change-Id: I70ef68de56405eb705d1c79be4eed8925def319a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Compile QML files ahead of time in resourcesJ-P Nurmi2018-04-101-10/+2
| | | | | | | | | | | | | | | After qtbase commits defe266 and 9c42959, we can use 'builtin_resources' and 'install_qml_files' configs to get qml_module.prf to do all that for us without having to write custom qrc/copy/install rules. This allows us to unconditionally enable the Qt Quick Compiler for the resources. The rest, i.e. optionally leaving out the QML files, will be handled via the Qt deployment tools. Task-number: QTBUG-67501 Change-Id: I18f2122ff4945496921b7183c365497c37dfe3a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Bump module versionsJ-P Nurmi2018-03-011-1/+1
| | | | | Change-Id: Ifcb0b333769be58263ec5ed662520b97cfc2f79c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update versions in the docs and .prosJ-P Nurmi2018-02-261-1/+1
| | | | | Change-Id: I5b4af1ddfe8c4583731f5a90082d803298bdf9bd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-201-0/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/ApplicationWindow.qml src/imports/controls/material/ApplicationWindow.qml src/imports/controls/universal/ApplicationWindow.qml src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I9041c69f4ce5dab1d1b994d2318feddb696e56bf
| * Enable the use of QML caching at build timeSimon Hausmann2017-05-191-0/+2
| | | | | | | | | | | | Task-number: QTBUG-58571 Change-Id: Ia6aeb27d4af695fcfc987e944c73d49364fd440e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-04-211-2/+4
|\| | | | | | | | | | | | | | | Conflicts: src/imports/controls/RoundButton.qml src/imports/controls/universal/RadioDelegate.qml Change-Id: I4cb14c19bd5f6e19b70b03fb394c76712e6dda08
| * Add .qml files to OTHER_FILES to force them visible in Qt CreatorJ-P Nurmi2017-04-201-2/+4
| | | | | | | | | | Change-Id: I50f26b1a0fd5d6bc79e125e46fe9a546a3441db3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-011-1/+3
|\| | | | | | | Change-Id: Ia4c692552e6573b33b2e0f6b43b2a482a78ad970
| * Respect the "Quick Designer support" featureJ-P Nurmi2017-02-071-1/+1
| | | | | | | | | | Change-Id: Ibebff13b92d2ad9335de872f0b70ae3f43051061 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Make styles configurable featuresJ-P Nurmi2017-02-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ./configure [...] Qt Quick Controls 2: Styles ................................. Default Material Universal Supports both syntaxes: -(no-)style-[material|universal] -(no-)feature-quickcontrols2-[material|universal] Change-Id: I011cc38e5752d2c718376ca7493940271920b3e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update the QML module versions from 2.2 to 2.3J-P Nurmi2017-02-201-1/+1
|/ | | | | Change-Id: Iefb73973e7950246cd364dbb7e47dc096508e4d4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update IMPORT_VERSION in the .pro filesJ-P Nurmi2017-01-241-1/+1
| | | | | Change-Id: I9546ee274e5376151e9f5faffda87182f2e10188 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-221-2/+1
|\ | | | | | | Change-Id: I37aab846346692fd4bff08b0dbab66db3a8e2716
| * List .qdoc files and snippets in OTHER_FILESJ-P Nurmi2016-09-161-2/+1
| | | | | | | | | | Change-Id: Ic33bc3d69771dab79ccaf307b00ed0f840b9e8b2 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Bump up IMPORT_VERSIONs in .pro filesJ-P Nurmi2016-07-151-1/+1
|/ | | | | Change-Id: Icf62245d16d9f7c2b3652eec267115b41916149b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Move resources to :/qt-project.org/imports/QtQuick/Controls.2J-P Nurmi2016-04-211-1/+1
| | | | | | Change-Id: I0e36bd0ce16465e648fffd3e172711f4ad2b870c Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-211-2/+2
| | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Controls: rename the plugin to QtQuickControls2PluginJ-P Nurmi2016-04-131-3/+3
| | | | | Change-Id: I7c7c11675f340ab8110f38041434a91f72c9552e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* 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 - doc updateVenugopal Shivashankar2016-03-291-1/+1
| | | | | | | | | | | | - Change \title, \page, and \l instances that used "qtlabs" instead of "qtquick". - Renamed the qdocconf file and changed the qch parameters in it to use "Qt Quick Controls 2". - Added "2" as output suffix for the html filenames. Change-Id: Ia2fdd1c835229e5216f42a2fdfa5f7e11965e21d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
* Reorganize controls.pro vs. controls.pri listsJ-P Nurmi2016-03-191-7/+1
| | | | | | | | | The same way other plugins do it. The main plugin file and the build system flags are specified in the .pro file, and the list of classes and types provided by the plugin are specified in the .pri file. Change-Id: I60c8aeca36c4a177f613ce88f34bfaf5d69b7543 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-181-4/+4
| | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-081-1/+1
|\ | | | | | | | | | | | | Conflicts: tests/auto/controls/data/tst_combobox.qml Change-Id: I9d0c9a8adbe098720f0766e38db8aa2be4ed7408
| * Fix static buildsMitch Curtis2016-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | The error was: Error in '.rcc\debug\qmake_Qt_labs_controls.qrc': Cannot find file 'C:/dev/qt5.7/qtquickcontrols2/src/imports/controls/designer/images/*.png' Change-Id: Icfd1225e8c130d8d48f821af981b64202c687956 Task-number: QTBUG-51708 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-02-251-1/+1
|\| | | | | | | | | | | | | Conflicts: src/templates/qquickrangeslider_p.h Change-Id: Ibe8ec18a7e22080f69f316d0394af1d03517ce93
| * Exclude designer support on iOSJ-P Nurmi2016-02-251-1/+1
| | | | | | | | | | | | | | Causing build problems due to RCC'ing 'designer/images/*.png' Change-Id: I4d97d8514fa38e5d78b8a6b1b6647e3834c864d7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Controls: added support for qtquickcompilerLiang Qi2016-01-151-0/+6
|/ | | | | Change-Id: Ib262bce848bfada1bcddb2df1dd99a399870f3e1 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Implement default ProgressBar according to designsMitch Curtis2016-01-061-2/+4
| | | | | Change-Id: I7f973deec7453c4b80c03b3dc063f4d0dbe850c5 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Implement BusyIndicator according to designsMitch Curtis2015-12-161-1/+5
| | | | | | Change-Id: Iffaafc1d5512b4e47a7c6c304a3883ab8d986b12 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickStyleJ-P Nurmi2015-12-021-1/+0
| | | | | | | | | Now that we have a good place for it, we can share a common base class for QQuickMaterialStyle and QQuickUniversalStyle. QQuickStyle implements the inheritance pattern for attached styles, in one place. Change-Id: I459d98f96ce7c6de1ce7ef716e859f459278d8ad Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Remove theme.json leftoverJ-P Nurmi2015-11-271-3/+0
| | | | | Change-Id: I7b8aaedf3a3c645db7bf6a1ca88472d8458de568 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QQuickFileSelector to QQuickStyleSelectorLiang Qi2015-11-261-1/+1
| | | | | | | Also moved to QtLabsControls lib. Change-Id: I8ed1256da2b9aa63db4ca3b51a0ace3ba730e542 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Cleanup & align the .pro filesJ-P Nurmi2015-11-161-2/+2
| | | | | | | | Remove some superfluous spaces, include paths, and module deps. Also, use more explicit QT_PRIVATE for private dependencies. Change-Id: I85d48213441749ab18442928a20cbb4c9c6dad0b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add missing QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCIIJ-P Nurmi2015-11-161-0/+2
| | | | | | | http://lists.qt-project.org/pipermail/development/2012-February/002001.html Change-Id: Id6815c3bd9b196590b0c93b8ddf2f977cdc6a511 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Share style inheritance related helpersJ-P Nurmi2015-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Usage: # +material/material.pro include(../shared/shared.pri) // qquickmaterialstyle.cpp #include "qquickstyle_p.h" QQuickMaterialStyle *style = QQuickStyle::instance<QQuickMaterialStyle>(item); // ... QQuickMaterialStyle *parent = QQuickStyle::findParent<QQuickMaterialStyle>(this); // ... QList<QQuickMaterialStyle *> children = QQuickStyle::findChildren<QQuickMaterialStyle>(object); // ... Change-Id: I2c01a1aa36805f16d83fa60ab25b2cc29e6a43cc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0J-P Nurmi2015-10-011-6/+6
| | | | | Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc 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>
* Add controls.priJ-P Nurmi2015-09-251-34/+1
| | | | | Change-Id: Iab776ece0035877414626230985bb94edcfba5d8 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Templatize the former extrasJ-P Nurmi2015-09-231-9/+1
| | | | | Change-Id: Ief9ee07d1f5f6c80500bfa611bace860481e2a3f Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Merge Qt Quick Extras into Qt Quick ControlsMitch Curtis2015-09-181-2/+14
| | | | | | | | | | | | The original split existed because the public and enterprise controls were developed separately. Now that all controls are public and developed together, the split no longer makes sense and is difficult for users to understand. Change-Id: I00420f4d09f8c837232231d03fe818b7b3403fab Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: move qtquickcontrols qdoc files in the right placeJ-P Nurmi2015-09-161-0/+2
| | | | | Change-Id: I864eaf25f586c49c03708fb83e8e99b115cdb3a7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>