summaryrefslogtreecommitdiff
path: root/src/controls/controls.pro
Commit message (Collapse)AuthorAgeFilesLines
* Fix non-prefix builds on WindowsSimon Hausmann2017-04-261-2/+2
| | | | | | | | | | After commit 3ba11cf93820610273e2a16b13ab1d8c57a41d36 the shaders do not belong into QML_FILES anymore (and also don't need to be copied via COPIES consequently). Task-number: QTBUG-60214 Change-Id: I8d68fe76810c2d2d8945ef410a377aa2ce0068c1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix packaging of shaders when qmlcache is usedJoni Poikelin2017-04-241-23/+7
| | | | | | | Task-number: QTBUG-60320 Change-Id: Iac74b469e971d28218fd35eadefb3c3b4bca4e51 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Enable the use of QML caching at build timev5.9.0-beta2Simon Hausmann2017-04-111-3/+7
| | | | | | | Task-number: QTBUG-58571 Change-Id: I11c9dfb4e0fad93b2961db4213f934eca7d214df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-191-0/+2
|\ | | | | | | | | | | | | Conflicts: src/controls/controls.pro Change-Id: I0150ca08d83f292a5c8587ec886e206124757df4
| * Static builds: show QML files in QtCreatorRichard Moe Gustavsen2016-09-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | After b4c1391, QML files does no longer show up in QtCreator for static builds. Before they would show as resources, but since we now only create resources explicit for dynamic builds (and implicit otherwise), QtCreator cannot see them. This patch will add all the qml files as OTHER_FILES when doing static builds, so they show up in QtCreator. Change-Id: I8ee7d53e938cd96da23b0dc0ca78406449e3504d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Make FastGlow multi backendLaszlo Agocs2016-07-011-2/+5
|/ | | | | | Change-Id: I869fe798d6e4ee0e61b6f99065338b6127d664d7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Don't duplicate the files listed in QML_FILESAndy Shaw2016-03-181-1/+1
| | | | | | | | Since they will be added already when qtquickcompiler is not set then we only want them to be added if this was not actually set. Change-Id: I58a0308388b4e604bc036624a41d33b2cb16625b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Enable using the module in a statically built applicationAndy Shaw2016-03-151-26/+31
| | | | | | | Task-number: QTBUG-35754 Task-number: QTBUG-45868 Change-Id: I9bb332bc85713a17f02f3e7e768592e3234edfe3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Enable the build of Layouts with QT_NO_ACCESSIBILITYLiang Qi2015-09-151-0/+2
| | | | | | Change-Id: I8936d86f9cac5b0cc6231dc08fb986129c68f599 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Android: Add inputMethodHints to ComboBox controlBogDan Vatra2015-08-261-1/+1
| | | | | | Task-number: QTBUG-39088 Change-Id: Iaf57e8c5e6b92b63564fb015c3b13602acfeae8b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add support for compiling QML files ahead of timeSimon Hausmann2015-05-121-1/+2
| | | | | | | | All this patch really does it not try to load any .qml files off the disk but always load from qrc. Change-Id: Ie0e1252605486b627d8d42156736734f13bb5ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Merge Extras' styling system into Controls'.Mitch Curtis2015-03-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removes the duplicated style settings functionality in Extras and simplifies the installed styles directory structure. - Extras' Base style is now part of Controls' Base style, eliminating the need for a separate QtQuick.Extras.Styles import. The cost of doing this should be negligible: a few QML files and two images. If we didn't merge Extras' Baste style into Controls', we'd need extras-specific code in qquickcontrolssettings, as the default style search path is: qml/QtQuick/Controls/Styles/ Whereas the Extras Base style would be in: qml/QtQuick/Extras/Styles/ The Extras Base style can't go into Controls' Base style directory, either, because otherwise we'd have two qmldir files there. The Flat style doesn't have this problem because it is all contained in one plugin and gets installed into its own Flat/ folder. - Documentation now lists the Extras controls as \since QtQuick.Extras 1.4. - Adds the customcontrolsstyle auto test to ensure that custom styling is tested. Change-Id: I19ca7a8b7e1c1daa85b272f4ccf9a2f05c76e0d9 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Introducing TreeViewGabriel de Dietrich2015-02-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TreeView, as currently implemented, extends the TableView by adding support for hierarchical models. In the broad sense, it remains a list view with columns, like TableView. The main architecture is based on TreeModelAdaptor, that wraps the hierarchical model. It keeps track of which items are expanded or collapsed, and also relays model changes to the view. (TreeModelAdaptor is a private type and should be considered as an implementation detail.) The TreeView only supports QAbstractItemModels for the time being, and, just like TableView, relies on roles to pass the data to the view. This also means that model columns are not supported. Selection is supported by ItemSelectionModel which exposes part of the API of QItemSelectionModel. For this, support has been added for QModelIndex and related classes. This requires importing QtQml.Models 2.2 should an actual usage of the TreeView use selection. In the same way, TreeViewStyle currently extends TableViewStyle with the relevant features, like branch indicator. [ChangeLog][QtQuick.Controls] Introducing TreeView With-Help-From: Caroline Chao <caroline.chao@theqtcompany.com> Change-Id: Id3dba240a732744571e4a646b7b98678ab522da6 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Make WinRT style use qt_quick_controls_style_init()J-P Nurmi2015-01-201-2/+0
| | | | | Change-Id: Ib78ef26e5bda1a5a3047368e8bde67f1d23bcd01 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-191-1/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib58b1084fdeb88a19b81f678e8ae2fcce3c8bbf7
| * Update plugins.qmltypesFawzi Mohamed2015-01-191-1/+1
| | | | | | | | | | | | | | Change-Id: I8e208f58f33a83067fb2083e21fbed1060105223 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Add WinRT style stubJochen Seemann2014-09-301-0/+2
|/ | | | | | | | | | | | The goal is to have a QtQC style for WinRT with Qt 5.5. It includes two separate styles: for Windows 8.1 (PC) and Windows Phone 8.1 (Phone). This commit doesn't change anything, but makes it easy to add the control styles gradually. Change-Id: I0e34666622cda0a16e71d02cef1d19d3eb2483c1 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Use the new QSGNinePatch node interface from the scene graphSimon Hausmann2014-08-091-1/+1
| | | | | | | This allows scene graph backends to customize the rendering itself Change-Id: Ib5f7ccca09aeba14a6da00e38f18da370648da4f Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Set State_KeyboardFocusChange if focus has been requested by keyboardBerthold Krevert2014-05-121-1/+1
| | | | | | | | | | Some styles (QFusionStyle, QGtkStyle) don't draw a focus rectangle if QStyle::State_KeyboardFocusChange is not set. This patch is based on change,84388 in QtDeclarative. Change-Id: Ic0c0bdd68689055cff12d601e64b77b53e7980dd Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Bump QtQuick.Controls import version to 1.2J-P Nurmi2014-04-071-1/+1
| | | | | Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add Calendar to Qt Quick Controls.Mitch Curtis2014-02-141-0/+1
| | | | | | | | | | | Task-number: QTBUG-29948 [ChangeLog][QtQuickControls] Calendar was added. Calendar allows selection of dates from a grid of days, similar to QCalendarWidget. Change-Id: I279130e704bc0dfd8dfe114ec9b6b49e111faf96 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* use private linkage where possibleOswald Buddenhagen2013-10-311-1/+1
| | | | | | Change-Id: I693f8469b8bec8e80d65d69122c01d0273a38b3d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add a basic Switch controlJens Bache-Wiig2013-09-221-0/+1
| | | | | | | | | This is a very simple switch. I left out text label as this is very mobile oriented. A clicked signal is also debatable as you dont really click on a switch. Change-Id: I84269297cba48f0e81af8f25af5b97acadecdd6a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Update plugins.qmltypes for 1.1J-P Nurmi2013-09-191-1/+1
| | | | | Change-Id: I237ecea8265e6fd019aa99d1e78532efb5f2f884 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* BusyIndicatorJens Bache-Wiig2013-09-091-0/+1
| | | | | | | | A basic BusyIndicator to indicate activity while blocking the UI. Change-Id: Iec88b6a4c7f23b630ebdf445c4cb288684c24cb7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Add qml/js files in resourceCaroline Chao2013-08-211-0/+27
| | | | | | | | | | | | | | | | | | | | | | All the qml and js files are embedded in the Qt Quick Controls plugin (for Controls, Styles and Private). If ApplicationWindow.qml is missing, loading the files from resource will be enabled. Otherwise, the files will be loaded from the local path. The purpose of this change is to make the deployment of Qt Quick Controls easier while keeping the development tasks convenient. With this solution: - It is only necessary to deploy the qmldir and the plugin qtquickcontrolsplugin found in the QtQuick/Controls folder. - By default the files used are the ones found in the local folder. Autocompletion and debugging capabilities remain unchanged. Task-number: QTBUG-31565 Change-Id: I938ebe261c3c35f9e3b066d82c81accd9750edc9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2013-08-201-0/+1
|\ | | | | | | Change-Id: I97e6044a5d28ab875628e61ea67474f3c0a4ef4b
| * Fix 'make qmltypes' by setting correct IMPORT_VERSIONJ-P Nurmi2013-08-161-0/+1
| | | | | | | | | | | | Change-Id: I9b86a47cf37e04fc3ad6219f27ea1c0b26762c10 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Move Styles and Private under controlsCaroline Chao2013-08-161-1/+8
|/ | | | | | | | | | | Register the C++ private API from the controls plugin. The private plugin is not needed anymore. The Controls "submodules" Styles and Private are moved to the controls subfolder in the sources tree. Change-Id: I98358227c945b6cd1a8dbff9d07e6cad4f044277 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Move plugin.cpp out of plugin.priCaroline Chao2013-06-241-0/+2
| | | | | | | So plugin.pri only contains the module specific files. Change-Id: I2f5d73da5d328ca1a5bee445e09d4dec7fa8682e Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Yet another plugin renameJens Bache-Wiig2013-05-271-1/+1
| | | | | | | | | For consistency we should use "plugin" as suffix on plugin names. Change-Id: Ieea483cc1d7642e4fcd7d0907de8efd7e00743e1 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Rename generic plugin namesJens Bache-Wiig2013-05-271-1/+1
| | | | | | | | | We should not use names as generic as "plugin.dll" and "private.dll". This will cause a lot of confusion when deploying. Task-number: QTBUG-31348 Change-Id: Iee18e4d0cd713b63ff1b99dc0db31123b90666ec Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Remove hard dependency on widgetsJens Bache-Wiig2013-04-151-1/+1
| | | | | Change-Id: I1fabb4efcc931f12f0a65ac5c66e6e085108269b Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* PageStack: rename PageStack to StackViewRichard Moe Gustavsen2013-03-281-1/+1
| | | | | Change-Id: Idd859547ca7c7a87cfafc882bf7593246efc58e7 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* PageStack: rename PageAnimation to StackViewTransitionRichard Moe Gustavsen2013-03-281-1/+1
| | | | | Change-Id: I38698118b469bfbb64d16d562a4c67f5b27a761a Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* PageStack: rename PageTransition to StackViewDelegateRichard Moe Gustavsen2013-03-281-1/+1
| | | | | | | | | A 'PageTransition' is more a 'delegate' that is asked when the PageStack needs to create a new transition. So it feels more correct to name it this way. Change-Id: I1359592690d76b59f2d76baaf83455ae634fa4cc Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Remove the Page control - use attached properties insteadJ-P Nurmi2013-03-201-1/+0
| | | | | | Change-Id: I69599daeea4ba49689fbbbe58c5d4a60fccc8824 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Menu: Remove 'model' property, ContextMenuGabriel de Dietrich2013-03-131-1/+0
| | | | | | | | | | | | | | | In the near future, we hope that QML types like Creator/Instantiator (currently under review) will help simplify model binding, and object creation and deletion. Also, given the differences between QML models and QAbstractItemModel APIs, it's hard to provide a unified and elegant solution for this right now. ComboBox gets the part of the logic that ContextMenu was responsible for, extended to support string list and number models. Auto-tests updated and XFAIL removed where applicable. Change-Id: I9f5d4059644c495bffff76fb7c353e6fe7fde62e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* use qml_plugin.prf in parent-less modeOswald Buddenhagen2013-03-121-1/+1
| | | | | Change-Id: Ifeba27380b874e2ee0f74710e681df3abd93f9a0 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Remove QT_DISABLE_DEPRECATED_BEFORE=0Debao Zhang2013-03-011-3/+0
| | | | | Change-Id: I0a96289a1a5203c28e7cd30781c89e7505296562 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Rename Splitter to SplitViewJ-P Nurmi2013-02-221-1/+1
| | | | | Change-Id: I1db05195ada0b798a632da04fb256f030c894560 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Rename TabFrame to TabViewJens Bache-Wiig2013-02-221-1/+1
| | | | | Change-Id: I367758fe97656fb5c4aab79c87e80ead2430c69b Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Make AbstractCheckable private.Mitch Curtis2013-02-221-1/+0
| | | | | | | We don't want to expose it. Change-Id: Ieb8fa7ee0ae25944cf2c8277791942caebd541a8 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Rename ScrollArea to ScrollViewJens Bache-Wiig2013-02-221-1/+1
| | | | | | | | We want to introduce View as a common name for items that are not simple controlss but views controlling other items Change-Id: I13ffc096742ec13023c58b4744ad53084e11cc67 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename QtDesktop to QtQuick.ControlsJens Bache-Wiig2013-02-211-0/+45
Change-Id: Icc61dbfc74cc2a303b9847e7d2c7ace4a9002046 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
View Lorry Controller Status