summaryrefslogtreecommitdiff
path: root/examples/quick/controls/text
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Add qml/js files in resource files"Caroline Chao2013-06-141-1/+0
| | | | | | | | | | | | We need to investigate more this solution. Deployment issue for Qt Quick Controls will be a known limitation in 5.1.0. This reverts commit 41e13d3746c8b7b5cd550091c63fd8ab066422cf. Change-Id: I501be7494bdbdfbb799d31c612d0c20e7f87ffc7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add qml/js files in resource filesCaroline Chao2013-06-131-0/+1
| | | | | | | | | | | To make deployment of Qt Quick Controls based applications easier. Task-number: QTBUG-31565 Change-Id: I0b8af2864ef0dc9121eed3189ced64712bdb3d20 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Text example: Update example.htmlCaroline Chao2013-06-074-37/+37
| | | | | | | | | | Remove references to QTextEdit and adapt it to match TextArea instead. Update the Qt logo. Change-Id: I6939bf7418fbad883e1d967bea3688d9ccfd4885 Reviewed-by: Hanne Linaae <hanne.linaae@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Simplify example code by using QmlApplicationEngineJens Bache-Wiig2013-06-071-12/+2
| | | | | | | | | | | | Since QmlApplicationEngine does all the nasty bits including setting the incubation controller, we should use it in all of our examples. Task-number: QTBUG-31203 Change-Id: Ie4f2313b66ef1a460aa50559f5c0a6125d0c69f1 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Examples: several fixes for textLiang Qi2013-06-063-50/+166
| | | | | | | | | | | | * Cut/Copy/Paste works * The initial status for b/i/u and alignment works * Font size and family works * Text color works Task-number: QTBUG-31482 Change-Id: I299931dede9defbb1d3eb927f867e77d20ded5ae Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Cleaning up some examples and removing clutterJens Bache-Wiig2013-05-315-43/+111
| | | | | | | | We want to use more layouts in our examples as it is the recommended way to create tool bars etc. Change-Id: Ib3b1e8e907cc5277d522557a19d2c294a7d251b1 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Examples: Clean the pro filesCaroline Chao2013-05-141-5/+0
| | | | | | | | | Remove useless set of MOC_DIR, OBJECT_DIR, RCC_DIR and UI_DIR. Change-Id: Iba08d517e096a982f2bae9701083ebc40ee78ea2 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Examples: remove CONFIG+=console in text exampleCaroline Chao2013-05-131-1/+0
| | | | | | | This is not needed. Change-Id: Ic65f2a1f7cf71d658bef194c05385aa34f3160b7 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Move examples into separate quick/controls directoryKai Koehne2013-04-3028-0/+915
This makes sure all examples are in a separate directory for the Qt source packages. It also is in line with how the other repositories are structured. Task-number: QTBUG-30886 Change-Id: Idc2856e5dfaf467c8cb9764aee327a3b20c7b2d0 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
View Lorry Controller Status