aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2/quickcontrols2.pro
Commit message (Collapse)AuthorAgeFilesLines
* Fix duplicate entry in projcet listLeander Beernaert2019-09-201-1/+0
| | | | | | | Remove double entry for wearable subdirectory. Change-Id: I0038c9435511766815b9626a4e870b2317b04f0f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-12-151-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/quickcontrols2/quickcontrols2.pro src/imports/controls/ComboBox.qml src/quicktemplates2/qquickabstractbutton.cpp src/quicktemplates2/qquickabstractbutton_p.h src/quicktemplates2/qquickapplicationwindow_p.h src/quicktemplates2/qquickcombobox.cpp src/quicktemplates2/qquickcontainer.cpp src/quicktemplates2/qquickcontrol.cpp src/quicktemplates2/qquickcontrol_p.h src/quicktemplates2/qquickcontrol_p_p.h src/quicktemplates2/qquicklabel_p.h src/quicktemplates2/qquicklabel_p_p.h src/quicktemplates2/qquickslider_p.h src/quicktemplates2/qquickspinbox.cpp src/quicktemplates2/qquicktextarea_p.h src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p.h src/quicktemplates2/qquicktextfield_p_p.h tests/auto/auto.pro tests/auto/controls/data/tst_combobox.qml Change-Id: I34cdd5a9794e34e0f38f70353f2a2d04dfc11074
| * Example flatstyle needs widgets modulePeter Seiderer2017-11-261-1/+2
| | | | | | | | | | | | | | | | Fixes compile with disabled widgets module. Task-number: QTBUG-64761 Change-Id: I743884d77d51e89061d87cab006bab0cafc9ddb7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add Music Player Imagine style exampleMitch Curtis2017-11-031-1/+2
| | | | | | | | | | Change-Id: If285e90d25d497155c060907b8f8c60859e55a9a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add Automotive Imagine style exampleMitch Curtis2017-11-031-1/+2
|/ | | | | Change-Id: I7d7e49d0d4e1cbd61892215677c7ea0c5471af02 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add Wearable demoShrikant Dhumal2017-03-131-1/+2
| | | | | Change-Id: I3e287b85517c04803964c068e32bf8b6bcae5cb6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-051-1/+2
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/quickcontrols2/quickcontrols2.pro Change-Id: If2f5e40487ba6515ba322f92380573727bdd6bc0
| * Flat Style exampleThomas Hartmann2017-01-051-1/+2
| | | | | | | | | | | | | | | | | | This example shows how to integrate custom styled components with tooling. The example uses states in the styling items, so they can be easily edited and checked in the designer. Change-Id: Ie665bb3938cdb1b135dbbd4163e1b901e61a6be0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add "Swipe to Remove" exampleJ-P Nurmi2016-12-201-1/+2
| | | | | | | | | | Change-Id: Ibab960ddd073ddcdfbf2b6e4492882662c7021b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Side Panel exampleJ-P Nurmi2016-12-011-1/+2
|/ | | | | | Task-number: QTBUG-53169 Change-Id: I1d84d2fc9cbfce0fa71703f469bb6d5030e41d67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Adding new example Contact ListThomas Hartmann2016-11-171-1/+2
| | | | | | | | | | This example shows how to integrate a C++ backend without disrupting the tooling. A custom list model is implemented in C++ and registered as a QML type. Change-Id: I958bc38797ef353cdb5ea23ec69ada67e132ced7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add Text Editor exampleMitch Curtis2016-08-111-1/+2
| | | | | | | | A follow up commit will contain the touch UI. Change-Id: I26275fdd31294506821fa3e3e4a4bb63329665b9 Task-number: QTBUG-54952 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-04-201-1/+2
| | | | Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
* Flatten and rename example install path and directory structureMitch Curtis2016-04-191-0/+3
Change-Id: Ib04e79d72c37fa4507517da2d3b1c28ccd73eaed Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>