summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3148-1114/+1444
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-226-5/+274
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| * | Doc: Fixed QML snippet highlighting by creating a complete code snippet.David Boddie2011-03-031-0/+2
| | |
| * | Doc: Fixed qdoc warnings.David Boddie2011-03-018-0/+389
| | |
| * | Fixed snippets' license headers.Jerome Pasion2011-02-2211-35/+36
| | | | | | | | | | | | Some text were wrapped, therefore failing regression tests.
| * | Doc: Fixed links and whitespace.David Boddie2011-02-173-15/+14
| | |
| * | Doc: Added a missing snippet.David Boddie2011-02-171-0/+53
| | |
| * | Adding snippet code to coding article.Jerome Pasion2011-02-171-0/+75
| | | | | | | | | | | | Task-number: QTBUG-16071
| * | Re-wrote QML Views overview page. Created new snippets and images.Jerome Pasion2011-02-163-13/+260
| | | | | | | | | | | | Task-number: QTBUG-16071
| * | Added new snippet code.Jerome Pasion2011-02-161-4/+51
| | | | | | | | | | | | Task-number: QTBUG-16071
| * | Re-wrote Qt Quick intro. Deleted unused snippets and images.Jerome Pasion2011-02-1517-1159/+0
| | | | | | | | | | | | Task-number: QTBUG-16071
| * | Removed unused snippet code. Changed reference to snippet.Jerome Pasion2011-02-154-168/+0
| | | | | | | | | | | | Task-number: QTBUG-16071
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-152-0/+135
| |\ \
| | * | Doc: Snippet quoting and other documentation fixes.David Boddie2011-02-092-0/+135
| | | |
| * | | Re-wrote QML Reusable Components documentationJerome Pasion2011-02-105-10/+121
| | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | Rewrote "Importing Reusable Components" documentation.Jerome Pasion2011-02-084-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | Added snippet code, and replaced the text. Task-number: QTBUG-16071
| * | | Changed snippet code and edited event overviewJerome Pasion2011-02-081-0/+141
| | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | Changed states.qml snippet codeJerome Pasion2011-02-081-12/+73
| | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | Adding validator snippet.Jerome Pasion2011-02-071-0/+89
| | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-073-9/+62
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc src/declarative/util/qdeclarativeview.cpp
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-043-9/+62
| | |\ \
| * | | | Replaced old Qt logo with the new Qt logo.Jerome Pasion2011-02-041-0/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| * | | | Re-wrote QML Animation documentation and cleaned snippet codeJerome Pasion2011-02-049-513/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unneeded snippets and added new snippet code. Task-number: QTBUG-16071 Reviewed-by: David Boddie
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-0412-109/+479
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-17197-204/+297
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc doc/src/declarative/extending.qdoc src/declarative/qml/qdeclarativecomponent.cpp
| * | | | | Rewrote QML Property Binding document. Added snippet code.Jerome Pasion2011-01-132-0/+382
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Added content and snippet code to Basic Elements overview page.Jerome Pasion2011-01-073-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-224-3/+210
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| * | | | | fixes/improvements for new QML right-to-left docsBea Lam2011-03-212-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | Clarify some of the docs and fix some broken doc links.
| * | | | | Fix license headers in example codeBea Lam2011-03-211-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I510caf92c2e33df2bb44d87cc07fe78a0823ab5f
| * | | | | Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-183-0/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11042 Reviewed-by: Martin Jones Change-Id: I6319992dec52a4d9252c2df39801ebe6a7dee75d
* | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-114-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtOpenVGu.def
| * | | | | Update copyright year to 2011.Rohan McGovern2011-03-104-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* | | | | | Fix failing testsBea Lam2011-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RTL text-related tests were failing on mac since QApplication::keyboardInputDirection() is not always initialized when the QApplication instance is created. Change-Id: Ifa7214ffb1941d824a9425015b38aa77366381bb Reviewed-by: Martin Jones
* | | | | | Merge branch '4.7' into qtquick11Martin Jones2011-03-0115-112/+583
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativelistview.cpp Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
| * | | | | fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-281-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure attributes added in QtQuick 1.1 are marked with the '\since QtQuick 1.1' tag. Also add links to items listed in the QtQuick 1.1 section in whatsnew.qdoc. Task-number: QTBUG-17771 Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-0414-107/+581
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits) Doc: Fixed a reference to the wrong image. Fixed a bug that caused marked up inline text to be truncated. Doc: Renamed an image to ensure that it does not clash with another. Doc: Fixed QML, unindented snippet. Doc: Removed unnecessary HTML entity from the title. Doc: Fixed broken links to the old Symbian Foundation Wiki. Doc: Updated the copyright statements in the templates. Doc: Fixing typo Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Doc: Adjusted the font sizes for the offline documentation. Doc: Added a missing style sheet to the qhp manifest. Doc: Fixed the qthelp namespace for the Qt documentation. Doc: including missing pages in overviews. Doc: Fixed typo in QCoreApplication docs Fixed whitespace. Avoid hard-coding product names in page titles. Doc: Unindented a code snippet. Doc: Fixed confusing wording of a sentence. Doc: Fixed a broken link. Doc: Updated the information about commercial editions of Qt. ...
| | * | | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Sergio Ahumada2011-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13799
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-3/+11
| | |\ \ \
| | * | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-262-32/+102
| | | | | |
| | * | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-242-0/+142
| | | | | |
| | * | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-21202-207/+552
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| | | * | | | Doc: Fixed qdoc warnings caused by invalid/incomplete QML snippets.David Boddie2011-01-175-3/+155
| | | | |_|/ | | | |/| |
| | | * | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13196-204/+246
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| | | * | | | Doc: Added a missing snippet.David Boddie2011-01-131-0/+51
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Task-number: QTBUG-16619
| | | * | | Doc: Sync with upstream.David Boddie2010-12-221-1/+1
| | | | | |
| | | * | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-211-0/+61
| | | | | |
| | | * | | Added BSD license to snippet code.Jerome Pasion2010-12-201-0/+39
| | | | | |
| | * | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-212-71/+69
| | |/ / /
* | | | | Add LayoutMirroring attached property for mirroring QML layoutsJoona Petrell2011-03-011-0/+64
|/ / / / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17280 Reviewed-by: Martin Jones Change-Id: I34a623b49ce0fd5c05ae7a7ea5d0437c107b8a9b
generated by cgit v0.12 at 2025-09-21 15:56:09 (GMT)