summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-2435-0/+1448
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-201-1/+11
| |\
| * | Qmlshadersplugin examples added.Marko Niemelä2011-06-1335-0/+1448
| | | | | | | | | | | | | | | | | | Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section. Reviewed-by: Kim Gronholm
* | | Doc: Fixed spelling errors that were blocking the CI system.David Boddie2011-06-201-2/+2
| | |
* | | Added missing license headers.David Boddie2011-06-173-0/+120
| | |
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-176-10/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| * \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-073-0/+14
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-06-063-0/+14
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Close context menus during orientation change. Have -small-screen enabled in certain examples on Symbian always.
| | | * Have -small-screen enabled in certain examples on Symbian always.Laszlo Agocs2011-06-063-0/+14
| | | |
| * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-311-1/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp src/gui/text/qtextengine_p.h src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro tests/auto/qtextlayout/tst_qtextlayout.cpp
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-271-1/+11
| | |\ \ | | | |/ | | |/| | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
| | | * Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, ↵Joona Petrell2011-05-271-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effectiveHorizontalAlignment and anchors.mirror properties * these properties are seldomly used * they confuse developers that do not care about right-to-left user interfaces * LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled * if needed, you can easily determine the effective layout directions and alignments with a little bit of JavaScript: function effectiveLayoutDirection() { if (LayoutMirroring.enabled) return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight; else return listView.layoutDirection; } Task-number: QTBUG-11042 Reviewed-by: Martin Jones
| * | | Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-2416-2149/+24
| |\ \ \
| * | | | Fix QtDeclarative keyinteraction exampleYann Bodson2011-05-232-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19033
* | | | | Added missing license headers.David Boddie2011-06-153-0/+120
| | | | |
* | | | | Doc: Added missing license headers for documentation and examples.David Boddie2011-06-08174-0/+6960
| | | | |
* | | | | Doc: Speculative attempt to fix build breakage.David Boddie2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | Case sensitivity problems strike again.
* | | | | Doc: Fixed file name of a header file to use lower case characters.David Boddie2011-06-071-1/+1
| | | | |
* | | | | Merge branch '4.8'David Boddie2011-05-272-2/+2
|\ \ \ \ \
| * | | | | Doc: Fixed a scope test for maemo5 and made an error a warning instead.David Boddie2011-05-272-2/+2
| | | | | |
| * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-2414-2149/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
* | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2414-2149/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | | | | Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-1614-2149/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0274e68767cce6440515a68d6af868725d5577a4 2770b1277744bb676e96e4ae8c89acd645ec895d 02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1 fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d d1f9a534da288884f443a975f428b0cfe0a7b29b 205d607c3387d074fb87f8deb77a8f515ae2e189 32d200da9cc7a4dfb3f302f22ef5718a286845c9 3e0df49f978933b1e4e6b48c695bf813ec9a2828 82bbc1c1611bde33680d22a1a3c6449e51d7b0b9 b78ffe51f9a4c4ac705e435d45fffe39864c032d fe438d7d828021d7f86301af36fe8dff2768532a df30d58de183d13c649ef7e0fbb8e2b3658e0862 fa845566b3733bc06454b71e33b1ff405ba32280 4f9a318d639c4e7e09e56751d31608fb39d472af 4810b587a65d81f8f90646efd09cadeb1276a756 7bad867382ad6c84155ffcfbb361709a8e8184ab 64ec011c6132496eb9555c1d09e7fd4ddf472837 81492e56aba5b5761500543665012a85d6835513 b668857b3749b39c3a61e0a25e750740b74df552 78a7a02b3b85435bc28eb23e9210522467171e42 Reviewed-By: Ralf Engels
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-031-0/+6
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicslayout.cpp src/gui/graphicsview/qgraphicslayout_p.cpp
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-021-0/+6
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Ensured that incomplete downloads are removed.David Boddie2011-04-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18509
* | | | | | Merge branch '4.8'David Boddie2011-05-133-2/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/whatsnew.qdoc doc/src/examples/orientation.qdoc doc/src/examples/webftpclient.qdoc examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg src/corelib/global/qglobal.cpp src/gui/text/qglyphs.cpp src/gui/text/qplatformfontdatabase_qpa.cpp
| * | | | | Doc: Added missing project and desktop files.David Boddie2011-05-1115-0/+235
| | | | | |
| * | | | | Doc: Added fixes left over from previous merges.David Boddie2011-05-111-0/+3
| | | | | |
| * | | | | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-111318-0/+57782
| | | | | |
| * | | | | Doc: Fixed incorrect button handling.David Boddie2011-05-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18954
| * | | | | More examples adjusted to Symbian and Maemo5.Daniel Molkentin2011-05-052-0/+16
| | | | | |
| * | | | | Added missing resource files.David Boddie2011-05-042-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit a273359edf9308b336d1c04f1b06185dc0bc8bdd)
| * | | | | Added missing data files. Renamed resource files.David Boddie2011-05-046-0/+159
| | | | | |
| * | | | | Fixed line endings.David Boddie2011-05-047-0/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/widgets/applicationicon/applicationicon.svg examples/widgets/applicationicon/main.cpp examples/widgets/elidedlabel/elidedlabel.cpp examples/widgets/elidedlabel/elidedlabel.h examples/widgets/elidedlabel/main.cpp examples/widgets/elidedlabel/testwidget.cpp examples/widgets/elidedlabel/testwidget.h (cherry picked from commit 1b555a91f05b68c697b6985d1b672dc0fba5fc5a)
| * | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-04712-3500/+4344
| |/ / / / | | | | | | | | | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* | | | | Squashed merge of the master-temp branch.David Boddie2011-05-0616-0/+279
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/maemovibration.qdoc
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-05-061-0/+18
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-031-0/+18
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-0/+18
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-141-0/+18
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add pincharea.qmlproject file for PinchArea example. Moving contentY by large values in List/GridView is slow
| | | | * | Add pincharea.qmlproject file for PinchArea example.Martin Jones2011-04-141-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d3129be4d03904805e53489c1117104e08ce860
| * | | | | Fixed line endings.David Boddie2011-04-287-0/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/widgets/applicationicon/applicationicon.svg examples/widgets/applicationicon/main.cpp examples/widgets/elidedlabel/elidedlabel.cpp examples/widgets/elidedlabel/elidedlabel.h examples/widgets/elidedlabel/main.cpp examples/widgets/elidedlabel/testwidget.cpp examples/widgets/elidedlabel/testwidget.h
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-04-289-315/+315
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/animation/basics/color-animation/qml/basics.qmlproject examples/declarative/animation/basics/property-animation/qml/basics.qmlproject examples/declarative/animation/basics/property-animation/qml/images/face-smile.png examples/declarative/animation/basics/property-animation/qml/images/moon.png examples/declarative/animation/basics/property-animation/qml/images/shadow.png examples/declarative/animation/basics/property-animation/qml/images/star.png examples/declarative/animation/basics/property-animation/qml/images/sun.png examples/declarative/animation/behaviors/behavior-example/qml/behaviors.qmlproject examples/declarative/animation/easing/qml/easing.qmlproject examples/declarative/animation/states/qml/qt-logo.png examples/declarative/animation/states/qml/states.qmlproject examples/declarative/demos/calculator/qml/calculator.qmlproject examples/declarative/demos/samegame/qml/samegame.qmlproject examples/declarative/demos/webbrowser/qml/webbrowser.qmlproject examples/declarative/i18n/qml/i18n.qmlproject examples/declarative/i18n/qml/i18n/base.ts examples/declarative/i18n/qml/i18n/qml_en_AU.qm examples/declarative/i18n/qml/i18n/qml_en_AU.ts examples/declarative/i18n/qml/i18n/qml_fr.qm examples/declarative/i18n/qml/i18n/qml_fr.ts examples/declarative/imageelements/image/qml/image.qmlproject examples/declarative/imageelements/image/qml/qt-logo.png examples/declarative/imageelements/shadows/qml/borderimage.qmlproject examples/declarative/imageelements/shadows/qml/content/bw.png examples/declarative/imageelements/shadows/qml/content/colors-round.sci examples/declarative/imageelements/shadows/qml/content/colors-stretch.sci examples/declarative/imageelements/shadows/qml/content/colors.png examples/declarative/imageelements/shadows/qml/content/shadow.png examples/declarative/keyinteraction/focus/qml/Core/images/arrow.png examples/declarative/keyinteraction/focus/qml/Core/images/qt-logo.png examples/declarative/keyinteraction/focus/qml/focus.qmlproject examples/declarative/modelviews/Delegate/qml/package.qmlproject examples/declarative/modelviews/gridview-example/qml/gridview.qmlproject examples/declarative/modelviews/gridview-example/qml/pics/AddressBook_48.png examples/declarative/modelviews/gridview-example/qml/pics/AudioPlayer_48.png examples/declarative/modelviews/gridview-example/qml/pics/Camera_48.png examples/declarative/modelviews/gridview-example/qml/pics/DateBook_48.png examples/declarative/modelviews/gridview-example/qml/pics/EMail_48.png examples/declarative/modelviews/gridview-example/qml/pics/TodoList_48.png examples/declarative/modelviews/gridview-example/qml/pics/VideoPlayer_48.png examples/declarative/modelviews/listview/sections/qml/content/pics/fruit-salad.jpg examples/declarative/modelviews/listview/sections/qml/content/pics/hamburger.jpg examples/declarative/modelviews/listview/sections/qml/content/pics/lemonade.jpg examples/declarative/modelviews/listview/sections/qml/content/pics/moreDown.png examples/declarative/modelviews/listview/sections/qml/content/pics/moreUp.png examples/declarative/modelviews/listview/sections/qml/content/pics/pancakes.jpg examples/declarative/modelviews/listview/sections/qml/content/pics/vegetable-soup.jpg examples/declarative/modelviews/listview/sections/qml/listview.qmlproject examples/declarative/modelviews/pathview-example/qml/pathview.qmlproject examples/declarative/modelviews/pathview-example/qml/pics/AddressBook_48.png examples/declarative/modelviews/pathview-example/qml/pics/AudioPlayer_48.png examples/declarative/modelviews/pathview-example/qml/pics/Camera_48.png examples/declarative/modelviews/pathview-example/qml/pics/DateBook_48.png examples/declarative/modelviews/pathview-example/qml/pics/EMail_48.png examples/declarative/modelviews/pathview-example/qml/pics/TodoList_48.png examples/declarative/modelviews/pathview-example/qml/pics/VideoPlayer_48.png examples/declarative/modelviews/visualitemmodel/qml/visualitemmodel.qmlproject examples/declarative/modelviews/webview/autosize/qml/webview.qmlproject examples/declarative/modelviews/webview/newwindows/qml/alerts.html examples/declarative/modelviews/webview/newwindows/qml/content/Mapping/map.html examples/declarative/modelviews/webview/newwindows/qml/content/pics/cancel.png examples/declarative/modelviews/webview/newwindows/qml/content/pics/ok.png examples/declarative/modelviews/webview/newwindows/qml/newwindows.html examples/declarative/modelviews/webview/newwindows/qml/webview.qmlproject examples/declarative/positioners/qml/add.png examples/declarative/positioners/qml/del.png examples/declarative/positioners/qml/positioners.qmlproject examples/declarative/text/fonts/banner/qml/fonts.qmlproject examples/declarative/text/fonts/hello/qml/fonts.qmlproject examples/declarative/text/fonts/hello/qml/fonts/tarzeau_ocr_a.ttf examples/declarative/text/textselection/qml/pics/endHandle.png examples/declarative/text/textselection/qml/pics/endHandle.sci examples/declarative/text/textselection/qml/pics/startHandle.png examples/declarative/text/textselection/qml/pics/startHandle.sci examples/declarative/text/textselection/qml/textselection.qmlproject examples/declarative/touchinteraction/gestures/experimental-gestures/qml/gestures.qmlproject examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea.qmlproject examples/declarative/toys/clocks/qml/clocks.qmlproject examples/declarative/toys/clocks/qml/content/quit.png examples/declarative/toys/corkboards/qml/cork.jpg examples/declarative/toys/corkboards/qml/corkboards.qmlproject examples/declarative/toys/corkboards/qml/note-yellow.png examples/declarative/toys/corkboards/qml/tack.png examples/declarative/toys/dynamicscene/qml/dynamicscene.qmlproject examples/declarative/toys/dynamicscene/qml/images/NOTE examples/declarative/toys/dynamicscene/qml/images/face-smile.png examples/declarative/toys/dynamicscene/qml/images/moon.png examples/declarative/toys/dynamicscene/qml/images/rabbit_brown.png examples/declarative/toys/dynamicscene/qml/images/rabbit_bw.png examples/declarative/toys/dynamicscene/qml/images/star.png examples/declarative/toys/dynamicscene/qml/images/sun.png examples/declarative/toys/dynamicscene/qml/images/tree_s.png examples/declarative/toys/dynamicscene/qml/qml/itemCreation.js examples/declarative/toys/tic-tac-toe/qml/content/pics/board.png examples/declarative/toys/tic-tac-toe/qml/content/pics/o.png examples/declarative/toys/tic-tac-toe/qml/content/pics/x.png examples/declarative/toys/tic-tac-toe/qml/content/tic-tac-toe.js examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe.qmlproject examples/declarative/toys/tvtennis/qml/tvtennis.qmlproject examples/declarative/ui-components/dialcontrol/qml/content/background.png examples/declarative/ui-components/dialcontrol/qml/content/needle.png examples/declarative/ui-components/dialcontrol/qml/content/needle_shadow.png examples/declarative/ui-components/dialcontrol/qml/content/overlay.png examples/declarative/ui-components/dialcontrol/qml/content/quit.png examples/declarative/ui-components/dialcontrol/qml/dialcontrol.qmlproject examples/declarative/ui-components/flipable/qml/content/5_heart.png examples/declarative/ui-components/flipable/qml/content/9_club.png examples/declarative/ui-components/flipable/qml/content/back.png examples/declarative/ui-components/flipable/qml/flipable.qmlproject examples/declarative/ui-components/main/qml/content/spinner-bg.png examples/declarative/ui-components/main/qml/content/spinner-select.png examples/declarative/ui-components/main/qml/images/clear.png examples/declarative/ui-components/main/qml/images/lineedit-bg-focus.png examples/declarative/ui-components/main/qml/images/lineedit-bg.png examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg examples/declarative/ui-components/main/qml/progressbar.qmlproject examples/declarative/ui-components/main/qml/scrollbar.qmlproject examples/declarative/ui-components/main/qml/searchbox.qmlproject examples/declarative/ui-components/main/qml/spinner.qmlproject examples/declarative/ui-components/main/qml/tab.png examples/declarative/ui-components/main/qml/tabwidget.qmlproject examples/declarative/ui-components/progressbar/qml/content/background.png examples/declarative/ui-components/progressbar/qml/progressbar.qmlproject examples/declarative/ui-components/slideswitch/qml/content/background.svg examples/declarative/ui-components/slideswitch/qml/content/knob.svg examples/declarative/ui-components/slideswitch/qml/slideswitch.qmlproject examples/declarative/xml/xmlhttprequest-example/qml/data.xml examples/declarative/xml/xmlhttprequest-example/qml/xmlhttprequest.qmlproject
| * | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-27712-3500/+4344
| | | | | | | | | | | | | | | | | | | | | | | | (4.7-generated-declarative branch).
* | | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-281878-1545/+58418
|/ / / / / | | | | | | | | | | | | | | | (4.7-generated-declarative branch).
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-18313-439/+10412
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: examples/webkit/webkit.pro
| * | | | Merge remote branch 'qa-review/master' into qa-staging-masterRohan McGovern2011-04-073-3/+3
| |\ \ \ \
| | * \ \ \ Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-2437-66/+1240
| | |\ \ \ \
| | * | | | | Update copyright year to 2011.Jason McDonald2011-01-101455-1463/+1463
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-11-14 00:42:27 (GMT)