summaryrefslogtreecommitdiffstats
path: root/doc/src/images
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-108-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-041-0/+0
| |\
| * | Doc: Renamed a tutorial image to avoid a clash with another image.David Boddie2011-02-031-0/+0
| | | | | | | | | | | | Task-number: QTBUG-17120
| * | Doc: Renamed an image to ensure that it does not clash with another.David Boddie2011-02-021-0/+0
| | | | | | | | | | | | Task-number: QTBUG-17120
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-265-0/+0
| |\ \
| | * | Doc: Fixed missing images in qt demoGeir Vattekar2011-01-255-0/+0
| | | | | | | | | | | | | | | | Task-number: QTBUG-14274
| * | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-241-0/+0
| |/ /
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-041-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Add a layout direction example to positionersJoona Petrell2011-01-191-0/+0
| |/ | | | | | | | | Task-number: Reviewed-by: Alan Alpert
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-235-0/+0
|\ \ | |/ | | | | | | | | Conflicts: src/s60main/newallocator_hook.cpp tools/runonphone/serenum_unix.cpp
| * Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-065-0/+0
| | | | | | | | Reviewed-by: David Boddie
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-253-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Resized image, added missing files, and reformatted documentation ofJerome Pasion2010-10-081-0/+0
| | | | | | | | QtWebKit Image Analyzer example.
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-051-0/+0
| |\
| * | Added the QtWebKit bridge Image Analyzer example.Jerome Pasion2010-10-043-0/+0
| | | | | | | | | | | | | | | | | | | | | Originally written by Jervey Kong. Task-number: QTBUG-14154 Reviewed-by: David Boddie
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-051-0/+0
|\ \ \ | | |/ | |/|
| * | Doc: add missing image.Yann Bodson2010-10-011-0/+0
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-0/+0
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Doc: Further QML improvements.David Boddie2010-09-151-0/+0
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1015-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-0/+0
| |
| * Merge branch '4.7' into qmldocsDavid Boddie2010-09-064-0/+0
| |\
| | * Document known limitations in UI performance on S60 5.0 based devices.Jani Hautakangas2010-09-024-0/+0
| | | | | | | | | | | | | | | Task-number: QTBUG-11333 Reviewed-by: axis
| * | Doc: More work on QML documentation and snippets.David Boddie2010-09-013-0/+0
| | |
| * | Merge branch '4.7' into qmldocsDavid Boddie2010-08-271-0/+0
| |\ \ | | |/
| * | Doc: More work on the QML documentation.David Boddie2010-08-275-0/+0
| | |
| * | Doc: Made more improvements to the QML documentation.David Boddie2010-08-233-0/+0
| | |
* | | add images for multicastsender and multicastreceiver examplesBradley T. Hughes2010-09-012-0/+0
| |/ |/|
* | Update example screenshot in doc.Yann Bodson2010-08-271-0/+0
|/
* Added documentation for Spectrum Analyzer demoGareth Stockwell2010-08-111-0/+0
| | | | | Task-number: QTBUG-12720 Reviewed-by: David Boddie
* Doc: Images for QML GSMorten Engvoldsen2010-08-0512-0/+0
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-301-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add missing image Mention scope of id uniqueness Update QML Documents example add license header doc: Add a note about QCoreApplication::applicationDirPath Add license header Add moving and flicking properties to PathView Improve utility of QMLViewer Add missing \l doc commands Document elements that are focus scopes. Remove use of shared NOTIFY signals in QGraphicsScale Remove use of shared NOTIFY signals
| * Add missing imageBea Lam2010-07-301-0/+0
| | | | | | | | Task-number: QTBUG-12529
* | Fixed the incorrect diagram for bug QTBUG-12385.Jerome Pasion2010-07-3018-0/+0
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-07-285-0/+0
|\
| * Added files that had been renamed.Kevin Wright2010-07-275-0/+0
| |
| * Modified file/directory names and text to remove disallowed terminology.Kevin Wright2010-07-275-0/+0
| |
* | Doc: Added new getting started document.Geir Vattekar2010-07-285-0/+0
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-163-0/+0
|\ | | | | | | | | Conflicts: tools/qdoc3/test/qt.qdocconf
| * improvements to docs and examplesBea Lam2010-07-142-0/+0
| |
| * Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-081-0/+0
| | | | | | | | | | | | | | | | | | | | synchronous loading of QImages. (QPixmaps can only be created in the main thread so they will always be loaded synchronously). This changes request() to requestImage() and adds requestPixmap() for pixmap support. Task-number: QTBUG-11989
* | new image for tutorial.qdocMichael D Scull2010-07-071-0/+0
| |
* | replaced image, license headers, more links in modelview.qdoc fileMichael D Scull2010-07-071-0/+0
| |
* | Michaels first commitMichael D Scull2010-07-0725-0/+0
|/
* Add abstractitemmodel example, and fix some model docsBea Lam2010-07-011-0/+0
|
* Examples clean upBea Lam2010-06-281-0/+0
|
* Update screenshotBea Lam2010-06-231-0/+0
|
* Add demo thumbnails to Examples/Demos index to make it more interestingBea Lam2010-06-229-0/+0
|
* Add screenshots for most examples and demosBea Lam2010-06-2247-0/+0
|
* Rename example image fileBea Lam2010-06-221-0/+0
|