summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-21129-131/+511
|\ | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-16125-125/+407
| |\
| | * Doc: Further QML improvements.David Boddie2010-09-153-0/+53
| | |
| | * Doc: Continued work on the QML documentation.David Boddie2010-09-141-0/+87
| | |
| | * Doc: More work on the QML documentation.David Boddie2010-09-14123-125/+267
| | |
| * | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-161-3/+39
| | | | | | | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-09-1072-824/+2513
| |\ \
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-0972-824/+2513
| | |\ \ | | | |/
| * | | Clarified the coding standard regarding connecting signals to slots.Jerome Pasion2010-09-101-2/+10
| |/ / | | | | | | | | | | | | | | | Cleaned up the contradiction identified in QTBUG-10114. Reviewed-by: David Boddie Bug: QTBUG-8961, QTBUG-10114
| * | Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-032-48/+2
| |\ \
| * | | Adding snippet for QML Text element documentation.Jerome Pasion2010-08-311-0/+54
| | | | | | | | | | | | | | | | | | | | Reviewed by: David Boddie Task: QTBUG-13243
| * | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1077-810/+3552
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * | | Doc: More work on the QML documentation.David Boddie2010-09-076-0/+312
| | | |
| * | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-061-0/+0
| | | |
| * | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-032-50/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml
| | * | Fix examples autotestJoona Petrell2010-09-012-48/+2
| | |/ | | | | | | | | | | | | Task-number: Reviewed-by: Bea Lam
| | * Doc: Fixed snippets in QML introduction broken in an earlier commit.David Boddie2010-08-2717-0/+1099
| | | | | | | | | | | | Reported on the qt-qml mailing list.
| * | Doc: Fixed autotest breakage caused by snippets.David Boddie2010-09-0113-16/+124
| | |
| * | Doc: More work on QML documentation and snippets.David Boddie2010-09-013-1/+80
| | |
| * | Doc: More work on the QML documentation.David Boddie2010-08-2714-0/+686
| | |
| * | Merge branch '4.7' into qmldocsDavid Boddie2010-08-246-6/+285
| |\ \ | | |/
| * | Doc: Started to improve QML reference documentation.David Boddie2010-08-231-2/+2
| | |
| * | Doc: Used snippets for the Beginning QML document. License update.David Boddie2010-08-2317-0/+702
| | |
| * | Doc: Updated QML snippets.David Boddie2010-08-232-5/+5
| | |
| * | Doc: Updated licenses to the three clause BSD license.David Boddie2010-08-2326-730/+704
| | |
| * | Doc: Made more improvements to the QML documentation.David Boddie2010-08-2313-80/+612
| | |
| * | Merge branch '4.7' into qmldocsDavid Boddie2010-08-174-1/+303
| |\ \
| * | | Doc: Started work to tidy up existing QML docs.David Boddie2010-08-1717-0/+397
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Allow pkg_prerules and pkg_postrules to be targeted to separate filesMiikka Heikkinen2010-08-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pkg_prerules and pkg_postrules can now be targeted to apply only to main template pkg, installer pkg, or stub pkg file using .main, .installer, or .stub suffix on the variable. Also clarified documentation of these variables. Task-number: QTBUG-13159 Reviewed-by: axis
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-259-7/+465
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * | | Doc: QtConcurrent::run. Make sure the example actually compilesOlivier Goffart2010-08-231-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::split has overload, and if you want to take the address of a function with overload, you need to cast it. If we really wanted to use QString::split, we would have to do QFuture<QStringList> future = QtConcurrent::run(string, static_cast<QStringList (QString::*)(const QString &, QString::SplitBehavior, Qt::CaseSensitivity ) const>(&QString::split), QString (", "), QString::KeepEmptyParts, Qt::CaseSensitive); So use QByteArray::split as an example instead Task-number: QTBUG-12897 Reviewed-by: David Boddie
| * | | Add info to Loader docs about receiving signals and key eventsBea Lam2010-08-205-0/+281
| | |/ | |/|
| * | Add missing fileBea Lam2010-08-171-0/+86
| | |
| * | Docs - clarify use of PropertyChanges for immediate property changes inBea Lam2010-08-172-1/+94
| | | | | | | | | | | | | | | a State (e.g. for setting a transformOrigin for a RotationAnimation). Also improve some other animation docs in general.
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1322-247/+976
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-1111-188/+520
| |\ \ | | |/
| | * Removed duplicate case for const variable snippet.Jerome Pasion2010-08-061-5/+0
| | | | | | | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-10411
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-061-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Designer: Prevent rich text from being copied into style sheets. QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction qdoc: Removed three unused config variables. qdoc: Cleaned up the application option specification and use. Doc: Adding GS QML example files Doc: Images for QML GS Doc: Editied version of QML GS Doc: Adding text to GS page Fix link error when building Bearer application with Qt Mobility Doc: nesting up orphant pages
| | | * Remove useless QString::clear() from QSharedData example snippet.Robin Burchell2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 2443 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | Improve docs on QML Animation page and associated elementsBea Lam2010-08-0510-183/+520
| | |/ | | | | | | | | | Task-number: QTBUG-12666
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-051-0/+60
| |\ \ | | |/
| | * Add missing snippet fileBea Lam2010-08-041-0/+60
| | | | | | | | | | | | Task-number: QTBUG-12628
| * | Merge commit 'refs/merge-requests/2443' of git://gitorious.org/qt/qt into ↵David Boddie2010-08-051-1/+1
| |\ \ | | | | | | | | | | | | integration
| | * | Remove useless QString::clear() from QSharedData example snippet.Robin Burchell2010-07-271-1/+1
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-0445-130/+1367
| |\ \ \ | | | |/ | | |/|
| | * | State doc fixes, improvementsBea Lam2010-08-023-35/+76
| | | | | | | | | | | | | | | | Task-number: QTBUG-12570
| | * | Update QML Documents exampleBea Lam2010-07-301-0/+66
| | | | | | | | | | | | | | | | Task-number: QTBUG-12526
| | * | Component docsBea Lam2010-07-291-0/+60
| | | | | | | | | | | | | | | | Task-number: QTBUG-12447
| | * | Fixes for Dynamic Object Management docs. Also adds links toBea Lam2010-07-293-22/+69
| | | | | | | | | | | | | | | | | | | | | | | | this page from other documentation. Task-number: QTBUG-12446