aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/controls.pro
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Rename libQtQuickControls to libQtQuickTemplatesJ-P Nurmi2015-09-161-1/+1
| | | | | Change-Id: I1e663bb7be2be8b3d4edf0c038862cc2150aec40 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QtQuick.Controls: QML Designer supportJ-P Nurmi2015-07-141-0/+2
| | | | | | Change-Id: I12aa4b73de8a33fcec1ea603d88cea2fa5a6b231 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Remove the old TabView implementationJ-P Nurmi2015-06-111-1/+0
| | | | | Change-Id: I8d8aa96f2f37f458577a5a3ec681e3c9174d0918 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix buid issue: qtquickcontrols-private => qtquickcontrols2-privateCaroline Chao2015-04-231-1/+1
| | | | | | | The module name has been change to qtquickcontrols2. Change-Id: I023fca6086251e151752ef6f18fe8bf6ffcaf1e1 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Implement StackView in C++J-P Nurmi2015-04-091-3/+0
| | | | | Change-Id: Ia5387aa16325453c676a2542f80c827d4c069ca9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Style to ThemeJ-P Nurmi2015-04-081-5/+5
| | | | | Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Remove SpinBoxJ-P Nurmi2015-03-301-1/+0
| | | | | | | | | | SpinBox is a desktop centric control. It won't be provided in Qt Quick Controls 2.0, but maybe later when desktop support is re-considered. Qt Quick Controls 2.0 will focus on embedded and mobile. SpinBox is still available in 1.x Change-Id: I272b030734bad58de7e5b26c522189e0c520fca5 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Implement Style as an attached propertyJ-P Nurmi2015-03-111-0/+9
| | | | | Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 11:32:54 +0000