aboutsummaryrefslogtreecommitdiffstats
path: root/examples/declarative/text
Commit message (Collapse)AuthorAgeFilesLines
* Homogenize examplesAlan Alpert2012-02-062-0/+73
| | | | | | | | Several groups of examples are now organized like the other Qt examples, with a project file, doc entry, and single launch point. Change-Id: I2fd957c00e0d1121ebe47c806e54e6999425d1d3 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Cleanup text examplesYann Bodson2012-02-032-13/+12
| | | | | | Change-Id: I66797c9cf8b2c3a502a31c442d9e51d7febfe368 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Support inline images with <img> tag in StyledTextYann Bodson2012-02-029-28/+183
| | | | | | Task-number: QTBUG-21793 Change-Id: Ie7b9f293c6c9a949c1899152c38b61251b0069d3 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-306-6/+6
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-236-6/+6
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-056-6/+6
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make PlainText the default textFormat of a TextEdit.Andrew den Exter2011-12-161-0/+1
| | | | | | | | | | | With AutoText as the default it's easy to assume that a TextEdit accepts plain text or rich text only which can lead to unexpected behaviour when user supplied text is does not have the expected formatting and implicitly changes the text format. Task-number: QTBUG-23109 Change-Id: I08900fb23545672fd0e181058633bafeb826a746 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add Text.onLineLaidOut exampleYann Bodson2011-11-011-0/+109
| | | | | Change-Id: I87bef980cea9c9b5525c3dc88c15b4a9a555888c Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-09-1270-4530/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * Update text examples to QtQuick 2.0, remove obsolete filesDamian Jansen2011-09-0271-4531/+6
| | | | | | | | | | | | | | Change-Id: I7181c3d26e85459597f06bba174885ced40ffe1d Reviewed-on: http://codereview.qt.nokia.com/3618 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* | Use QMouseEvent instead of QGraphicsSceneMouseEventLars Knoll2011-09-011-80/+1
|/ | | | | | | | | | QMouseEvent now supports floating point coordinates, and the graphics scene event is not be available in QtGui anymore. Change-Id: I28ab428a2d00fc1deef55b05c1c545e74838e105 Reviewed-on: http://codereview.qt.nokia.com/3991 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Doc: Added missing license headers for documentation and examples.David Boddie2011-06-0812-0/+480
|
* Removed generated files.David Boddie2011-06-085-80/+0
|
* Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-05-241-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Doc: Added missing project and desktop files.David Boddie2011-05-231-0/+16
|
* Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-2370-0/+4119
|
* Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-238-58/+0
| | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2713-0/+648
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 23:04:27 +0000