summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-161-0/+12
|\ | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-31988-998/+1006
| |\
| * | Add packagesExist() function to qmake.Robin Burchell2011-01-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | This can be used to detect whether or not a given (set of) packages exist, which can be useful for compiling in or our extra functionality at build time. Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1019-311/+785
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp 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 tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * | | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-072-2/+2
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-043-9/+62
| |\ \ \
| * | | | 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
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-261-1/+1
| |\ \ \ \ \
| | * | | | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-251-1/+1
| | | | | | |
| * | | | | | 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-21993-1195/+1540
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| | * | | | | | Doc: Fixed qdoc warnings caused by invalid/incomplete QML snippets.David Boddie2011-01-176-194/+346
| | |/ / / / /
| | * | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13987-1001/+1043
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |/ / / / / /
| * | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-156-0/+276
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-1432-1/+1670
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| * \ \ \ \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0759-221/+1701
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h
| * | | | | | | | | doc: Removed an illegal char and some empty \row commands.Martin Smith2010-10-271-1/+1
| | | | | | | | | |
| * | | | | | | | | doc: Removed some illegal characters.Martin Smith2010-10-271-8/+8
| | | | | | | | | |
| * | | | | | | | | doc: Removed an illegal character.Martin Smith2010-10-271-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-043-9/+62
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/samegame/SamegameCore/samegame.js mkspecs/features/symbian/default_post.prf src/declarative/qml/qdeclarativeengine.cpp src/gui/text/qtextdocumentlayout.cpp src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/s60installs.pro tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp tests/auto/declarative/qmlvisual/qmlvisual.pro
| * | | | | | | | Move Qt.application docs into Qt global object pageBea Lam2011-02-021-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was documented as a separate 'Application' element Reviewed-by: Martin Jones
| * | | | | | | | Add initial size to ListView in FolderListModel exampleBea Lam2011-02-021-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus other minor doc changes
| * | | | | | | | Update Docs, Examples and Demos for new CreateObject overloadableChristopher Ham2011-01-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamic object in Docs explains QScriptValue argument. SameGame and Dynamic scene now make use of overloadable. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-19988-997/+1005
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Introduce Qt.application.active propertyJoona Petrell2011-01-071-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces qmlviewer's runtime.activeWindow property. Task-number: QTBUG-13351 Reviewed-by: Martin Jones
* | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17988-998/+1006
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * | | | | | | Consistent DocsAlan Alpert2011-01-131-3/+11
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example contradicted later docs. Fixed example. Task-number: QTBUG-16596
| * | | | | | Update copyright year to 2011.Jason McDonald2011-01-10988-994/+994
| |/ / / / / | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-234-8/+50
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Improve docs on attached properties on view delegates.Martin Jones2010-12-234-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that the properties are attached to the root of the delegate, and must be accessed as such by child items. Task-number: QTBUG-16193 Reviewed-by: Bea Lam
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-2313-1/+681
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60main/newallocator_hook.cpp tools/runonphone/serenum_unix.cpp
| * | | | | Doc: Added a missing license header.David Boddie2010-12-211-0/+39
| | |_|_|/ | |/| | |
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-136-0/+276
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-0611-0/+593
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| * | | | Added QML coding convention for "private" properties.Jerome Pasion2010-12-061-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private properties start with two underscores. __property Reviewed-by: David Boddie
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0318-0/+943
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-302-1/+85
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Doc: Fixed a snippet to show QML comments.David Boddie2010-11-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15584
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-136-0/+276
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
| * | | | | Document support for QVariantList and QVariantMap type conversionBea Lam2010-12-063-0/+123
| | | | | |
| * | | | | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-063-0/+153
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the Qt.include() docs to qdeclarativeengine.cpp and also documents it in the "Integrating JavaScript" page. Task-number: QTBUG-15855
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-0620-1/+1028
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | | | Add 'Writing New Components' docs, and document the connect() function.Bea Lam2010-12-0318-0/+943
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The 'Writing QML Components' is mainly a restructuring of the 'Extending types from QML' page. It also documents the signal connect() function that was previously undocumented. Task-number: QTBUG-15718, QTBUG-15138