summaryrefslogtreecommitdiffstats
path: root/doc/src/images
Commit message (Collapse)AuthorAgeFilesLines
* Missing icon in the designer documentationartoka2011-11-011-0/+0
| | | | | | | | | | | | | In the documentation there was missing icon in the Object Inspector section. Added reference to editbreaklayout.png icon and cleared a bit the description. Added also the image to the doc/src/images - folder. Task-number: QTBUG-17739 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-241-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Qmlshadersplugin examples added.Marko Niemelä2011-06-131-0/+0
| | | | | | | | | | | | Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section. Reviewed-by: Kim Gronholm
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-171-0/+0
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| * | Add the new 'glhypnotizer' demo.Jason Barron2011-06-031-0/+0
| | | | | | | | | | | | | | | | | | | | | Introduce a new demo to demonstrate the usage of OpenGL from a separate thread. Reviewed-by: Samuel
* | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-2812-0/+0
| | | | | | | | | | | | (4.7-generated-declarative branch).
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-1881-0/+0
|\ \ \ | |/ / | | | | | | | | | Conflicts: examples/webkit/webkit.pro
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-0762-0/+0
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| | * Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-2362-0/+0
| | |\
| | | * Fixed style issue and replaced image.Jerome Pasion2011-03-221-0/+0
| | | |
| | | * Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-1559-0/+0
| | | | | | | | | | | | | | | | Added images, new doc build configurations, and example code.
| | | * Resized images and changed their color mode to reduce file size.Jerome Pasion2011-03-102-0/+0
| | | |
| | | * Imported demo documentation and their images.Jerome Pasion2011-03-103-0/+0
| | | | | | | | | | | | | | | | Removed user files
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-222-0/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3119-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/qml-examples.qdoc
| | * | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-281-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1113 Conflicts: doc/src/development/qmake-manual.qdoc
| | * | | Doc: Added a threading tutorial.David Boddie2011-02-243-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit containing changes to documentation during the development of a threading tutorial, written by Roland Wolf.
| | * | | New landing page with new images.Jerome Pasion2011-02-213-0/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | Adding revised landing page with style and image changes.Jerome Pasion2011-02-182-0/+0
| | | | |
| | * | | Re-wrote QML Views overview page. Created new snippets and images.Jerome Pasion2011-02-164-0/+0
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | Resized image and took out extra lines.Jerome Pasion2011-02-161-0/+0
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | Re-wrote Qt Quick intro. Deleted unused snippets and images.Jerome Pasion2011-02-157-0/+0
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-03-252-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-222-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-212-0/+0
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: fixes/improvements for new QML right-to-left docs Fix license headers in example code Write Qt Quick 1.1 right-to-left documentation and examples Doc fix - QtQuick 1.1 scheduling
| | | * | fixes/improvements for new QML right-to-left docsBea Lam2011-03-212-0/+0
| | | | | | | | | | | | | | | | | | | | Clarify some of the docs and fix some broken doc links.
| | | * | Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-182-0/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11042 Reviewed-by: Martin Jones Change-Id: I6319992dec52a4d9252c2df39801ebe6a7dee75d
* | | | Doc: Added QtWebKit examples from Qt Quarterly 26 and 32.David Boddie2011-03-102-0/+0
|/ / /
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-241-0/+0
|\ \ \ | |/ /
| * | Add the missing image for doc of QNetworkSession.Xizhi Zhu2011-02-241-0/+0
| |/ | | | | | | The image is copied from Qt Mobility.
* | 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
| |
generated by cgit v0.12 at 2025-01-01 21:05:09 (GMT)