qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,527 Commits 82 Branches 266 Tags 290 MiB
Commit Graph

14 Commits

Author SHA1 Message Date
Leander Beernaert ebc2c7dce9 Fix duplicate entry in projcet list 
Remove double entry for wearable subdirectory.

Change-Id: I0038c9435511766815b9626a4e870b2317b04f0f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
 2019-09-20 17:10:09 +02:00
J-P Nurmi 1fcec5bf1e Merge remote-tracking branch 'origin/5.9' into 5.10 
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
 2017-12-15 11:44:26 +01:00
Peter Seiderer bd617ed62b Example flatstyle needs widgets module 
Fixes compile with disabled widgets module.

Task-number: QTBUG-64761
Change-Id: I743884d77d51e89061d87cab006bab0cafc9ddb7
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
 2017-11-26 09:12:30 +00:00
Mitch Curtis 830596edf2 Add Music Player Imagine style example 
Change-Id: If285e90d25d497155c060907b8f8c60859e55a9a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
 2017-11-03 13:01:32 +00:00
Mitch Curtis 1eacc02282 Add Automotive Imagine style example 
Change-Id: I7d7e49d0d4e1cbd61892215677c7ea0c5471af02
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
 2017-11-03 12:08:33 +00:00
Shrikant Dhumal 7d0a2a1e55 Add Wearable demo 
Change-Id: I3e287b85517c04803964c068e32bf8b6bcae5cb6
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
 2017-03-13 07:29:41 +00:00
J-P Nurmi 463e462455 Merge remote-tracking branch 'origin/5.8' into dev 
Conflicts:
	.qmake.conf
	examples/quickcontrols2/quickcontrols2.pro

Change-Id: If2f5e40487ba6515ba322f92380573727bdd6bc0
 2017-01-05 16:48:06 +01:00
Thomas Hartmann 4f7ec6143a Flat Style example 
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>
 2017-01-05 14:17:35 +00:00
J-P Nurmi 2071c1b059 Add "Swipe to Remove" example 
Change-Id: Ibab960ddd073ddcdfbf2b6e4492882662c7021b5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
 2016-12-20 12:53:21 +00:00
J-P Nurmi 15fab6e8f8 Side Panel example 
Task-number: QTBUG-53169
Change-Id: I1d84d2fc9cbfce0fa71703f469bb6d5030e41d67
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
 2016-12-01 16:14:00 +00:00
Thomas Hartmann a4c3f074a6 Adding new example Contact List 
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>
 2016-11-17 07:43:20 +00:00
Mitch Curtis fcf4a1ed81 Add Text Editor example 
A follow up commit will contain the touch UI.

Change-Id: I26275fdd31294506821fa3e3e4a4bb63329665b9
Task-number: QTBUG-54952
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
 2016-08-11 16:47:48 +00:00
J-P Nurmi e8cd9c0458 Merge remote-tracking branch 'origin/5.6' into 5.7 
Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
 2016-04-20 16:23:33 +02:00
Mitch Curtis 1cb0faf788 Flatten and rename example install path and directory structure 
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>
 2016-04-19 12:27:35 +00:00