summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Fix code convention docsAlan Alpert2012-11-151-4/+2
| | | | | | | | | The previously specified convention prevents change handlers from being created properly. Another convention is being suggested instead. Task-number: QTBUG-27852 Change-Id: I32a3f6f6c01e628457b30479505b32f1c5bbc92c Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2948-672/+672
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0148-96/+96
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. 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: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Doc: Fix typoSergio Ahumada2012-07-161-1/+1
| | | | | | Task-number: QTBUG-24317 Change-Id: Ieaddea0df2984bb065bfd16203ba07623432e40f Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1149-48/+48
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed a linkKevin Wright2011-11-241-1/+1
|
* Fixed a linkKevin Wright2011-11-241-1/+1
|
* Split behavior and wigglytext examplesKevin Wright2011-11-241-0/+1
|
* Fixed some linking issues.Kevin Wright2011-11-241-1/+2
|
* Fix link to ListView and WebView example pages.Casper van Donderen2011-11-241-2/+2
|
* Change the links to behavior examples.Casper van Donderen2011-11-242-2/+2
|
* Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtJerome Pasion2011-10-192-0/+2
|\
| * Added Qt Quick Components link to documentEero Hyyti2011-10-042-0/+2
| |
* | Doc: adding link to the Qt Quick Components for Symbian page.Jerome Pasion2011-10-191-0/+1
|/ | | | Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-011-1/+6
|\ | | | | | | | | | | Conflicts: tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/htmlgenerator.cpp
| * Merge remote branch 'qt-doc-review/master'Casper van Donderen2011-08-312-2/+2
| |\ | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc tools/qdoc3/generator.h
| | * Merge branch '4.8'Casper van Donderen2011-08-302-7/+8
| | |\ | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc
| * | \ Merge remote branch 'qt-doc-team/4.8'Casper van Donderen2011-08-291-1/+6
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/generator.h tools/qdoc3/htmlgenerator.cpp
| | * | Doc: Small addition to the QML anchor layout docsGeir Vattekar2011-08-241-1/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15514 Reviewed-by: David Boddie
| | * | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-092-24/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| | * \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-2448-481/+481
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| | * \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-161-0/+123
| | |\ \ \ \
* | | \ \ \ \ Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-311-4/+3
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: src/network/ssl/qsslcertificate.cpp
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-272-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed use of deleted object in XmlPatterns EvaluationCache Crash when creating scroll bar skin graphics on S60 (debug only) QS60Style omits drawing theme background in some Symbian SDKs Fix for qml1shaderplugin GPU resource handling on Symbian Make it easier to select words at the start of a line. Doc: Fixing typo In landscape mode QComboboBox popup can not be showed completely Fix left alignment of native RTL pre-edit text.
| * | | | | | Improve documentation for QDeclarativeView::setSource()Keith Isdale2011-08-181-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reference to tutorial on setting source file for QDeclarativeView. Make use of compiled example code that demonstrate using Qt Resources in calls to QDeclarativeView::setSource() . Task-number: QTBUG-20985 Reviewed-by: Alan Alpert
* | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-312-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc
| * | | | | | Doc: Added a simple introduction to Qt and fixed links.David Boddie2011-08-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d) Reapplied after bad v4.7.4 merge
* | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-262-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | | | | | | Conflicts: doc/src/index.qdoc src/xmlpatterns/expr/qevaluationcache_p.h
* | | | | | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-08-1110-63/+165
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtAaron Kennedy2011-08-0410-63/+161
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qtbinding.qdoc
| | * | | | | | Doc: Added a simple introduction to Qt and fixed links.David Boddie2011-07-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d)
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-243-11/+25
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-202-24/+7
| | | |\ \ \ \ \
| | | * | | | | | Qmlshadersplugin examples added.Marko Niemelä2011-06-131-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section. Reviewed-by: Kim Gronholm
| | | * | | | | | Qmlshadersplugin API documentation enhancements.Marko Niemelä2011-06-132-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a link from qml element index, removed some unnecessary doc markings, added missing example image and some other minor fixes. Reviewed-by: Kim Gronholm
| | * | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-172-18/+5
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| | | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-312-24/+7
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | / | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp src/gui/text/qtextengine_p.h src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro tests/auto/qtextlayout/tst_qtextlayout.cpp
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-272-24/+7
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
| | | | | * | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, ↵Joona Petrell2011-05-272-24/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effectiveHorizontalAlignment and anchors.mirror properties * these properties are seldomly used * they confuse developers that do not care about right-to-left user interfaces * LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled * if needed, you can easily determine the effective layout directions and alignments with a little bit of JavaScript: function effectiveLayoutDirection() { if (LayoutMirroring.enabled) return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight; else return listView.layoutDirection; } Task-number: QTBUG-11042 Reviewed-by: Martin Jones
| | * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2448-481/+604
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | / / | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| | * | | | | Doc: Various fixes to documentation, some based on changes in master.David Boddie2011-05-113-31/+35
| | | | | | |
| | * | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-044-1/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
| * | | | | | DocAaron Kennedy2011-07-291-1/+1
| | | | | | |
| * | | | | | DocAaron Kennedy2011-07-291-1/+5
| | |/ / / / | |/| | | |
* | | | | | Document state fast-forwarding.Michael Brasser2011-07-071-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idea5adf70f2ed693e0eac9d58e2ae298704304a2 Task-number: QTBUG-16049 Reviewed-by: Bea Lam
* | | | | | qmlplugindump: Update qmltypes file format documentation.Christian Kamm2011-07-051-2/+4
|/ / / / / | | | | | | | | | | | | | | | Reviewed-by: Fawzi Mohamed
* | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-1748-481/+481
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/network/access/qnetworkaccessdatabackend.cpp src/xmlpatterns/expr/qevaluationcache_p.h tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qtconfig/mainwindowbase.cpp tools/qtconfig/paletteeditoradvancedbase.cpp tools/qtconfig/paletteeditoradvancedbase.ui tools/qtconfig/previewwidgetbase.ui
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-1748-480/+480
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| | * | | Update licenseheader text in source filesJyri Tahtela2011-05-1348-480/+480
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-05-131-1/+1
| |\ \ \ | | |/ / | |/| |